chore: Upgrade libdatadog and construct http client for traces

Author: lym953

bottlecap/Cargo.lock

@@ -50,19 +50,22 @@ rustls-native-certs = { version = "0.8.1", optional = true }
 axum = { version = "0.8.4", default-features = false, features = ["default"] }
 ustr = { version = "1.0.0", default-features = false }
 tower-http = { version = "0.6.6", default-features = false, features = ["limit"] }
+hyper-http-proxy = { version = "1.1.0", default-features = false, features = [
+    "rustls-tls-webpki-roots",
+] }
 # If you are adding or updating a datadog-owned code dependency, please ensure
 # that it has a clippy.toml rule for disallowing the reqwest::Client::builder
 # method in favor of our
 # datadog_fips::reqwest_adapter::create_reqwest_client_builder. An example can
 # be found in the clippy.toml file adjacent to this Cargo.toml.
 datadog-protos = { version = "0.1.0", default-features = false, git = "https://github.com/DataDog/saluki/", rev = "c89b58e5784b985819baf11f13f7d35876741222"}
 ddsketch-agent = { version = "0.1.0", default-features = false, git = "https://github.com/DataDog/saluki/", rev = "c89b58e5784b985819baf11f13f7d35876741222"}
-ddcommon = { git = "https://github.com/DataDog/libdatadog", rev = "ba8955394cf35cf24a1a508fbe6264ad84702567" }
-datadog-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "ba8955394cf35cf24a1a508fbe6264ad84702567"  }
-datadog-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "ba8955394cf35cf24a1a508fbe6264ad84702567" , features = ["mini_agent"] }
-datadog-trace-normalization = { git = "https://github.com/DataDog/libdatadog",  rev = "ba8955394cf35cf24a1a508fbe6264ad84702567" }
-datadog-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "ba8955394cf35cf24a1a508fbe6264ad84702567"  }
-datadog-trace-stats = { git = "https://github.com/DataDog/libdatadog", rev = "ba8955394cf35cf24a1a508fbe6264ad84702567"  }
+ddcommon = { git = "https://github.com/DataDog/libdatadog", rev = "edba78910c0afaf610c875226b1aa7ac084f918d" }
+libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "edba78910c0afaf610c875226b1aa7ac084f918d"  }
+datadog-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "edba78910c0afaf610c875226b1aa7ac084f918d" , features = ["mini_agent"] }
+libdd-trace-normalization = { git = "https://github.com/DataDog/libdatadog",  rev = "edba78910c0afaf610c875226b1aa7ac084f918d" }
+datadog-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "edba78910c0afaf610c875226b1aa7ac084f918d"  }
+datadog-trace-stats = { git = "https://github.com/DataDog/libdatadog", rev = "edba78910c0afaf610c875226b1aa7ac084f918d"  }
 dogstatsd = { git = "https://github.com/DataDog/serverless-components", rev = "05b9dee1ac7c72d296ea12e85685c026cb6dbaaf", default-features = false }
 datadog-fips = { git = "https://github.com/DataDog/serverless-components", rev = "05b9dee1ac7c72d296ea12e85685c026cb6dbaaf", default-features = false }
 libddwaf = { version = "1.28.1", git = "https://github.com/DataDog/libddwaf-rust", rev = "d1534a158d976bd4f747bf9fcc58e0712d2d17fc", default-features = false, features = ["serde"] }
@@ -104,7 +107,7 @@ opt-level = 3
 tikv-jemallocator = "0.5"
 
 [features]
-default = ["reqwest/rustls-tls-native-roots", "dogstatsd/default", "datadog-fips/default" ]
+default = ["reqwest/rustls-tls-native-roots", "dogstatsd/default", "datadog-fips/default",  ]
 fips = [
     "ddcommon/fips",
     "datadog-trace-utils/fips",

bottlecap/Cargo.toml

@@ -4,7 +4,7 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use bytes::{Buf, Bytes};
-use datadog_trace_protobuf::pb::Span;
+use libdd_trace_protobuf::pb::Span;
 use datadog_trace_utils::tracer_header_tags;
 use libddwaf::object::{Keyed, WafMap, WafObject};
 use libddwaf::{Context as WafContext, Handle, RunError, RunOutput, RunResult, waf_map};

bottlecap/src/appsec/processor/context.rs

@@ -8,7 +8,7 @@ use std::time::Duration;
 
 use bytes::Bytes;
 use cookie::Cookie;
-use datadog_trace_protobuf::pb::Span;
+use libdd_trace_protobuf::pb::Span;
 use itertools::Itertools;
 use libddwaf::object::{WafMap, WafOwned};
 use libddwaf::{Builder, Config as WafConfig, Handle};

bottlecap/src/appsec/processor/mod.rs

@@ -7,7 +7,7 @@ use std::{
     time::{SystemTime, UNIX_EPOCH},
 };
 
-use datadog_trace_protobuf::pb::Span;
+use libdd_trace_protobuf::pb::Span;
 use serde_json::Value;
 use tracing::debug;
 

bottlecap/src/lifecycle/invocation/context.rs

@@ -1,5 +1,5 @@
 use base64::{DecodeError, Engine, engine::general_purpose};
-use datadog_trace_protobuf::pb::Span;
+use libdd_trace_protobuf::pb::Span;
 use rand::{Rng, RngCore, rngs::OsRng};
 use std::collections::HashMap;
 

bottlecap/src/lifecycle/invocation/mod.rs

@@ -5,7 +5,7 @@ use std::{
 };
 
 use chrono::{DateTime, Utc};
-use datadog_trace_protobuf::pb::Span;
+use libdd_trace_protobuf::pb::Span;
 use datadog_trace_utils::tracer_header_tags;
 use serde_json::Value;
 use tokio::time::Instant;

bottlecap/src/lifecycle/invocation/processor.rs

@@ -1,7 +1,7 @@
 use std::{collections::HashMap, sync::Arc};
 
 use chrono::{DateTime, Utc};
-use datadog_trace_protobuf::pb::Span;
+use libdd_trace_protobuf::pb::Span;
 use dogstatsd::aggregator_service::AggregatorHandle;
 use serde_json::Value;
 use thiserror::Error;

bottlecap/src/lifecycle/invocation/processor_service.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 use std::sync::Arc;
 
-use datadog_trace_protobuf::pb::Span;
+use libdd_trace_protobuf::pb::Span;
 use serde_json::Value;
 use tracing::debug;
 

bottlecap/src/lifecycle/invocation/span_inferrer.rs

@@ -2,7 +2,7 @@ use super::ServiceNameResolver;
 use crate::lifecycle::invocation::triggers::{
     FUNCTION_TRIGGER_EVENT_SOURCE_TAG, Trigger, body::Body,
 };
-use datadog_trace_protobuf::pb::Span;
+use libdd_trace_protobuf::pb::Span;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use std::collections::HashMap;