Fixup after rebase

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

Author: bwoebi

datadog-sidecar-ffi/tests/sidecar.rs

@@ -114,6 +114,8 @@ fn test_ddog_sidecar_register_app() {
             false,
             false,
             &process_tags,
+            "".into(),
+            "".into(),
         )
         .unwrap_none();
 
@@ -165,6 +167,8 @@ fn test_ddog_sidecar_register_app() {
             false,
             false,
             &process_tags,
+            "".into(),
+            "".into(),
         )
         .unwrap_none();
 

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

@@ -39,7 +39,6 @@ use libdd_common::tag::Tag;
 use libdd_common::Endpoint;
 use libdd_dogstatsd_client::Client;
 use libdd_shared_runtime::{SharedRuntime, WorkerHandle};
-use libdd_trace_stats::stats_exporter::{StatsExporter, StatsMetadata};
 use libdd_trace_utils::msgpack_decoder;
 use libdd_trace_utils::send_with_retry::{
     send_with_retry, RetryStrategy, SendWithRetryError, SendWithRetryResult,

libdd-trace-stats/src/stats_exporter.rs

@@ -11,15 +11,13 @@ use std::{
 
 use crate::span_concentrator::{FlushableConcentrator, SpanConcentrator};
 use async_trait::async_trait;
-use std::fmt::Debug;
 use libdd_capabilities::{HttpClientTrait, MaybeSend};
 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 tokio::select;
-use tokio_util::sync::CancellationToken;
+use std::fmt::Debug;
 use tracing::error;
 
 pub const STATS_ENDPOINT_PATH: &str = "/v0.6/stats";
@@ -164,7 +162,11 @@ impl<H: HttpClientTrait, C: FlushableConcentrator> StatsExporter<H, C> {
 
 #[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-impl<H: HttpClientTrait + MaybeSend + Sync + Debug + 'static, C: FlushableConcentrator + Send + Debug> Worker for StatsExporter<H, C> {
+impl<
+        H: HttpClientTrait + MaybeSend + Sync + Debug + 'static,
+        C: FlushableConcentrator + Send + Debug,
+    > Worker for StatsExporter<H, C>
+{
     async fn trigger(&mut self) {
         tokio::time::sleep(self.flush_interval).await;
     }