Remove Option passing client to the Stats Exporter.

Author: hoolioh

data-pipeline/src/stats_exporter.rs

@@ -15,7 +15,6 @@ use crate::trace_exporter::TracerMetadata;
 use datadog_trace_protobuf::pb;
 use datadog_trace_stats::span_concentrator::SpanConcentrator;
 use datadog_trace_utils::send_with_retry::{send_with_retry, RetryStrategy};
-use ddcommon::hyper_migration::new_default_client;
 use ddcommon::{worker::Worker, Endpoint, HttpClient};
 use hyper;
 use tokio::select;
@@ -51,7 +50,7 @@ impl StatsExporter {
         meta: TracerMetadata,
         endpoint: Endpoint,
         cancellation_token: CancellationToken,
-        client: Option<HttpClient>,
+        client: HttpClient,
     ) -> Self {
         Self {
             flush_interval,
@@ -60,7 +59,7 @@ impl StatsExporter {
             meta,
             sequence_id: AtomicU64::new(0),
             cancellation_token,
-            client: client.unwrap_or(new_default_client()),
+            client,
         }
     }
 
@@ -195,6 +194,7 @@ mod tests {
     use super::*;
     use datadog_trace_utils::span::{trace_utils, SpanSlice};
     use datadog_trace_utils::test_utils::poll_for_mock_hit;
+    use ddcommon::hyper_migration::new_default_client;
     use httpmock::prelude::*;
     use httpmock::MockServer;
     use time::Duration;
@@ -271,7 +271,7 @@ mod tests {
             get_test_metadata(),
             Endpoint::from_url(stats_url_from_agent_url(&server.url("/")).unwrap()),
             CancellationToken::new(),
-            None,
+            new_default_client(),
         );
 
         let send_status = stats_exporter.send(true).await;
@@ -299,7 +299,7 @@ mod tests {
             get_test_metadata(),
             Endpoint::from_url(stats_url_from_agent_url(&server.url("/")).unwrap()),
             CancellationToken::new(),
-            None,
+            new_default_client(),
         );
 
         let send_status = stats_exporter.send(true).await;
@@ -332,7 +332,7 @@ mod tests {
             get_test_metadata(),
             Endpoint::from_url(stats_url_from_agent_url(&server.url("/")).unwrap()),
             CancellationToken::new(),
-            None,
+            new_default_client(),
         );
 
         tokio::time::pause();
@@ -373,7 +373,7 @@ mod tests {
             get_test_metadata(),
             Endpoint::from_url(stats_url_from_agent_url(&server.url("/")).unwrap()),
             cancellation_token.clone(),
-            None,
+            new_default_client(),
         );
 
         tokio::spawn(async move {

data-pipeline/src/trace_exporter/mod.rs

@@ -425,7 +425,7 @@ impl TraceExporter {
                             &agent_info,
                             &self.client_side_stats,
                             &self.workers,
-                            Some(self.http_client.clone()),
+                            self.http_client.clone(),
                         );
                     }
                     StatsComputationStatus::Enabled {

data-pipeline/src/trace_exporter/stats.rs

@@ -64,7 +64,7 @@ pub(crate) fn start_stats_computation(
     workers: &Arc<Mutex<super::TraceExporterWorkers>>,
     span_kinds: Vec<String>,
     peer_tags: Vec<String>,
-    client: Option<HttpClient>,
+    client: HttpClient,
 ) -> anyhow::Result<()> {
     if let StatsComputationStatus::DisabledByAgent { bucket_size } = **client_side_stats.load() {
         let stats_concentrator = Arc::new(Mutex::new(SpanConcentrator::new(
@@ -95,7 +95,7 @@ fn create_and_start_stats_worker(
     cancellation_token: &CancellationToken,
     workers: &Arc<Mutex<super::TraceExporterWorkers>>,
     client_side_stats: &ArcSwap<StatsComputationStatus>,
-    client: Option<HttpClient>,
+    client: HttpClient,
 ) -> anyhow::Result<()> {
     let stats_exporter = stats_exporter::StatsExporter::new(
         bucket_size,
@@ -164,7 +164,7 @@ pub(crate) fn handle_stats_disabled_by_agent(
     agent_info: &Arc<AgentInfo>,
     client_side_stats: &ArcSwap<StatsComputationStatus>,
     workers: &Arc<Mutex<super::TraceExporterWorkers>>,
-    client: Option<HttpClient>,
+    client: HttpClient,
 ) {
     if agent_info.info.client_drop_p0s.is_some_and(|v| v) {
         // Client-side stats is supported by the agent