clean up stats concentrator configuration

Author: duncanpharvey

crates/datadog-trace-agent/src/config.rs

@@ -111,7 +111,6 @@ pub struct Config {
     pub proxy_url: Option<String>,
     pub service: Option<String>,
     pub env: Option<String>,
-    pub version: Option<String>,
 }
 
 impl Config {
@@ -256,7 +255,6 @@ impl Config {
             tags,
             service: env::var("DD_SERVICE").ok(),
             env: env::var("DD_ENV").ok(),
-            version: env::var("DD_VERSION").ok(),
         })
     }
 }
@@ -729,7 +727,6 @@ pub mod test_helpers {
             proxy_url: None,
             service: None,
             env: None,
-            version: None,
         }
     }
 }

crates/datadog-trace-agent/src/stats_concentrator.rs

@@ -17,6 +17,10 @@ pub struct TracerMetadata {
     // e.g. "f45568ad09d5480b99087d86ebda26e6"
     pub runtime_id: String,
     pub container_id: String,
+    // e.g. "prod"
+    pub env: String,
+    // e.g. "1.0.0"
+    pub app_version: String,
 }
 
 struct ConcentratorState {
@@ -63,6 +67,8 @@ impl StatsConcentrator {
             tracer_version: trace.tracer_version.clone(),
             runtime_id: trace.runtime_id.clone(),
             container_id: trace.container_id.clone(),
+            env: trace.env.clone(),
+            app_version: trace.app_version.clone(),
         };
     }
 
@@ -81,20 +87,21 @@ impl StatsConcentrator {
         Some(ClientStatsPayload {
             // Do not set hostname so the trace stats backend can aggregate stats properly
             hostname: String::new(),
-            env: inner
-                .config
-                .env
-                .clone()
-                .unwrap_or("unknown-env".to_string()),
-            // Version is not in the trace payload. Need to read it from config.
-            version: inner.config.version.clone().unwrap_or_default(),
+            // Prefer env from the tracer payload, fall back to agent config
+            env: if !inner.tracer_metadata.env.is_empty() {
+                inner.tracer_metadata.env.clone()
+            } else {
+                inner.config.env.clone().unwrap_or_default()
+            },
+            version: inner.tracer_metadata.app_version.clone(),
             lang: inner.tracer_metadata.language.clone(),
             tracer_version: inner.tracer_metadata.tracer_version.clone(),
             runtime_id: inner.tracer_metadata.runtime_id.clone(),
             // Not supported yet
             sequence: 0,
             // Not supported yet
             agent_aggregation: String::new(),
+            // One service per app for serverless
             service: inner.config.service.clone().unwrap_or_default(),
             container_id: inner.tracer_metadata.container_id.clone(),
             // Not supported yet

crates/datadog-trace-agent/src/trace_processor.rs

@@ -232,7 +232,6 @@ mod tests {
             tags: Tags::from_env_string("env:test,service:my-service"),
             service: Some("test-service".to_string()),
             env: Some("test-env".to_string()),
-            version: Some("1.0.0".to_string()),
         }
     }