Avoid TracerHeaderMap

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

Author: bwoebi

datadog-ipc/src/platform/windows/mem_handle.rs

@@ -151,7 +151,7 @@ impl NamedShmHandle {
                 handle: unsafe { PlatformHandle::from_raw_handle(handle) },
                 size,
             },
-            path: Some(ShmPath { name }).map(Box::new).into(),
+            path: Some(Box::new(ShmPath { name })).into(),
         })
     }
 }

datadog-sidecar/src/service/stats_flusher.rs

@@ -176,10 +176,7 @@ pub async fn run_stats_flush_loop(
                 {
                     let mut guard = arc.lock_or_panic();
                     // Only remove our entry — a fresher one may have been inserted already.
-                    if guard
-                        .get(&map_key)
-                        .map_or(false, |s| Arc::ptr_eq(s, &state))
-                    {
+                    if guard.get(&map_key).is_some_and(|s| Arc::ptr_eq(s, &state)) {
                         guard.remove(&map_key);
                     }
                 }

libdd-data-pipeline/src/trace_exporter/stats.rs

@@ -266,9 +266,6 @@ impl From<TracerMetadata> for StatsMetadata {
             app_version: m.app_version,
             runtime_id: m.runtime_id,
             language: m.language,
-            lang_version: m.language_version,
-            lang_interpreter: m.language_interpreter,
-            lang_vendor: m.language_interpreter_vendor,
             tracer_version: m.tracer_version,
             git_commit_sha: m.git_commit_sha,
             process_tags: m.process_tags,

libdd-trace-stats/Cargo.toml

@@ -14,7 +14,7 @@ anyhow = "1.0"
 libdd-capabilities = { path = "../libdd-capabilities", version = "0.1.0" }
 libdd-common = { version = "3.0.2", path = "../libdd-common", default-features = false }
 libdd-ddsketch = { version = "1.0.1", path = "../libdd-ddsketch" }
-libdd-shared-runtime = { version = "1.0.0", path = "../libdd-shared-runtime" }
+libdd-shared-runtime = { version = "0.1.0", path = "../libdd-shared-runtime" }
 libdd-trace-protobuf = { version = "3.0.1", path = "../libdd-trace-protobuf" }
 libdd-trace-utils = { version = "3.0.1", path = "../libdd-trace-utils", default-features = false }
 hashbrown = { version = "0.15" }

libdd-trace-stats/src/stats_exporter.rs

@@ -16,7 +16,6 @@ use libdd_common::Endpoint;
 use libdd_shared_runtime::Worker;
 use libdd_trace_protobuf::pb;
 use libdd_trace_utils::send_with_retry::{send_with_retry, RetryStrategy};
-use libdd_trace_utils::trace_utils::TracerHeaderTags;
 use std::fmt::Debug;
 use tracing::error;
 
@@ -30,25 +29,23 @@ pub struct StatsMetadata {
     pub app_version: String,
     pub runtime_id: String,
     pub language: String,
-    pub lang_version: String,
-    pub lang_interpreter: String,
-    pub lang_vendor: String,
     pub tracer_version: String,
     pub git_commit_sha: String,
     pub process_tags: String,
     pub service: String,
 }
 
-impl<'a> From<&'a StatsMetadata> for TracerHeaderTags<'a> {
-    fn from(m: &'a StatsMetadata) -> TracerHeaderTags<'a> {
-        TracerHeaderTags {
-            lang: &m.language,
-            lang_version: &m.lang_version,
-            lang_interpreter: &m.lang_interpreter,
-            lang_vendor: &m.lang_vendor,
-            tracer_version: &m.tracer_version,
-            ..Default::default()
+impl StatsMetadata {
+    /// Build the HTTP headers accepted by the agent's `/v0.6/stats` endpoint.
+    pub fn to_stats_headers(&self) -> http::HeaderMap {
+        let mut map = http::HeaderMap::new();
+        if let Ok(v) = self.language.parse() {
+            map.insert("Datadog-Tracer-Language", v);
+        }
+        if let Ok(v) = self.tracer_version.parse() {
+            map.insert("Datadog-Tracer-Version", v);
         }
+        map
     }
 }
 
@@ -116,8 +113,7 @@ impl<H: HttpClientTrait, C: FlushableConcentrator> StatsExporter<H, C> {
         }
         let body = rmp_serde::encode::to_vec_named(&payload)?;
 
-        let mut headers: http::HeaderMap = TracerHeaderTags::from(&self.meta).into();
-
+        let mut headers = self.meta.to_stats_headers();
         headers.insert(
             http::header::CONTENT_TYPE,
             libdd_common::header::APPLICATION_MSGPACK,