From 1d43a8631f48e434dd9dd9de9c9a6b9bea8d4e24 Mon Sep 17 00:00:00 2001 From: Duncan Harvey Date: Sun, 17 Aug 2025 17:05:03 -0400 Subject: [PATCH 1/2] use tracing for all logs in datadog-serverless-compat --- Cargo.lock | 49 +------------------- crates/datadog-serverless-compat/Cargo.toml | 2 - crates/datadog-serverless-compat/src/main.rs | 7 +-- 3 files changed, 3 insertions(+), 55 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ed681d9..79fa2f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -774,8 +774,6 @@ dependencies = [ "datadog-trace-protobuf", "datadog-trace-utils", "dogstatsd", - "env_logger", - "log", "tokio", "tokio-util", "tracing", @@ -1104,19 +1102,6 @@ dependencies = [ "syn 2.0.100", ] -[[package]] -name = "env_logger" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - [[package]] name = "equivalent" version = "1.0.2" @@ -1460,12 +1445,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" -[[package]] -name = "hermit-abi" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e" - [[package]] name = "hex" version = "0.4.3" @@ -1633,12 +1612,6 @@ dependencies = [ "url", ] -[[package]] -name = "humantime" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" - [[package]] name = "hyper" version = "0.14.32" @@ -1980,17 +1953,6 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" -[[package]] -name = "is-terminal" -version = "0.4.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" -dependencies = [ - "hermit-abi 0.5.0", - "libc", - "windows-sys 0.59.0", -] - [[package]] name = "itertools" version = "0.11.0" @@ -2508,7 +2470,7 @@ checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi 0.4.0", + "hermit-abi", "pin-project-lite", "rustix 0.38.44", "tracing", @@ -3546,15 +3508,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - [[package]] name = "testcontainers" version = "0.22.0" diff --git a/crates/datadog-serverless-compat/Cargo.toml b/crates/datadog-serverless-compat/Cargo.toml index 1bcab6c..62f9480 100644 --- a/crates/datadog-serverless-compat/Cargo.toml +++ b/crates/datadog-serverless-compat/Cargo.toml @@ -6,8 +6,6 @@ license.workspace = true description = "Binary to run trace-agent and dogstatsd servers in Serverless environments" [dependencies] -log = "0.4" -env_logger = "0.10.0" datadog-trace-agent = { path = "../datadog-trace-agent" } datadog-trace-protobuf = { git = "https://github.com/DataDog/libdatadog/", rev = "4eb2b8673354f974591c61bab3f7d485b4c119e0" } datadog-trace-utils = { git = "https://github.com/DataDog/libdatadog/", rev = "4eb2b8673354f974591c61bab3f7d485b4c119e0" } diff --git a/crates/datadog-serverless-compat/src/main.rs b/crates/datadog-serverless-compat/src/main.rs index 24f7f5f..8609012 100644 --- a/crates/datadog-serverless-compat/src/main.rs +++ b/crates/datadog-serverless-compat/src/main.rs @@ -7,13 +7,12 @@ #![cfg_attr(not(test), deny(clippy::todo))] #![cfg_attr(not(test), deny(clippy::unimplemented))] -use env_logger::Builder; -use log::{debug, error, info}; -use std::{env, str::FromStr, sync::Arc, sync::Mutex}; +use std::{env, sync::Arc, sync::Mutex}; use tokio::{ sync::Mutex as TokioMutex, time::{interval, Duration}, }; +use tracing::{debug, error, info}; use tracing_subscriber::EnvFilter; use datadog_trace_agent::{ @@ -47,8 +46,6 @@ pub async fn main() { let log_level = env::var("DD_LOG_LEVEL") .map(|val| val.to_lowercase()) .unwrap_or("info".to_string()); - let level_filter = log::LevelFilter::from_str(&log_level).unwrap_or(log::LevelFilter::Info); - Builder::new().filter_level(level_filter).init(); let (_, env_type) = match read_cloud_env() { Some(value) => value, From 1475b0c300a32bb08707a32bd0f1cb9aa5826cb2 Mon Sep 17 00:00:00 2001 From: Duncan Harvey Date: Mon, 25 Aug 2025 14:15:18 -0400 Subject: [PATCH 2/2] update 3rd party licenses --- LICENSE-3rdparty.csv | 4 ---- 1 file changed, 4 deletions(-) diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 05693d4..05c03de 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -78,7 +78,6 @@ either,https://github.com/rayon-rs/either,MIT OR Apache-2.0,bluss ena,https://github.com/rust-lang/ena,MIT OR Apache-2.0,Niko Matsakis encoding_rs,https://github.com/hsivonen/encoding_rs,(Apache-2.0 OR MIT) AND BSD-3-Clause,Henri Sivonen enum-as-inner,https://github.com/bluejekyll/enum-as-inner,MIT OR Apache-2.0,Benjamin Fry -env_logger,https://github.com/rust-cli/env_logger,MIT OR Apache-2.0,The env_logger Authors equivalent,https://github.com/indexmap-rs/equivalent,Apache-2.0 OR MIT,The equivalent Authors errno,https://github.com/lambda-fairy/rust-errno,MIT OR Apache-2.0,Chris Wong event-listener,https://github.com/smol-rs/event-listener,Apache-2.0 OR MIT,Stjepan Glavina @@ -120,7 +119,6 @@ http-body,https://github.com/hyperium/http-body,MIT,"Carl Lerche httpdate,https://github.com/pyfisch/httpdate,MIT OR Apache-2.0,Pyfisch httpmock,https://github.com/alexliesenfeld/httpmock,MIT,Alexander Liesenfeld -humantime,https://github.com/chronotope/humantime,MIT OR Apache-2.0,The humantime Authors hyper,https://github.com/hyperium/hyper,MIT,Sean McArthur hyper-http-proxy,https://github.com/metalbear-co/hyper-http-proxy,MIT,MetalBear Tech LTD hyper-named-pipe,https://github.com/fussybeaver/hyper-named-pipe,Apache-2.0,The hyper-named-pipe Authors @@ -145,7 +143,6 @@ indexmap,https://github.com/bluss/indexmap,Apache-2.0 OR MIT,The indexmap Author indexmap,https://github.com/indexmap-rs/indexmap,Apache-2.0 OR MIT,The indexmap Authors ipconfig,https://github.com/liranringel/ipconfig,MIT OR Apache-2.0,Liran Ringel ipnet,https://github.com/krisprice/ipnet,MIT OR Apache-2.0,Kris Price -is-terminal,https://github.com/sunfishcode/is-terminal,MIT,"softprops , Dan Gohman " itertools,https://github.com/rust-itertools/itertools,MIT OR Apache-2.0,bluss itoa,https://github.com/dtolnay/itoa,MIT OR Apache-2.0,David Tolnay jobserver,https://github.com/rust-lang/jobserver-rs,MIT OR Apache-2.0,Alex Crichton @@ -272,7 +269,6 @@ sync_wrapper,https://github.com/Actyx/sync_wrapper,Apache-2.0,Actyx AG tempfile,https://github.com/Stebalien/tempfile,MIT OR Apache-2.0,"Steven Allen , The Rust Project Developers, Ashley Mannix , Jason White " term,https://github.com/Stebalien/term,MIT OR Apache-2.0,"The Rust Project Developers, Steven Allen" -termcolor,https://github.com/BurntSushi/termcolor,Unlicense OR MIT,Andrew Gallant testcontainers,https://github.com/testcontainers/testcontainers-rs,MIT OR Apache-2.0,"Thomas Eizinger, Artem Medvedev , Mervyn McCreight" thiserror,https://github.com/dtolnay/thiserror,MIT OR Apache-2.0,David Tolnay thread_local,https://github.com/Amanieu/thread_local-rs,MIT OR Apache-2.0,Amanieu d'Antras