Skip to content

Commit ba076cf

Browse files
committed
move webkpi roots to opentelemetry-http and use feature flags from opentelemetry-http to enable webkpi roots
1 parent 2a5ea62 commit ba076cf

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

opentelemetry-http/CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## vNext
44

5+
- Add `reqwest-rustls-webkpi-roots` feature flag to configure `reqwest` to use embedded `webkpi-roots`.
6+
57
## v0.11.1
68

79
- Add feature flag enabling users to configure `reqwest` usage to use rustls via

opentelemetry-http/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ rust-version = "1.65"
1111

1212
[features]
1313
reqwest-rustls = ["reqwest", "reqwest/rustls-tls-native-roots"]
14+
reqwest-rustls-webkpi-roots = ["reqwest", "reqwest/rustls-tls-webpki-roots"]
1415

1516
[dependencies]
1617
async-trait = { workspace = true }

opentelemetry-otlp/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ tls-webkpi-roots = ["tls", "tonic/tls-webpki-roots"]
7373
http-proto = ["prost", "opentelemetry-http", "opentelemetry-proto/gen-tonic-messages", "http", "trace", "metrics"]
7474
reqwest-blocking-client = ["reqwest/blocking", "opentelemetry-http/reqwest"]
7575
reqwest-client = ["reqwest", "opentelemetry-http/reqwest"]
76-
reqwest-rustls = ["reqwest", "reqwest/rustls-tls-native-roots"]
77-
reqwest-rustls-webkpi-roots = ["reqwest", "reqwest/rustls-tls-webpki-roots"]
76+
reqwest-rustls = ["reqwest", "opentelemetry-http/reqwest-rustls"]
77+
reqwest-rustls-webkpi-roots = ["reqwest", "opentelemetry-http/reqwest-rustls-webkpi-roots"]
7878

7979
# test
8080
integration-testing = ["tonic", "prost", "tokio/full", "trace"]

0 commit comments

Comments
 (0)