From 03fc759f7ef6c0608343f84016a513a7b5557962 Mon Sep 17 00:00:00 2001 From: Jordan Date: Tue, 20 Jan 2026 16:06:49 -0500 Subject: [PATCH 1/2] change commit hash for azure apim tag removal --- Cargo.lock | 15 ++++++--------- crates/datadog-serverless-compat/Cargo.toml | 2 +- crates/datadog-trace-agent/Cargo.toml | 13 +++++-------- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d2e6803f..15114a59 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -424,8 +424,6 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "bytes", - "datadog-fips", "duplicate", "http-body-util", "hyper", @@ -435,7 +433,6 @@ dependencies = [ "libdd-trace-obfuscation", "libdd-trace-protobuf", "libdd-trace-utils", - "reqwest", "rmp-serde", "serde", "serde_json", @@ -1219,7 +1216,7 @@ checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" [[package]] name = "libdd-common" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=435107c245112397914935c0f7148a18b91cafc6#435107c245112397914935c0f7148a18b91cafc6" +source = "git+https://github.com/DataDog/libdatadog/?rev=660c550b6311a209d9cf7de762e54b6b7109bcdb#660c550b6311a209d9cf7de762e54b6b7109bcdb" dependencies = [ "anyhow", "cc", @@ -1252,7 +1249,7 @@ dependencies = [ [[package]] name = "libdd-tinybytes" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=435107c245112397914935c0f7148a18b91cafc6#435107c245112397914935c0f7148a18b91cafc6" +source = "git+https://github.com/DataDog/libdatadog/?rev=660c550b6311a209d9cf7de762e54b6b7109bcdb#660c550b6311a209d9cf7de762e54b6b7109bcdb" dependencies = [ "serde", ] @@ -1260,7 +1257,7 @@ dependencies = [ [[package]] name = "libdd-trace-normalization" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=435107c245112397914935c0f7148a18b91cafc6#435107c245112397914935c0f7148a18b91cafc6" +source = "git+https://github.com/DataDog/libdatadog/?rev=660c550b6311a209d9cf7de762e54b6b7109bcdb#660c550b6311a209d9cf7de762e54b6b7109bcdb" dependencies = [ "anyhow", "libdd-trace-protobuf", @@ -1269,7 +1266,7 @@ dependencies = [ [[package]] name = "libdd-trace-obfuscation" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=435107c245112397914935c0f7148a18b91cafc6#435107c245112397914935c0f7148a18b91cafc6" +source = "git+https://github.com/DataDog/libdatadog/?rev=660c550b6311a209d9cf7de762e54b6b7109bcdb#660c550b6311a209d9cf7de762e54b6b7109bcdb" dependencies = [ "anyhow", "libdd-common", @@ -1286,7 +1283,7 @@ dependencies = [ [[package]] name = "libdd-trace-protobuf" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=435107c245112397914935c0f7148a18b91cafc6#435107c245112397914935c0f7148a18b91cafc6" +source = "git+https://github.com/DataDog/libdatadog/?rev=660c550b6311a209d9cf7de762e54b6b7109bcdb#660c550b6311a209d9cf7de762e54b6b7109bcdb" dependencies = [ "prost", "serde", @@ -1296,7 +1293,7 @@ dependencies = [ [[package]] name = "libdd-trace-utils" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=435107c245112397914935c0f7148a18b91cafc6#435107c245112397914935c0f7148a18b91cafc6" +source = "git+https://github.com/DataDog/libdatadog/?rev=660c550b6311a209d9cf7de762e54b6b7109bcdb#660c550b6311a209d9cf7de762e54b6b7109bcdb" dependencies = [ "anyhow", "bytes", diff --git a/crates/datadog-serverless-compat/Cargo.toml b/crates/datadog-serverless-compat/Cargo.toml index 068db284..c69d51f8 100644 --- a/crates/datadog-serverless-compat/Cargo.toml +++ b/crates/datadog-serverless-compat/Cargo.toml @@ -7,7 +7,7 @@ description = "Binary to run trace-agent and dogstatsd servers in Serverless env [dependencies] datadog-trace-agent = { path = "../datadog-trace-agent" } -libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "435107c245112397914935c0f7148a18b91cafc6" } +libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog/", rev = "660c550b6311a209d9cf7de762e54b6b7109bcdb" } dogstatsd = { path = "../dogstatsd", default-features = true } tokio = { version = "1", features = ["macros", "rt-multi-thread"] } tokio-util = { version = "0.7", default-features = false } diff --git a/crates/datadog-trace-agent/Cargo.toml b/crates/datadog-trace-agent/Cargo.toml index 3c8e5c99..2f2a349e 100644 --- a/crates/datadog-trace-agent/Cargo.toml +++ b/crates/datadog-trace-agent/Cargo.toml @@ -20,21 +20,18 @@ async-trait = "0.1.64" tracing = { version = "0.1", default-features = false } serde = { version = "1.0.145", features = ["derive"] } serde_json = "1.0" -libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "435107c245112397914935c0f7148a18b91cafc6" } -libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "435107c245112397914935c0f7148a18b91cafc6" } -libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "435107c245112397914935c0f7148a18b91cafc6" } -libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "435107c245112397914935c0f7148a18b91cafc6", features = [ +libdd-common = { git = "https://github.com/DataDog/libdatadog/", rev = "660c550b6311a209d9cf7de762e54b6b7109bcdb" } +libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog/", rev = "660c550b6311a209d9cf7de762e54b6b7109bcdb" } +libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog/", rev = "660c550b6311a209d9cf7de762e54b6b7109bcdb", features = [ "mini_agent", ] } -datadog-fips = { path = "../datadog-fips" } -reqwest = { version = "0.12.23", features = ["json", "http2"], default-features = false } -bytes = "1.10.1" +libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog/", rev = "660c550b6311a209d9cf7de762e54b6b7109bcdb" } [dev-dependencies] rmp-serde = "1.1.1" serial_test = "2.0.0" duplicate = "0.4.1" tempfile = "3.3.0" -libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "435107c245112397914935c0f7148a18b91cafc6", features = [ +libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog/", rev = "660c550b6311a209d9cf7de762e54b6b7109bcdb", features = [ "test-utils", ] } From 28c0beaa2185eeab6768660a3e55cd2e2c3f1241 Mon Sep 17 00:00:00 2001 From: Jordan Date: Wed, 21 Jan 2026 15:02:56 -0500 Subject: [PATCH 2/2] readd missing dependency --- Cargo.lock | 15 +++++++++------ crates/datadog-serverless-compat/Cargo.toml | 2 +- crates/datadog-trace-agent/Cargo.toml | 13 ++++++++----- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 15114a59..5f965b70 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -424,6 +424,8 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", + "bytes", + "datadog-fips", "duplicate", "http-body-util", "hyper", @@ -433,6 +435,7 @@ dependencies = [ "libdd-trace-obfuscation", "libdd-trace-protobuf", "libdd-trace-utils", + "reqwest", "rmp-serde", "serde", "serde_json", @@ -1216,7 +1219,7 @@ checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" [[package]] name = "libdd-common" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog/?rev=660c550b6311a209d9cf7de762e54b6b7109bcdb#660c550b6311a209d9cf7de762e54b6b7109bcdb" +source = "git+https://github.com/DataDog/libdatadog?rev=660c550b6311a209d9cf7de762e54b6b7109bcdb#660c550b6311a209d9cf7de762e54b6b7109bcdb" dependencies = [ "anyhow", "cc", @@ -1249,7 +1252,7 @@ dependencies = [ [[package]] name = "libdd-tinybytes" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog/?rev=660c550b6311a209d9cf7de762e54b6b7109bcdb#660c550b6311a209d9cf7de762e54b6b7109bcdb" +source = "git+https://github.com/DataDog/libdatadog?rev=660c550b6311a209d9cf7de762e54b6b7109bcdb#660c550b6311a209d9cf7de762e54b6b7109bcdb" dependencies = [ "serde", ] @@ -1257,7 +1260,7 @@ dependencies = [ [[package]] name = "libdd-trace-normalization" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog/?rev=660c550b6311a209d9cf7de762e54b6b7109bcdb#660c550b6311a209d9cf7de762e54b6b7109bcdb" +source = "git+https://github.com/DataDog/libdatadog?rev=660c550b6311a209d9cf7de762e54b6b7109bcdb#660c550b6311a209d9cf7de762e54b6b7109bcdb" dependencies = [ "anyhow", "libdd-trace-protobuf", @@ -1266,7 +1269,7 @@ dependencies = [ [[package]] name = "libdd-trace-obfuscation" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog/?rev=660c550b6311a209d9cf7de762e54b6b7109bcdb#660c550b6311a209d9cf7de762e54b6b7109bcdb" +source = "git+https://github.com/DataDog/libdatadog?rev=660c550b6311a209d9cf7de762e54b6b7109bcdb#660c550b6311a209d9cf7de762e54b6b7109bcdb" dependencies = [ "anyhow", "libdd-common", @@ -1283,7 +1286,7 @@ dependencies = [ [[package]] name = "libdd-trace-protobuf" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog/?rev=660c550b6311a209d9cf7de762e54b6b7109bcdb#660c550b6311a209d9cf7de762e54b6b7109bcdb" +source = "git+https://github.com/DataDog/libdatadog?rev=660c550b6311a209d9cf7de762e54b6b7109bcdb#660c550b6311a209d9cf7de762e54b6b7109bcdb" dependencies = [ "prost", "serde", @@ -1293,7 +1296,7 @@ dependencies = [ [[package]] name = "libdd-trace-utils" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog/?rev=660c550b6311a209d9cf7de762e54b6b7109bcdb#660c550b6311a209d9cf7de762e54b6b7109bcdb" +source = "git+https://github.com/DataDog/libdatadog?rev=660c550b6311a209d9cf7de762e54b6b7109bcdb#660c550b6311a209d9cf7de762e54b6b7109bcdb" dependencies = [ "anyhow", "bytes", diff --git a/crates/datadog-serverless-compat/Cargo.toml b/crates/datadog-serverless-compat/Cargo.toml index c69d51f8..4483d949 100644 --- a/crates/datadog-serverless-compat/Cargo.toml +++ b/crates/datadog-serverless-compat/Cargo.toml @@ -7,7 +7,7 @@ description = "Binary to run trace-agent and dogstatsd servers in Serverless env [dependencies] datadog-trace-agent = { path = "../datadog-trace-agent" } -libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog/", rev = "660c550b6311a209d9cf7de762e54b6b7109bcdb" } +libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "660c550b6311a209d9cf7de762e54b6b7109bcdb" } dogstatsd = { path = "../dogstatsd", default-features = true } tokio = { version = "1", features = ["macros", "rt-multi-thread"] } tokio-util = { version = "0.7", default-features = false } diff --git a/crates/datadog-trace-agent/Cargo.toml b/crates/datadog-trace-agent/Cargo.toml index 2f2a349e..8a4c871a 100644 --- a/crates/datadog-trace-agent/Cargo.toml +++ b/crates/datadog-trace-agent/Cargo.toml @@ -20,18 +20,21 @@ async-trait = "0.1.64" tracing = { version = "0.1", default-features = false } serde = { version = "1.0.145", features = ["derive"] } serde_json = "1.0" -libdd-common = { git = "https://github.com/DataDog/libdatadog/", rev = "660c550b6311a209d9cf7de762e54b6b7109bcdb" } -libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog/", rev = "660c550b6311a209d9cf7de762e54b6b7109bcdb" } -libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog/", rev = "660c550b6311a209d9cf7de762e54b6b7109bcdb", features = [ +libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "660c550b6311a209d9cf7de762e54b6b7109bcdb" } +libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "660c550b6311a209d9cf7de762e54b6b7109bcdb" } +libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "660c550b6311a209d9cf7de762e54b6b7109bcdb", features = [ "mini_agent", ] } -libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog/", rev = "660c550b6311a209d9cf7de762e54b6b7109bcdb" } +libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "660c550b6311a209d9cf7de762e54b6b7109bcdb" } +datadog-fips = { path = "../datadog-fips" } +reqwest = { version = "0.12.23", features = ["json", "http2"], default-features = false } +bytes = "1.10.1" [dev-dependencies] rmp-serde = "1.1.1" serial_test = "2.0.0" duplicate = "0.4.1" tempfile = "3.3.0" -libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog/", rev = "660c550b6311a209d9cf7de762e54b6b7109bcdb", features = [ +libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "660c550b6311a209d9cf7de762e54b6b7109bcdb", features = [ "test-utils", ] }