Skip to content

Commit 4486207

Browse files
authored
fix: Add feature flag to otel-http crate to better reflect purpose (#3112)
1 parent bbb1821 commit 4486207

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

opentelemetry-http/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

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

810
## 0.30.0
911

opentelemetry-http/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ autobenches = false
1313
[features]
1414
default = ["internal-logs"]
1515
hyper = ["dep:http-body-util", "dep:hyper", "dep:hyper-util", "dep:tokio"]
16-
reqwest-rustls = ["reqwest", "reqwest/rustls-tls-native-roots"]
17-
reqwest-rustls-webpki-roots = ["reqwest", "reqwest/rustls-tls-webpki-roots"]
16+
reqwest = ["dep:reqwest"]
17+
reqwest-blocking = ["dep:reqwest", "reqwest/blocking"]
18+
reqwest-rustls = ["dep:reqwest", "reqwest/rustls-tls-native-roots"]
19+
reqwest-rustls-webpki-roots = ["dep:reqwest", "reqwest/rustls-tls-webpki-roots"]
1820
internal-logs = ["opentelemetry/internal-logs"]
1921

2022
[dependencies]
@@ -25,7 +27,7 @@ http-body-util = { workspace = true, optional = true }
2527
hyper = { workspace = true, optional = true }
2628
hyper-util = { workspace = true, features = ["client-legacy", "http1", "http2"], optional = true }
2729
opentelemetry = { workspace = true, features = ["trace"] }
28-
reqwest = { workspace = true, features = ["blocking"], optional = true }
30+
reqwest = { workspace = true, optional = true }
2931
tokio = { workspace = true, features = ["time"], optional = true }
3032

3133
[lints]

opentelemetry-http/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ mod reqwest {
108108
}
109109

110110
#[cfg(not(target_arch = "wasm32"))]
111+
#[cfg(feature = "reqwest-blocking")]
111112
#[async_trait]
112113
impl HttpClient for reqwest::blocking::Client {
113114
async fn send_bytes(&self, request: Request<Bytes>) -> Result<Response<Bytes>, HttpError> {

opentelemetry-otlp/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ tls-webpki-roots = ["tls", "tonic/tls-webpki-roots"]
8383
# http binary
8484
http-proto = ["prost", "opentelemetry-http", "opentelemetry-proto/gen-tonic-messages", "http", "trace", "metrics"]
8585
http-json = ["serde_json", "prost", "opentelemetry-http", "opentelemetry-proto/gen-tonic-messages", "opentelemetry-proto/with-serde", "http", "trace", "metrics"]
86-
reqwest-blocking-client = ["reqwest/blocking", "opentelemetry-http/reqwest"]
86+
reqwest-blocking-client = ["reqwest/blocking", "opentelemetry-http/reqwest-blocking"]
8787
reqwest-client = ["reqwest", "opentelemetry-http/reqwest"]
8888
reqwest-rustls = ["reqwest", "opentelemetry-http/reqwest-rustls"]
8989
reqwest-rustls-webpki-roots = ["reqwest", "opentelemetry-http/reqwest-rustls-webpki-roots"]

opentelemetry-zipkin/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ rustdoc-args = ["--cfg", "docsrs"]
2222

2323
[features]
2424
default = ["reqwest-blocking-client", "reqwest/native-tls"]
25-
reqwest-blocking-client = ["reqwest/blocking", "opentelemetry-http/reqwest"]
25+
reqwest-blocking-client = ["reqwest/blocking", "opentelemetry-http/reqwest-blocking"]
2626
reqwest-client = ["reqwest", "opentelemetry-http/reqwest"]
2727
reqwest-rustls = ["reqwest", "reqwest/rustls-tls-native-roots"]
2828

0 commit comments

Comments
 (0)