fix: revert hyper-proxy, use system proxy

DataDog · Sep 30, 2024 · d9ebdc7 · d9ebdc7
1 parent e4a8e18
commit d9ebdc7
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 13 deletions.
diff --git a/data-pipeline/src/trace_exporter.rs b/data-pipeline/src/trace_exporter.rs
@@ -372,7 +372,7 @@ impl TraceExporter {
                     url: self.output_format.add_path(&self.endpoint.url),
                     ..self.endpoint.clone()
                 };
-                let send_data = SendData::new(size, tracer_payload, header_tags, &endpoint, None);
+                let send_data = SendData::new(size, tracer_payload, header_tags, &endpoint);
                 self.runtime.block_on(async {
                     match send_data.send().await.last_result {
                         Ok(response) => match hyper::body::to_bytes(response.into_body()).await {

diff --git a/sidecar/src/service/sidecar_server.rs b/sidecar/src/service/sidecar_server.rs
@@ -275,7 +275,7 @@ impl SidecarServer {
         .try_into()
         {
             Ok(payload) => {
-                let data = SendData::new(size, payload, headers, target, None);
+                let data = SendData::new(size, payload, headers, target);
                 self.trace_flusher.enqueue(data);
             }
             Err(e) => {

diff --git a/trace-mini-agent/src/config.rs b/trace-mini-agent/src/config.rs
@@ -32,7 +32,6 @@ pub struct Config {
     pub trace_stats_intake: Endpoint,
     /// timeout for environment verification, in milliseconds
     pub verify_env_timeout: u64,
-    pub proxy_url: Option<String>,
 }
 
 impl Config {
@@ -90,7 +89,6 @@ impl Config {
                 ..Default::default()
             },
             obfuscation_config,
-            proxy_url: env::var("HTTPS_PROXY").ok(),
         })
     }
 }

diff --git a/trace-mini-agent/src/trace_processor.rs b/trace-mini-agent/src/trace_processor.rs
@@ -98,12 +98,7 @@ impl TraceProcessor for ServerlessTraceProcessor {
             true, // In mini agent, we always send agentless
         );
 
-        let send_data = SendData::new(
-            body_size,
-            payload,
-            tracer_header_tags,
-            &config.trace_intake,
-        );
+        let send_data = SendData::new(body_size, payload, tracer_header_tags, &config.trace_intake);
 
         // send trace payload to our trace flusher
         match tx.send(send_data).await {

diff --git a/trace-utils/src/send_data/mod.rs b/trace-utils/src/send_data/mod.rs
@@ -102,7 +102,6 @@ pub(crate) enum RequestResult {
 ///     let result = send_data.send().await;
 /// }
 /// ```
-
 pub struct SendData {
     pub(crate) tracer_payloads: TracerPayloadCollection,
     pub(crate) size: usize, // have a rough size estimate to force flushing if it's large

diff --git a/trace-utils/src/trace_utils.rs b/trace-utils/src/trace_utils.rs
@@ -686,7 +686,6 @@ mod tests {
             }]),
             TracerHeaderTags::default(),
             &Endpoint::default(),
-            None,
         );
         let coalesced = trace_utils::coalesce_send_data(vec![
             dummy.clone(),

diff --git a/trace-utils/tests/test_send_data.rs b/trace-utils/tests/test_send_data.rs
@@ -56,7 +56,6 @@ mod tracing_integration_tests {
             TracerPayloadCollection::V04(vec![trace.clone()]),
             header_tags,
             &endpoint,
-            None,
         );
 
         let _result = data.send().await;