Skip to content

Commit

Permalink
feat: support OTel 0.27
Browse files Browse the repository at this point in the history
  • Loading branch information
SimenB committed Nov 13, 2024
1 parent 4e85660 commit a266455
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 0 deletions.
4 changes: 4 additions & 0 deletions reqwest-tracing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ opentelemetry_0_23 = ["opentelemetry_0_23_pkg", "tracing-opentelemetry_0_24_pkg"
opentelemetry_0_24 = ["opentelemetry_0_24_pkg", "tracing-opentelemetry_0_25_pkg"]
opentelemetry_0_25 = ["opentelemetry_0_25_pkg", "tracing-opentelemetry_0_26_pkg"]
opentelemetry_0_26 = ["opentelemetry_0_26_pkg", "tracing-opentelemetry_0_27_pkg"]
opentelemetry_0_27 = ["opentelemetry_0_27_pkg", "tracing-opentelemetry_0_28_pkg"]
# This feature ensures that both the old (deprecated) and new attributes are published simultaneously.
# By doing so, we maintain backward compatibility, allowing existing code that relies on the old attributes
# to continue functioning while encouraging the transition to the new attributes.
Expand All @@ -39,13 +40,15 @@ opentelemetry_0_23_pkg = { package = "opentelemetry", version = "0.23.0", option
opentelemetry_0_24_pkg = { package = "opentelemetry", version = "0.24.0", optional = true }
opentelemetry_0_25_pkg = { package = "opentelemetry", version = "0.25.0", optional = true }
opentelemetry_0_26_pkg = { package = "opentelemetry", version = "0.26.0", optional = true }
opentelemetry_0_27_pkg = { package = "opentelemetry", version = "0.27.0", optional = true }
tracing-opentelemetry_0_21_pkg = { package = "tracing-opentelemetry", version = "0.21.0", optional = true }
tracing-opentelemetry_0_22_pkg = { package = "tracing-opentelemetry", version = "0.22.0", optional = true }
tracing-opentelemetry_0_23_pkg = { package = "tracing-opentelemetry", version = "0.23.0", optional = true }
tracing-opentelemetry_0_24_pkg = { package = "tracing-opentelemetry", version = "0.24.0", optional = true }
tracing-opentelemetry_0_25_pkg = { package = "tracing-opentelemetry", version = "0.25.0", optional = true }
tracing-opentelemetry_0_26_pkg = { package = "tracing-opentelemetry", version = "0.26.0", optional = true }
tracing-opentelemetry_0_27_pkg = { package = "tracing-opentelemetry", version = "0.27.0", optional = true }
tracing-opentelemetry_0_28_pkg = { package = "tracing-opentelemetry", version = "0.28.0", optional = true }

[target.'cfg(target_arch = "wasm32")'.dependencies]
getrandom = { version = "0.2.0", features = ["js"] }
Expand All @@ -62,6 +65,7 @@ opentelemetry_sdk_0_23 = { package = "opentelemetry_sdk", version = "0.23.0", fe
opentelemetry_sdk_0_24 = { package = "opentelemetry_sdk", version = "0.24.1", features = ["trace"] }
opentelemetry_sdk_0_25 = { package = "opentelemetry_sdk", version = "0.25.0", features = ["trace"] }
opentelemetry_sdk_0_26 = { package = "opentelemetry_sdk", version = "0.26.0", features = ["trace"] }
opentelemetry_sdk_0_27 = { package = "opentelemetry_sdk", version = "0.27.0", features = ["trace"] }
opentelemetry_stdout_0_1 = { package = "opentelemetry-stdout", version = "0.1.0", features = ["trace"] }
opentelemetry_stdout_0_2 = { package = "opentelemetry-stdout", version = "0.2.0", features = ["trace"] }
opentelemetry_stdout_0_3 = { package = "opentelemetry-stdout", version = "0.3.0", features = ["trace"] }
Expand Down
1 change: 1 addition & 0 deletions reqwest-tracing/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ mod middleware;
feature = "opentelemetry_0_24",
feature = "opentelemetry_0_25",
feature = "opentelemetry_0_26",
feature = "opentelemetry_0_27",
))]
mod otel;
mod reqwest_otel_span_builder;
Expand Down
1 change: 1 addition & 0 deletions reqwest-tracing/src/middleware.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ where
feature = "opentelemetry_0_24",
feature = "opentelemetry_0_25",
feature = "opentelemetry_0_26",
feature = "opentelemetry_0_27",
))]
let req = if extensions.get::<crate::DisableOtelPropagation>().is_none() {
// Adds tracing headers to the given request to propagate the OpenTelemetry context to downstream revivers of the request.
Expand Down
30 changes: 30 additions & 0 deletions reqwest-tracing/src/otel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,13 @@ pub fn inject_opentelemetry_context_into_request(mut request: Request) -> Reques
injector.inject_context(&context, &mut RequestCarrier::new(&mut request))
});

#[cfg(feature = "opentelemetry_0_27")]
opentelemetry_0_27_pkg::global::get_text_map_propagator(|injector| {
use tracing_opentelemetry_0_28_pkg::OpenTelemetrySpanExt;
let context = Span::current().context();
injector.inject_context(&context, &mut RequestCarrier::new(&mut request))
});

request
}

Expand Down Expand Up @@ -130,6 +137,13 @@ impl<'a> opentelemetry_0_26_pkg::propagation::Injector for RequestCarrier<'a> {
}
}

#[cfg(feature = "opentelemetry_0_27")]
impl<'a> opentelemetry_0_27_pkg::propagation::Injector for RequestCarrier<'a> {
fn set(&mut self, key: &str, value: String) {
self.set_inner(key, value)
}
}

#[cfg(test)]
mod test {
use std::sync::OnceLock;
Expand Down Expand Up @@ -297,6 +311,22 @@ mod test {
subscriber.with(telemetry)
};

#[cfg(feature = "opentelemetry_0_27")]
let subscriber = {
use opentelemetry_0_27_pkg::trace::TracerProvider;

let provider = opentelemetry_sdk_0_27::trace::TracerProvider::builder().build();

let tracer = provider.tracer_builder("reqwest").build();
let _ = opentelemetry_0_27_pkg::global::set_tracer_provider(provider);
opentelemetry_0_27_pkg::global::set_text_map_propagator(
opentelemetry_sdk_0_27::propagation::TraceContextPropagator::new(),
);

let telemetry = tracing_opentelemetry_0_28_pkg::layer().with_tracer(tracer);
subscriber.with(telemetry)
};

tracing::subscriber::set_global_default(subscriber).unwrap();
});

Expand Down

0 comments on commit a266455

Please sign in to comment.