Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
PHedro committed Nov 14, 2024
1 parent 11c7443 commit aef0d69
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 19 deletions.
22 changes: 11 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@ exclude = [".pre-commit-config.yaml"]
axum = ["dep:axum", "dep:tokio", "dep:axum-tracing-opentelemetry"]

[dependencies]
axum = { version = "^0.7.5", optional = true }
axum-tracing-opentelemetry = { version = "^0.18.1", optional = true }
axum = { version = "^0.7.7", optional = true }
axum-tracing-opentelemetry = { version = "^0.23.0", optional = true }
chrono = "^0.4.38"
opentelemetry = { version = "^0.23.0" }
opentelemetry_sdk = { version = "^0.23.0", features = ["rt-tokio"] }
opentelemetry-http = { version = "^0.12.0" }
opentelemetry-datadog = { version = "^0.11.0", features = ["reqwest-client"] }
reqwest = { version = "^0.11.27", default-features = false }
serde = { version = "^1.0.203", features = ["derive"] }
serde_json = "^1.0.118"
tokio = { version = "^1.38.0", features = [
opentelemetry = { version = "^0.26.0" }
opentelemetry_sdk = { version = "^0.26.0", features = ["rt-tokio"] }
opentelemetry-http = { version = "^0.26.0" }
opentelemetry-datadog = { version = "^0.14.0", features = ["reqwest-client"] }
reqwest = { version = "^0.12.9", default-features = false }
serde = { version = "^1.0.215", features = ["derive"] }
serde_json = "^1.0.132"
tokio = { version = "^1.41.1", features = [
"signal",
"macros",
], optional = true }
tracing = "^0.1.40"
tracing-appender = "^0.2.3"
tracing-opentelemetry = "^0.24.0"
tracing-opentelemetry = "^0.27.0"
tracing-serde = "^0.1.3"
tracing-subscriber = { version = "^0.3.18", features = ["env-filter", "json"] }
14 changes: 6 additions & 8 deletions src/tracer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
//!
//! It also contains a convenience function to build a layer with the tracer.
use std::env;
use opentelemetry_sdk::trace::{RandomIdGenerator, Sampler, Tracer};
use opentelemetry_sdk::trace;
use opentelemetry::global;
use std::time::Duration;
use opentelemetry::global;

pub use opentelemetry::trace::{TraceError, TraceId, TraceResult};
use opentelemetry_datadog::{ApiVersion, DatadogPropagator};
use opentelemetry_sdk::trace::{Config, RandomIdGenerator, Sampler, Tracer};
use tracing::Subscriber;
use tracing_opentelemetry::{OpenTelemetryLayer, PreSampledTracer};
use tracing_subscriber::registry::LookupSpan;

pub fn build_tracer() -> TraceResult<Tracer> {
pub fn build_tracer() -> Result<Tracer, TraceError> {
let service_name = env::var("DD_SERVICE")
.map_err(|_| <&str as Into<TraceError>>::into("missing DD_SERVICE"))?;

Expand All @@ -37,13 +37,11 @@ pub fn build_tracer() -> TraceResult<Tracer> {
.with_api_version(ApiVersion::Version05)
.with_agent_endpoint(format!("http://{dd_host}:{dd_port}"))
.with_trace_config(
trace::config()
.with_sampler(Sampler::AlwaysOn)
.with_id_generator(RandomIdGenerator::default()),
Config::default().with_sampler(Sampler::AlwaysOn).with_id_generator(RandomIdGenerator::default()),
)
.install_batch(opentelemetry_sdk::runtime::Tokio);

global::set_text_map_propagator(DatadogPropagator::default());
global::set_text_map_propagator(DatadogPropagator::new());

tracer
}
Expand Down

0 comments on commit aef0d69

Please sign in to comment.