Skip to content

Commit 1beffd2

Browse files
EAimTYTommyCppcijothomas
authored
Fix typos in webpki feature name (#1842)
Signed-off-by: EAimTY <EAimTY@users.noreply.github.com> Co-authored-by: Zhongyang Wu <zhongyang.wu@outlook.com> Co-authored-by: Cijo Thomas <cijo.thomas@gmail.com>
1 parent 7cad751 commit 1beffd2

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

opentelemetry-http/CHANGELOG.md

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

33
## vNext
44

5+
- **Breaking** Correct the misspelling of "webkpi" to "webpki" in features [#1842](https://github.com/open-telemetry/opentelemetry-rust/pull/1842)
6+
57
## v0.12.0
68

79
- Add `reqwest-rustls-webkpi-roots` feature flag to configure [`reqwest`](https://docs.rs/reqwest/0.11.27/reqwest/index.html#optional-features) to use embedded `webkpi-roots`.

opentelemetry-http/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +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"]
14+
reqwest-rustls-webpki-roots = ["reqwest", "reqwest/rustls-tls-webpki-roots"]
1515

1616
[dependencies]
1717
async-trait = { workspace = true }

opentelemetry-otlp/CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ now use `.with_resource(RESOURCE::default())` to configure Resource when using
1414
`OtlpLogPipeline`.
1515
- **Breaking** The methods `OtlpTracePipeline::install_simple()` and `OtlpTracePipeline::install_batch()` would now return `TracerProvider` instead of `Tracer`.
1616
These methods would also no longer set the global tracer provider. It would now be the responsibility of users to set it by calling `global::set_tracer_provider(tracer_provider.clone());`. Refer to the [basic-otlp](https://github.com/open-telemetry/opentelemetry-rust/blob/main/opentelemetry-otlp/examples/basic-otlp/src/main.rs) and [basic-otlp-http](https://github.com/open-telemetry/opentelemetry-rust/blob/main/opentelemetry-otlp/examples/basic-otlp-http/src/main.rs) examples on how to initialize OTLP Trace Exporter.
17+
- **Breaking** Correct the misspelling of "webkpi" to "webpki" in features [#1842](https://github.com/open-telemetry/opentelemetry-rust/pull/1842)
1718
- Bump MSRV to 1.70 [#1840](https://github.com/open-telemetry/opentelemetry-rust/pull/1840)
1819

19-
2020
## v0.16.0
2121

2222
### Fixed

opentelemetry-otlp/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ grpc-tonic = ["tonic", "prost", "http", "tokio", "opentelemetry-proto/gen-tonic"
6767
gzip-tonic = ["tonic/gzip"]
6868
tls = ["tonic/tls"]
6969
tls-roots = ["tls", "tonic/tls-roots"]
70-
tls-webkpi-roots = ["tls", "tonic/tls-webpki-roots"]
70+
tls-webpki-roots = ["tls", "tonic/tls-webpki-roots"]
7171

7272
# http binary
7373
http-proto = ["prost", "opentelemetry-http", "opentelemetry-proto/gen-tonic-messages", "http", "trace", "metrics"]
@@ -76,7 +76,7 @@ http-json = ["serde_json", "prost", "opentelemetry-http", "opentelemetry-proto/g
7676
reqwest-blocking-client = ["reqwest/blocking", "opentelemetry-http/reqwest"]
7777
reqwest-client = ["reqwest", "opentelemetry-http/reqwest"]
7878
reqwest-rustls = ["reqwest", "opentelemetry-http/reqwest-rustls"]
79-
reqwest-rustls-webkpi-roots = ["reqwest", "opentelemetry-http/reqwest-rustls-webkpi-roots"]
79+
reqwest-rustls-webpki-roots = ["reqwest", "opentelemetry-http/reqwest-rustls-webpki-roots"]
8080

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

0 commit comments

Comments
 (0)