diff --git a/Cargo.lock b/Cargo.lock index 4f43b42..774b3d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -568,7 +568,7 @@ dependencies = [ "bytes", "futures-util", "hyper 0.14.30", - "telemetry-batteries", + "telemetry-batteries 0.1.0 (git+https://github.com/worldcoin/telemetry-batteries.git?rev=802a4f39f358e077b11c8429b4c65f3e45b85959)", "tracing", ] @@ -6062,6 +6062,34 @@ version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" +[[package]] +name = "telemetry-batteries" +version = "0.1.0" +source = "git+https://github.com/worldcoin/telemetry-batteries.git?rev=12cc036234b4e9b86f22ff7e35d499e2ff1e6304#12cc036234b4e9b86f22ff7e35d499e2ff1e6304" +dependencies = [ + "chrono", + "dirs", + "http 0.2.12", + "metrics 0.22.3", + "metrics-exporter-prometheus", + "metrics-exporter-statsd", + "opentelemetry", + "opentelemetry-datadog", + "opentelemetry-http", + "opentelemetry_sdk", + "rand", + "reqwest", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", + "tracing-appender", + "tracing-opentelemetry", + "tracing-serde", + "tracing-subscriber 0.3.18", +] + [[package]] name = "telemetry-batteries" version = "0.1.0" @@ -7483,8 +7511,6 @@ dependencies = [ "indoc", "maplit", "metrics 0.21.1", - "opentelemetry", - "opentelemetry-datadog", "rand", "rayon", "reqwest", @@ -7496,7 +7522,7 @@ dependencies = [ "sqlx", "statrs", "take_mut", - "telemetry-batteries", + "telemetry-batteries 0.1.0 (git+https://github.com/worldcoin/telemetry-batteries.git?rev=12cc036234b4e9b86f22ff7e35d499e2ff1e6304)", "tempfile", "testcontainers", "testcontainers-modules", diff --git a/Cargo.toml b/Cargo.toml index 5c05e5f..c29a32e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,8 +31,6 @@ hex = "0.4" hyper = { version = "^0.14.27", features = ["server", "tcp", "http1", "http2"] } maplit = "1.0.2" metrics = "0.21.1" -opentelemetry = "0.21.0" -opentelemetry-datadog = "0.9.0" rand = { version = "0.8.5", features = ["small_rng"] } rayon = "1.10.0" ruint = "1.11.0" @@ -43,7 +41,7 @@ serde = { version = "1.0.189", features = ["derive"] } serde_json = "1.0" serde_path_to_error = "0.1.16" take_mut = "0.2.2" -telemetry-batteries = { git = "https://github.com/worldcoin/telemetry-batteries.git", rev = "802a4f39f358e077b11c8429b4c65f3e45b85959" } +telemetry-batteries = { git = "https://github.com/worldcoin/telemetry-batteries.git", rev = "12cc036234b4e9b86f22ff7e35d499e2ff1e6304" } tempfile = "3.10.1" thiserror = "1.0" tokio = { version = "1.34.0", features = ["sync", "macros", "rt-multi-thread"] } diff --git a/src/bin/world_tree.rs b/src/bin/world_tree.rs index 79e97ba..0ecd66b 100644 --- a/src/bin/world_tree.rs +++ b/src/bin/world_tree.rs @@ -3,7 +3,6 @@ use std::path::PathBuf; use clap::Parser; use futures::stream::FuturesUnordered; use futures::StreamExt; -use opentelemetry_datadog::DatadogPropagator; use telemetry_batteries::metrics::statsd::StatsdBattery; use telemetry_batteries::tracing::datadog::DatadogBattery; use telemetry_batteries::tracing::TracingShutdownHandle; @@ -37,7 +36,6 @@ pub async fn main() -> WorldTreeResult<()> { let config = ServiceConfig::load(opts.config.as_deref())?; let _tracing_shutdown_handle = if let Some(telemetry) = &config.telemetry { - opentelemetry::global::set_text_map_propagator(DatadogPropagator::new()); let tracing_shutdown_handle = DatadogBattery::init( telemetry.traces_endpoint.as_deref(), &telemetry.service_name,