Rename exception replay snapshot fields

Signed-off-by: Bob Weinand <[email protected]>

Author: bwoebi

live-debugger/src/debugger_defs.rs

@@ -49,6 +49,7 @@ pub struct SnapshotStackFrame {
 }
 
 #[derive(Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 pub struct Snapshot<'a> {
     pub language: Cow<'a, str>,
     pub id: Cow<'a, str>,
@@ -64,7 +65,6 @@ pub struct Snapshot<'a> {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub probe: Option<ProbeMetadata<'a>>,
     #[serde(skip_serializing_if = "Vec::is_empty")]
-    #[serde(rename = "evaluationErrors")]
     pub evaluation_errors: Vec<SnapshotEvaluationError>,
     #[serde(skip_serializing_if = "Vec::is_empty")]
     pub stack: Vec<SnapshotStackFrame>,

sidecar/src/config.rs

@@ -12,6 +12,8 @@ const ENV_SIDECAR_IPC_MODE: &str = "_DD_DEBUG_SIDECAR_IPC_MODE";
 const SIDECAR_IPC_MODE_SHARED: &str = "shared";
 const SIDECAR_IPC_MODE_PER_PROCESS: &str = "instance_per_process";
 
+const ENV_SIDECAR_LOG_LEVEL: &str = "_DD_DEBUG_SIDECAR_LOG_LEVEL";
+
 const ENV_SIDECAR_LOG_METHOD: &str = "_DD_DEBUG_SIDECAR_LOG_METHOD";
 const SIDECAR_LOG_METHOD_DISABLED: &str = "disabled";
 const SIDECAR_LOG_METHOD_STDOUT: &str = "stdout";
@@ -80,6 +82,7 @@ impl std::fmt::Display for LogMethod {
 pub struct Config {
     pub ipc_mode: IpcMode,
     pub log_method: LogMethod,
+    pub log_level: String,
     pub idle_linger_time: Duration,
     pub self_telemetry: bool,
     pub library_dependencies: Vec<LibDependency>,
@@ -184,6 +187,10 @@ impl FromEnv {
             _ => LogMethod::default(),
         }
     }
+    
+    pub fn log_level() -> String {
+        std::env::var(ENV_SIDECAR_LOG_LEVEL).unwrap_or_default()
+    }
 
     fn idle_linger_time() -> Duration {
         std::env::var(ENV_IDLE_LINGER_TIME_SECS)
@@ -205,6 +212,7 @@ impl FromEnv {
         Config {
             ipc_mode: Self::ipc_mode(),
             log_method: Self::log_method(),
+            log_level: Self::log_level(),
             idle_linger_time: Self::idle_linger_time(),
             self_telemetry: Self::self_telemetry(),
             library_dependencies: vec![],

sidecar/src/log.rs

@@ -381,7 +381,11 @@ pub(crate) fn enable_logging() -> anyhow::Result<()> {
         MULTI_LOG_FILTER.add(env); // this also immediately drops it, but will retain it for few
                                    // seconds during startup
     }
-    MULTI_LOG_WRITER.add(config::Config::get().log_method); // same than MULTI_LOG_FILTER
+    let config = config::Config::get();
+    if !config.log_level.is_empty() {
+        MULTI_LOG_FILTER.add(config.log_level.clone());
+    }
+    MULTI_LOG_WRITER.add(config.log_method); // same than MULTI_LOG_FILTER
 
     LogTracer::init()?;
 

sidecar/src/watchdog.rs

@@ -36,7 +36,7 @@ impl WatchdogHandle {
 impl Watchdog {
     pub fn from_receiver(shutdown_receiver: Receiver<()>) -> Self {
         Watchdog {
-            interval: tokio::time::interval(Duration::from_secs(5)),
+            interval: tokio::time::interval(Duration::from_secs(10)),
             max_memory_usage_bytes: 1024 * 1024 * 1024, // 1 GB
             shutdown_receiver,
         }