fix: replace json with serde_json

Fixes grafana#139

Author: mati865

Cargo.lock

@@ -63,7 +63,7 @@ libflate = "1.2.0"
 libc = "^0.2.124"
 prost = "0.11"
 winapi = "0.3.9"
-json = "0.12.4"
+serde_json = "1"
 
 [dev-dependencies]
 tokio = { version = "1.18", features = ["full"] }

Cargo.toml

@@ -38,7 +38,7 @@ pyroscope = { path = "../", default-features = false }
 pyroscope_pprofrs = { path = "../pyroscope_backends/pyroscope_pprofrs", default-features = false }
 pyroscope_rbspy = { path = "../pyroscope_backends/pyroscope_rbspy", default-features = false }
 pyroscope_pyspy = { path = "../pyroscope_backends/pyroscope_pyspy", default-features = false }
-json = "0.12.4"
+serde_json = "1.0.115"
 
 [dependencies.clap]
 version = "3.2"

pyroscope_cli/Cargo.toml

@@ -172,7 +172,7 @@ impl AppConfig {
                         .map(|s| s.to_string())
                         .collect::<Vec<String>>();
 
-                    AppConfig::set("command_args", &json::stringify(command_args))?;
+                    AppConfig::set("command_args", &serde_json::to_string(&command_args)?)?;
                 }
             }
             if sub_exec.is_present("log_level") {
@@ -314,9 +314,9 @@ fn set_http_headers(cmd: &clap::ArgMatches) -> Result<()> {
                     http_headers_map.insert(kv[0].to_string(), kv[1].to_string());
                 }
             }
-            let http_header = json::stringify(http_headers_map);
+            let http_header = serde_json::to_string(&http_headers_map)?;
             AppConfig::set("http_headers_json", &http_header)?;
         };
     }
     return Ok(());
-}
+}

pyroscope_cli/src/utils/app_config.rs

@@ -29,6 +29,9 @@ pub enum Error {
 
     #[error(transparent)]
     PyroscopeError(#[from] pyroscope::PyroscopeError),
+
+    #[error(transparent)]
+    Json(#[from] serde_json::Error),
 }
 
 impl Error {

pyroscope_cli/src/utils/error.rs

@@ -31,7 +31,7 @@ pub enum PyroscopeError {
     Io(#[from] std::io::Error),
 
     #[error(transparent)]
-    Json(#[from] json::JsonError),
+    Json(#[from] serde_json::Error),
 }
 
 impl PyroscopeError {

src/error.rs

@@ -18,8 +18,6 @@ use crate::{
     PyroscopeError,
 };
 
-use json;
-
 use crate::backend::BackendImpl;
 use crate::pyroscope::Compression::GZIP;
 use crate::pyroscope::ReportEncoding::PPROF;
@@ -841,16 +839,16 @@ impl PyroscopeAgent<PyroscopeAgentRunning> {
 
 pub fn parse_http_headers_json(http_headers_json: String) -> Result<HashMap<String, String>> {
     let mut http_headers = HashMap::new();
-    let parsed = json::parse(&http_headers_json)?;
+    let parsed: serde_json::Value = serde_json::from_str(&http_headers_json)?;
     if !parsed.is_object() {
         return Err(PyroscopeError::AdHoc(format!(
             "expected object, got {}",
             parsed
         )));
     }
-    for (k, v) in parsed.entries() {
+    for (k, v) in parsed.as_object().unwrap() {
         if v.is_string() {
-            http_headers.insert(k.to_string(), v.to_string());
+            http_headers.insert(k.to_string(), v.as_str().unwrap().to_string());
         } else {
             return Err(PyroscopeError::AdHoc(format!(
                 "invalid http header value, not a string: {}",
@@ -862,17 +860,17 @@ pub fn parse_http_headers_json(http_headers_json: String) -> Result<HashMap<Stri
 }
 
 pub fn parse_vec_string_json(s: String) -> Result<Vec<String>> {
-    let parsed = json::parse(&s)?;
+    let parsed: serde_json::Value = serde_json::from_str(&s)?;
     if !parsed.is_array() {
         return Err(PyroscopeError::AdHoc(format!(
             "expected array, got {}",
             parsed
         )));
     }
-    let mut res = Vec::with_capacity(parsed.len());
-    for v in parsed.members() {
+    let mut res = Vec::with_capacity(parsed.as_array().unwrap().len());
+    for v in parsed.as_array().unwrap() {
         if v.is_string() {
-            res.push(v.to_string());
+            res.push(v.as_str().unwrap().to_string());
         } else {
             return Err(PyroscopeError::AdHoc(format!(
                 "invalid element value, not a string: {}",