Merge branch 'main' into cijothomas/otlp-useragent

Author: cijothomas

opentelemetry-http/CHANGELOG.md

@@ -4,6 +4,8 @@
 
 - Implementation of `Extractor::get_all` for `HeaderExtractor`
 - Support `HttpClient` implementation for `HyperClient<C>` with custom connectors beyond `HttpConnector`, enabling Unix Domain Socket connections and other custom transports
+- Add `reqwest` and `reqwest-blocking` features to enable async and blocking
+  reqwest HTTP clients
 
 ## 0.30.0
 

opentelemetry-http/Cargo.toml

@@ -13,8 +13,10 @@ autobenches = false
 [features]
 default = ["internal-logs"]
 hyper = ["dep:http-body-util", "dep:hyper", "dep:hyper-util", "dep:tokio"]
-reqwest-rustls = ["reqwest", "reqwest/rustls-tls-native-roots"]
-reqwest-rustls-webpki-roots = ["reqwest", "reqwest/rustls-tls-webpki-roots"]
+reqwest = ["dep:reqwest"]
+reqwest-blocking = ["dep:reqwest", "reqwest/blocking"]
+reqwest-rustls = ["dep:reqwest", "reqwest/rustls-tls-native-roots"]
+reqwest-rustls-webpki-roots = ["dep:reqwest", "reqwest/rustls-tls-webpki-roots"]
 internal-logs = ["opentelemetry/internal-logs"]
 
 [dependencies]
@@ -25,7 +27,7 @@ http-body-util = { workspace = true, optional = true }
 hyper = { workspace = true, optional = true }
 hyper-util = { workspace = true, features = ["client-legacy", "http1", "http2"], optional = true }
 opentelemetry = { workspace = true, features = ["trace"] }
-reqwest = { workspace = true, features = ["blocking"], optional = true }
+reqwest = { workspace = true, optional = true }
 tokio = { workspace = true, features = ["time"], optional = true }
 
 [lints]

opentelemetry-http/src/lib.rs

@@ -108,6 +108,7 @@ mod reqwest {
     }
 
     #[cfg(not(target_arch = "wasm32"))]
+    #[cfg(feature = "reqwest-blocking")]
     #[async_trait]
     impl HttpClient for reqwest::blocking::Client {
         async fn send_bytes(&self, request: Request<Bytes>) -> Result<Response<Bytes>, HttpError> {

opentelemetry-otlp/Cargo.toml

@@ -83,7 +83,7 @@ tls-webpki-roots = ["tls", "tonic/tls-webpki-roots"]
 # http binary
 http-proto = ["prost", "opentelemetry-http", "opentelemetry-proto/gen-tonic-messages", "http", "trace", "metrics"]
 http-json = ["serde_json", "prost", "opentelemetry-http", "opentelemetry-proto/gen-tonic-messages", "opentelemetry-proto/with-serde", "http", "trace", "metrics"]
-reqwest-blocking-client = ["reqwest/blocking", "opentelemetry-http/reqwest"]
+reqwest-blocking-client = ["reqwest/blocking", "opentelemetry-http/reqwest-blocking"]
 reqwest-client = ["reqwest", "opentelemetry-http/reqwest"]
 reqwest-rustls = ["reqwest", "opentelemetry-http/reqwest-rustls"]
 reqwest-rustls-webpki-roots = ["reqwest", "opentelemetry-http/reqwest-rustls-webpki-roots"]

opentelemetry-otlp/src/lib.rs

@@ -40,7 +40,7 @@
 //!
 //!     // Create a tracer provider with the exporter
 //!     let tracer_provider = opentelemetry_sdk::trace::SdkTracerProvider::builder()
-//!         .with_simple_exporter(otlp_exporter)
+//!         .with_batch_exporter(otlp_exporter)
 //!         .build();
 //!
 //!     // Set it as the global provider
@@ -83,7 +83,7 @@
 //!
 //!     // Create a tracer provider with the exporter
 //!     let tracer_provider = opentelemetry_sdk::trace::SdkTracerProvider::builder()
-//!         .with_simple_exporter(otlp_exporter)
+//!         .with_batch_exporter(otlp_exporter)
 //!         .build();
 //!
 //!     // Set it as the global provider
@@ -116,7 +116,7 @@
 //!             .build()
 //!             .expect("Failed to create span exporter");
 //!         opentelemetry_sdk::trace::SdkTracerProvider::builder()
-//!             .with_simple_exporter(exporter)
+//!             .with_batch_exporter(exporter)
 //!             .build()
 //!     });
 //!
@@ -203,40 +203,6 @@
 //! `http://localhost:9090`
 //! ## Show Logs, Metrics too (TODO)
 //!
-//! ## Performance
-//!
-//! For optimal performance, a batch exporting processor is recommended as the simple
-//! processor will export each span synchronously on dropping, and is only good
-//! for test/debug purposes.
-//!
-//! ```toml
-//! [dependencies]
-//! opentelemetry-otlp = { version = "*", features = ["grpc-tonic"] }
-//! ```
-//!
-//! ```no_run
-//! # #[cfg(all(feature = "trace", feature = "grpc-tonic"))]
-//! # {
-//! use opentelemetry::global;
-//! use opentelemetry::trace::Tracer;
-//!
-//! fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
-//!     // First, create a OTLP exporter builder. Configure it as you need.
-//!     let otlp_exporter = opentelemetry_otlp::SpanExporter::builder().with_tonic().build()?;
-//!     // Then pass it into provider builder
-//!     let _ = opentelemetry_sdk::trace::SdkTracerProvider::builder()
-//!         .with_batch_exporter(otlp_exporter)
-//!         .build();
-//!     let tracer = global::tracer("my_tracer");
-//!     tracer.in_span("doing_work", |cx| {
-//!         // Traced app logic here...
-//!     });
-//!
-//!     Ok(())
-//!   # }
-//! }
-//! ```
-//!
 //! [`tokio`]: https://tokio.rs
 //!
 //! # Feature Flags

opentelemetry-zipkin/Cargo.toml

@@ -22,7 +22,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [features]
 default = ["reqwest-blocking-client", "reqwest/native-tls"]
-reqwest-blocking-client = ["reqwest/blocking", "opentelemetry-http/reqwest"]
+reqwest-blocking-client = ["reqwest/blocking", "opentelemetry-http/reqwest-blocking"]
 reqwest-client = ["reqwest", "opentelemetry-http/reqwest"]
 reqwest-rustls = ["reqwest", "reqwest/rustls-tls-native-roots"]