Skip to content

Commit ab1ff8b

Browse files
authored
Merge branch 'main' into cijothomas/fix-periodic-reader
2 parents d7f8cd3 + c8ca03e commit ab1ff8b

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

opentelemetry-otlp/CHANGELOG.md

-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111

1212
### Added
1313

14-
- Aded `http/json` support for all signals ([#1585])
15-
16-
[#1585]: https://github.com/open-telemetry/opentelemetry-rust/pull/1585
17-
1814
- Added `DeltaTemporalitySelector` ([#1568])
1915
- Add `webkpi-roots` features to `reqwest` and `tonic` backends
2016

opentelemetry-otlp/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ tls-webkpi-roots = ["tls", "tonic/tls-webpki-roots"]
7272

7373
# http binary
7474
http-proto = ["prost", "opentelemetry-http", "opentelemetry-proto/gen-tonic-messages", "http", "trace", "metrics"]
75-
# http json
75+
# http json This does not work today due to known issue. See https://github.com/open-telemetry/opentelemetry-rust/issues/1763.
7676
http-json = ["serde_json", "prost", "opentelemetry-http", "opentelemetry-proto/gen-tonic-messages", "opentelemetry-proto/with-serde", "http", "trace", "metrics"]
7777
reqwest-blocking-client = ["reqwest/blocking", "opentelemetry-http/reqwest"]
7878
reqwest-client = ["reqwest", "opentelemetry-http/reqwest"]

opentelemetry-otlp/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
//! The following feature flags offer additional configurations on http:
103103
//!
104104
//! * `http-proto`: Use http as transport layer, protobuf as body format.
105-
//! * `http-json`: Use http as transport layer, JSON as body format.
106105
//! * `reqwest-blocking-client`: Use reqwest blocking http client.
107106
//! * `reqwest-client`: Use reqwest http client.
108107
//! * `reqwest-rustls`: Use reqwest with TLS with system trust roots via `rustls-native-certs` crate.

0 commit comments

Comments
 (0)