Actually reuse the exporter

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

Author: bwoebi

Cargo.lock

@@ -6,6 +6,7 @@ use crate::platform::{mmap_handle, munmap_handle, OwnedFileHandle, PlatformHandl
 #[cfg(feature = "tiny-bytes")]
 use libdd_tinybytes::UnderlyingBytes;
 use serde::{Deserialize, Serialize};
+#[cfg(target_os = "linux")]
 use std::os::fd::AsRawFd;
 use std::{ffi::CString, io, ptr::NonNull};
 

datadog-ipc/src/platform/mem_handle.rs

@@ -91,6 +91,9 @@ version = "1.49.0"
 [target.'cfg(not(target_arch = "x86"))'.dependencies]
 simd-json = "=0.14"
 
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+libdd-capabilities-impl = { path = "../libdd-capabilities-impl" }
+
 [target.'cfg(unix)'.dependencies]
 nix = { version = "0.29", features = ["socket", "mman"] }
 sendfd = { version = "0.4", features = ["tokio"] }

datadog-sidecar/Cargo.toml

@@ -151,6 +151,15 @@ impl SessionInfo {
         }
     }
 
+    pub(crate) fn modify_stats_config<F>(&self, f: F)
+    where
+        F: FnOnce(&mut crate::service::stats_flusher::StatsConfig),
+    {
+        if let Some(cfg) = &mut *self.stats_config.lock_or_panic() {
+            f(cfg)
+        }
+    }
+
     pub(crate) fn get_trace_config(&self) -> MutexGuard<'_, tracer::Config> {
         self.tracer_config.lock_or_panic()
     }
@@ -166,12 +175,6 @@ impl SessionInfo {
         self.dogstatsd.lock_or_panic()
     }
 
-    /// Clone the Arc wrapping the DogStatsD client so it can be shared with long-lived tasks
-    /// (e.g. the stats flush loop) without creating a new UDP socket.
-    pub(crate) fn clone_dogstatsd(&self) -> Arc<Mutex<Option<libdd_dogstatsd_client::Client>>> {
-        self.dogstatsd.clone()
-    }
-
     pub(crate) fn configure_dogstatsd<F>(&self, f: F)
     where
         F: FnOnce(&mut Option<libdd_dogstatsd_client::Client>),

datadog-sidecar/src/service/session_info.rs

@@ -1040,6 +1040,10 @@ impl SidecarInterface for ConnectionSidecarHandler {
         session.modify_trace_config(|trace_cfg| {
             trace_cfg.set_endpoint_test_token(token.clone());
         });
+        // Update the stats config so newly created concentrators carry the test token.
+        session.modify_stats_config(|cfg| {
+            cfg.endpoint.test_token = token.clone();
+        });
         // TODO(APMSP-1377): the dogstatsd-client doesn't support test_session tokens yet
         // session.configure_dogstatsd(|cfg| {
         //     update_cfg(cfg.endpoint.take(), |e| cfg.set_endpoint(e), &token);