From 8c2d561ea9df09ae21b89cc0ea6e70fa4d23c828 Mon Sep 17 00:00:00 2001 From: Duncan Harvey Date: Fri, 25 Apr 2025 10:49:03 -0400 Subject: [PATCH 1/3] rename serverless-compat directory to datadog-serverless-compat --- .../{serverless-compat => datadog-serverless-compat}/Cargo.toml | 0 .../{serverless-compat => datadog-serverless-compat}/src/main.rs | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename crates/{serverless-compat => datadog-serverless-compat}/Cargo.toml (100%) rename crates/{serverless-compat => datadog-serverless-compat}/src/main.rs (100%) diff --git a/crates/serverless-compat/Cargo.toml b/crates/datadog-serverless-compat/Cargo.toml similarity index 100% rename from crates/serverless-compat/Cargo.toml rename to crates/datadog-serverless-compat/Cargo.toml diff --git a/crates/serverless-compat/src/main.rs b/crates/datadog-serverless-compat/src/main.rs similarity index 100% rename from crates/serverless-compat/src/main.rs rename to crates/datadog-serverless-compat/src/main.rs From 81cdcf249373dd2237e40ad4f694b4103907a995 Mon Sep 17 00:00:00 2001 From: Duncan Harvey Date: Fri, 25 Apr 2025 10:49:21 -0400 Subject: [PATCH 2/3] rename trace-agent directory to datadog-trace-agent --- crates/datadog-serverless-compat/Cargo.toml | 2 +- crates/{trace-agent => datadog-trace-agent}/Cargo.toml | 0 crates/{trace-agent => datadog-trace-agent}/src/aggregator.rs | 0 crates/{trace-agent => datadog-trace-agent}/src/config.rs | 0 crates/{trace-agent => datadog-trace-agent}/src/env_verifier.rs | 0 crates/{trace-agent => datadog-trace-agent}/src/http_utils.rs | 0 crates/{trace-agent => datadog-trace-agent}/src/lib.rs | 0 crates/{trace-agent => datadog-trace-agent}/src/mini_agent.rs | 0 .../{trace-agent => datadog-trace-agent}/src/stats_flusher.rs | 0 .../{trace-agent => datadog-trace-agent}/src/stats_processor.rs | 0 .../{trace-agent => datadog-trace-agent}/src/trace_flusher.rs | 0 .../{trace-agent => datadog-trace-agent}/src/trace_processor.rs | 0 12 files changed, 1 insertion(+), 1 deletion(-) rename crates/{trace-agent => datadog-trace-agent}/Cargo.toml (100%) rename crates/{trace-agent => datadog-trace-agent}/src/aggregator.rs (100%) rename crates/{trace-agent => datadog-trace-agent}/src/config.rs (100%) rename crates/{trace-agent => datadog-trace-agent}/src/env_verifier.rs (100%) rename crates/{trace-agent => datadog-trace-agent}/src/http_utils.rs (100%) rename crates/{trace-agent => datadog-trace-agent}/src/lib.rs (100%) rename crates/{trace-agent => datadog-trace-agent}/src/mini_agent.rs (100%) rename crates/{trace-agent => datadog-trace-agent}/src/stats_flusher.rs (100%) rename crates/{trace-agent => datadog-trace-agent}/src/stats_processor.rs (100%) rename crates/{trace-agent => datadog-trace-agent}/src/trace_flusher.rs (100%) rename crates/{trace-agent => datadog-trace-agent}/src/trace_processor.rs (100%) diff --git a/crates/datadog-serverless-compat/Cargo.toml b/crates/datadog-serverless-compat/Cargo.toml index 5986bc1..b4a3c08 100644 --- a/crates/datadog-serverless-compat/Cargo.toml +++ b/crates/datadog-serverless-compat/Cargo.toml @@ -8,7 +8,7 @@ description = "Binary to run trace-agent and dogstatsd servers in Serverless env [dependencies] log = "0.4" env_logger = "0.10.0" -trace-agent = { path = "../trace-agent" } +trace-agent = { path = "../datadog-trace-agent" } datadog-trace-protobuf = { git = "https://github.com/DataDog/libdatadog/", rev = "d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae" } datadog-trace-utils = { git = "https://github.com/DataDog/libdatadog/", rev = "d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae" } dogstatsd = { path = "../dogstatsd", default-features = false } diff --git a/crates/trace-agent/Cargo.toml b/crates/datadog-trace-agent/Cargo.toml similarity index 100% rename from crates/trace-agent/Cargo.toml rename to crates/datadog-trace-agent/Cargo.toml diff --git a/crates/trace-agent/src/aggregator.rs b/crates/datadog-trace-agent/src/aggregator.rs similarity index 100% rename from crates/trace-agent/src/aggregator.rs rename to crates/datadog-trace-agent/src/aggregator.rs diff --git a/crates/trace-agent/src/config.rs b/crates/datadog-trace-agent/src/config.rs similarity index 100% rename from crates/trace-agent/src/config.rs rename to crates/datadog-trace-agent/src/config.rs diff --git a/crates/trace-agent/src/env_verifier.rs b/crates/datadog-trace-agent/src/env_verifier.rs similarity index 100% rename from crates/trace-agent/src/env_verifier.rs rename to crates/datadog-trace-agent/src/env_verifier.rs diff --git a/crates/trace-agent/src/http_utils.rs b/crates/datadog-trace-agent/src/http_utils.rs similarity index 100% rename from crates/trace-agent/src/http_utils.rs rename to crates/datadog-trace-agent/src/http_utils.rs diff --git a/crates/trace-agent/src/lib.rs b/crates/datadog-trace-agent/src/lib.rs similarity index 100% rename from crates/trace-agent/src/lib.rs rename to crates/datadog-trace-agent/src/lib.rs diff --git a/crates/trace-agent/src/mini_agent.rs b/crates/datadog-trace-agent/src/mini_agent.rs similarity index 100% rename from crates/trace-agent/src/mini_agent.rs rename to crates/datadog-trace-agent/src/mini_agent.rs diff --git a/crates/trace-agent/src/stats_flusher.rs b/crates/datadog-trace-agent/src/stats_flusher.rs similarity index 100% rename from crates/trace-agent/src/stats_flusher.rs rename to crates/datadog-trace-agent/src/stats_flusher.rs diff --git a/crates/trace-agent/src/stats_processor.rs b/crates/datadog-trace-agent/src/stats_processor.rs similarity index 100% rename from crates/trace-agent/src/stats_processor.rs rename to crates/datadog-trace-agent/src/stats_processor.rs diff --git a/crates/trace-agent/src/trace_flusher.rs b/crates/datadog-trace-agent/src/trace_flusher.rs similarity index 100% rename from crates/trace-agent/src/trace_flusher.rs rename to crates/datadog-trace-agent/src/trace_flusher.rs diff --git a/crates/trace-agent/src/trace_processor.rs b/crates/datadog-trace-agent/src/trace_processor.rs similarity index 100% rename from crates/trace-agent/src/trace_processor.rs rename to crates/datadog-trace-agent/src/trace_processor.rs From 035fe498a545bfc13a0519879e21446f48f79c75 Mon Sep 17 00:00:00 2001 From: Duncan Harvey Date: Fri, 25 Apr 2025 10:51:25 -0400 Subject: [PATCH 3/3] rename trace-agent crate to datadog-trace-agent --- Cargo.lock | 52 ++++++++++---------- crates/datadog-serverless-compat/Cargo.toml | 2 +- crates/datadog-serverless-compat/src/main.rs | 2 +- crates/datadog-trace-agent/Cargo.toml | 2 +- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 574f1cf..561d6e8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -745,6 +745,7 @@ dependencies = [ name = "datadog-serverless-compat" version = "0.1.0" dependencies = [ + "datadog-trace-agent", "datadog-trace-protobuf", "datadog-trace-utils", "dogstatsd", @@ -752,12 +753,36 @@ dependencies = [ "log", "tokio", "tokio-util", - "trace-agent", "tracing", "tracing-core", "tracing-subscriber", ] +[[package]] +name = "datadog-trace-agent" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "datadog-trace-normalization", + "datadog-trace-obfuscation", + "datadog-trace-protobuf", + "datadog-trace-utils", + "ddcommon", + "duplicate", + "http-body-util", + "hyper 1.6.0", + "hyper-util", + "rmp-serde", + "serde", + "serde_json", + "serial_test", + "tempfile", + "tokio", + "tower", + "tracing", +] + [[package]] name = "datadog-trace-normalization" version = "17.0.0" @@ -3793,31 +3818,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" -[[package]] -name = "trace-agent" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "datadog-trace-normalization", - "datadog-trace-obfuscation", - "datadog-trace-protobuf", - "datadog-trace-utils", - "ddcommon", - "duplicate", - "http-body-util", - "hyper 1.6.0", - "hyper-util", - "rmp-serde", - "serde", - "serde_json", - "serial_test", - "tempfile", - "tokio", - "tower", - "tracing", -] - [[package]] name = "tracing" version = "0.1.41" diff --git a/crates/datadog-serverless-compat/Cargo.toml b/crates/datadog-serverless-compat/Cargo.toml index b4a3c08..0996127 100644 --- a/crates/datadog-serverless-compat/Cargo.toml +++ b/crates/datadog-serverless-compat/Cargo.toml @@ -8,7 +8,7 @@ description = "Binary to run trace-agent and dogstatsd servers in Serverless env [dependencies] log = "0.4" env_logger = "0.10.0" -trace-agent = { path = "../datadog-trace-agent" } +datadog-trace-agent = { path = "../datadog-trace-agent" } datadog-trace-protobuf = { git = "https://github.com/DataDog/libdatadog/", rev = "d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae" } datadog-trace-utils = { git = "https://github.com/DataDog/libdatadog/", rev = "d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae" } dogstatsd = { path = "../dogstatsd", default-features = false } diff --git a/crates/datadog-serverless-compat/src/main.rs b/crates/datadog-serverless-compat/src/main.rs index 7f1cce0..270d03a 100644 --- a/crates/datadog-serverless-compat/src/main.rs +++ b/crates/datadog-serverless-compat/src/main.rs @@ -16,7 +16,7 @@ use tokio::{ }; use tracing_subscriber::EnvFilter; -use trace_agent::{ +use datadog_trace_agent::{ aggregator::TraceAggregator, config, env_verifier, mini_agent, stats_flusher, stats_processor, trace_flusher::{self, TraceFlusher}, diff --git a/crates/datadog-trace-agent/Cargo.toml b/crates/datadog-trace-agent/Cargo.toml index 538829b..98e12fd 100644 --- a/crates/datadog-trace-agent/Cargo.toml +++ b/crates/datadog-trace-agent/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "trace-agent" +name = "datadog-trace-agent" version = "0.1.0" license.workspace = true edition.workspace = true