From 88dbfe67fbf56aecf29de9bc0b23a0abc72e3f29 Mon Sep 17 00:00:00 2001 From: Marcus Griep Date: Mon, 3 Jun 2024 03:12:56 -0600 Subject: [PATCH] feat: support opentelemetry 0.23 (#156) --- .github/workflows/ci.yml | 3 +++ CHANGELOG.md | 3 +++ reqwest-tracing/Cargo.toml | 5 +++++ reqwest-tracing/src/lib.rs | 1 + reqwest-tracing/src/middleware.rs | 1 + reqwest-tracing/src/otel.rs | 37 +++++++++++++++++++++++++++++++ 6 files changed, 50 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8acdf9a..a4eba60 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,7 @@ jobs: - opentelemetry_0_20 - opentelemetry_0_21 - opentelemetry_0_22 + - opentelemetry_0_23 steps: - name: Checkout repository uses: actions/checkout@v4 @@ -57,6 +58,7 @@ jobs: - opentelemetry_0_20 - opentelemetry_0_21 - opentelemetry_0_22 + - opentelemetry_0_23 steps: - name: Checkout repository uses: actions/checkout@v4 @@ -91,6 +93,7 @@ jobs: - opentelemetry_0_20 - opentelemetry_0_21 - opentelemetry_0_22 + - opentelemetry_0_23 steps: - name: Checkout repository uses: actions/checkout@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index d86cf9d..9a1b498 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added +- Added support for `opentelemetry` version `0.23`. + ## [0.3.1] ### Fixed diff --git a/reqwest-tracing/Cargo.toml b/reqwest-tracing/Cargo.toml index 31587df..f272d5f 100644 --- a/reqwest-tracing/Cargo.toml +++ b/reqwest-tracing/Cargo.toml @@ -13,6 +13,7 @@ categories = ["web-programming::http-client"] opentelemetry_0_20 = ["opentelemetry_0_20_pkg", "tracing-opentelemetry_0_21_pkg"] opentelemetry_0_21 = ["opentelemetry_0_21_pkg", "tracing-opentelemetry_0_22_pkg"] opentelemetry_0_22 = ["opentelemetry_0_22_pkg", "tracing-opentelemetry_0_23_pkg"] +opentelemetry_0_23 = ["opentelemetry_0_23_pkg", "tracing-opentelemetry_0_24_pkg"] [dependencies] @@ -28,9 +29,11 @@ tracing = "0.1.26" opentelemetry_0_20_pkg = { package = "opentelemetry", version = "0.20.0", optional = true } opentelemetry_0_21_pkg = { package = "opentelemetry", version = "0.21.0", optional = true } opentelemetry_0_22_pkg = { package = "opentelemetry", version = "0.22.0", optional = true } +opentelemetry_0_23_pkg = { package = "opentelemetry", version = "0.23.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 } [target.'cfg(target_arch = "wasm32")'.dependencies] getrandom = { version = "0.2.0", features = ["js"] } @@ -43,6 +46,8 @@ reqwest = { version = "0.12.0", features = ["rustls-tls"]} opentelemetry_sdk_0_21 = { package = "opentelemetry_sdk", version = "0.21.0", features = ["trace"] } opentelemetry_sdk_0_22 = { package = "opentelemetry_sdk", version = "0.22.0", features = ["trace"] } +opentelemetry_sdk_0_23 = { package = "opentelemetry_sdk", version = "0.23.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"] } +opentelemetry_stdout_0_4 = { package = "opentelemetry-stdout", version = "0.4.0", features = ["trace"] } diff --git a/reqwest-tracing/src/lib.rs b/reqwest-tracing/src/lib.rs index 7a8bae5..726b0d4 100644 --- a/reqwest-tracing/src/lib.rs +++ b/reqwest-tracing/src/lib.rs @@ -87,6 +87,7 @@ mod middleware; feature = "opentelemetry_0_20", feature = "opentelemetry_0_21", feature = "opentelemetry_0_22", + feature = "opentelemetry_0_23", ))] mod otel; mod reqwest_otel_span_builder; diff --git a/reqwest-tracing/src/middleware.rs b/reqwest-tracing/src/middleware.rs index 2340fda..404fd60 100644 --- a/reqwest-tracing/src/middleware.rs +++ b/reqwest-tracing/src/middleware.rs @@ -49,6 +49,7 @@ where feature = "opentelemetry_0_20", feature = "opentelemetry_0_21", feature = "opentelemetry_0_22", + feature = "opentelemetry_0_23", ))] let req = if extensions.get::().is_none() { // Adds tracing headers to the given request to propagate the OpenTelemetry context to downstream revivers of the request. diff --git a/reqwest-tracing/src/otel.rs b/reqwest-tracing/src/otel.rs index e99a637..72f7005 100644 --- a/reqwest-tracing/src/otel.rs +++ b/reqwest-tracing/src/otel.rs @@ -26,6 +26,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_23")] + opentelemetry_0_23_pkg::global::get_text_map_propagator(|injector| { + use tracing_opentelemetry_0_24_pkg::OpenTelemetrySpanExt; + let context = Span::current().context(); + injector.inject_context(&context, &mut RequestCarrier::new(&mut request)) + }); + request } @@ -74,6 +81,13 @@ impl<'a> opentelemetry_0_22_pkg::propagation::Injector for RequestCarrier<'a> { } } +#[cfg(feature = "opentelemetry_0_23")] +impl<'a> opentelemetry_0_23_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; @@ -163,6 +177,29 @@ mod test { subscriber.with(telemetry) }; + #[cfg(feature = "opentelemetry_0_23")] + let subscriber = { + use opentelemetry_0_23_pkg::trace::TracerProvider; + use opentelemetry_stdout_0_4::SpanExporterBuilder; + + let exporter = SpanExporterBuilder::default() + .with_writer(std::io::sink()) + .build(); + + let provider = opentelemetry_sdk_0_23::trace::TracerProvider::builder() + .with_simple_exporter(exporter) + .build(); + + let tracer = provider.tracer_builder("reqwest").build(); + let _ = opentelemetry_0_23_pkg::global::set_tracer_provider(provider); + opentelemetry_0_23_pkg::global::set_text_map_propagator( + opentelemetry_sdk_0_23::propagation::TraceContextPropagator::new(), + ); + + let telemetry = tracing_opentelemetry_0_24_pkg::layer().with_tracer(tracer); + subscriber.with(telemetry) + }; + tracing::subscriber::set_global_default(subscriber).unwrap(); });