Skip to content

Commit

Permalink
fix: upstream trace propagation
Browse files Browse the repository at this point in the history
  • Loading branch information
fhsgoncalves committed Feb 10, 2024
1 parent 719fc5c commit e5b4a7c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
25 changes: 13 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "datadog-tracing"
version = "0.1.5"
version = "0.1.6"
authors = [
"Fernando Goncalves <[email protected]>",
"Alefh Sousa <[email protected]>"
Expand All @@ -20,20 +20,21 @@ axum = ["dep:axum", "dep:tokio", "dep:axum-tracing-opentelemetry"]

[dependencies]
axum = { version = "^0.6.10", optional = true }
#axum-tracing-opentelemetry = { path = "../tracing-opentelemetry-instrumentation-sdk", optional = true }
axum-tracing-opentelemetry = { git = "https://github.com/fhsgoncalves/tracing-opentelemetry-instrumentation-sdk", branch = "0.10.0-with-span-type-and-otel-0.21", optional = true }
chrono = "^0.4.24"
axum-tracing-opentelemetry = { version = "^0.10.0", optional = true }
chrono = "^0.4.33"
opentelemetry = { version = "^0.21.0"}
opentelemetry_sdk = { version = "^0.21.0", features = ["rt-tokio"] }
opentelemetry-http = { version = "^0.9.0" }
opentelemetry_sdk = { version = "^0.21.2", features = ["rt-tokio"] }
opentelemetry-http = { version = "^0.10.0" }
opentelemetry-datadog = { version = "0.9.0", features = ["reqwest-client"] }
#opentelemetry-datadog = { path = "../opentelemetry-rust-contrib/opentelemetry-datadog", features = ["reqwest-client"] }
reqwest = { version = "0.11", default-features = false }
serde = { version = "^1.0.156", features = ["derive"] }
serde_json = "^1.0.95"
tokio = { version = "^1.26.0", features = ["signal", "macros"], optional = true}
tracing = "^0.1.37"
tracing-appender = "0.2.2"
serde = { version = "^1.0.196", features = ["derive"] }
serde_json = "^1.0.113"
tokio = { version = "^1.36.0", features = ["signal", "macros"], optional = true}
tracing = "^0.1.40"
tracing-appender = "0.2.3"
tracing-opentelemetry = "^0.22.0"
tracing-serde = "^0.1.3"
tracing-subscriber = { version = "^0.3.18", features = ["env-filter", "json"] }

[patch.crates-io]
axum-tracing-opentelemetry = { git = "https://github.com/fhsgoncalves/tracing-opentelemetry-instrumentation-sdk", branch = "0.10.0-with-span-type-and-otel-0.21" }
2 changes: 1 addition & 1 deletion src/tracer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use opentelemetry_sdk::trace::{RandomIdGenerator, Sampler, Tracer};
use opentelemetry_sdk::trace;
use opentelemetry::global;
use std::time::Duration;
use opentelemetry::trace::{TraceError, TraceResult};
pub use opentelemetry::trace::{TraceError, TraceId, TraceResult};
use opentelemetry_datadog::{ApiVersion, DatadogPropagator};
use tracing::Subscriber;
use tracing_opentelemetry::{OpenTelemetryLayer, PreSampledTracer};
Expand Down

0 comments on commit e5b4a7c

Please sign in to comment.