Skip to content

Commit 2a526d7

Browse files
Fix feature flags (#1746)
1 parent de3147a commit 2a526d7

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

opentelemetry-otlp/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
- URL encoded values in `OTEL_EXPORTER_OTLP_HEADERS` are now correctly decoded. [#1578](https://github.com/open-telemetry/opentelemetry-rust/pull/1578)
88
- OTLP exporter will not change the URL added through `ExportConfig` [#1706](https://github.com/open-telemetry/opentelemetry-rust/pull/1706)
99
- Default grpc endpoint will not have path based on signal(e.g `/v1/traces`) [#1706](https://github.com/open-telemetry/opentelemetry-rust/pull/1706)
10+
- Fix feature flags for `OTEL_EXPORTER_OTLP_PROTOCOL_DEFAULT` [#1746](https://github.com/open-telemetry/opentelemetry-rust/pull/1746)
1011

1112
### Added
1213

opentelemetry-otlp/src/exporter/mod.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ pub const OTEL_EXPORTER_OTLP_COMPRESSION: &str = "OTEL_EXPORTER_OTLP_COMPRESSION
3131
#[cfg(feature = "http-json")]
3232
/// Default protocol, using http-json.
3333
pub const OTEL_EXPORTER_OTLP_PROTOCOL_DEFAULT: &str = OTEL_EXPORTER_OTLP_PROTOCOL_HTTP_JSON;
34-
#[cfg(all(
35-
feature = "http-proto",
36-
not(any(feature = "grpc-tonic", feature = "http-json"))
37-
))]
34+
#[cfg(all(feature = "http-proto", not(feature = "http-json")))]
3835
/// Default protocol, using http-proto.
3936
pub const OTEL_EXPORTER_OTLP_PROTOCOL_DEFAULT: &str = OTEL_EXPORTER_OTLP_PROTOCOL_HTTP_PROTOBUF;
4037
#[cfg(all(

opentelemetry-proto/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
- Update protobuf definitions to v1.2.0 [#1668](https://github.com/open-telemetry/opentelemetry-rust/pull/1668)
66
- Update protobuf definitions to v1.3.1 [#1721](https://github.com/open-telemetry/opentelemetry-rust/pull/1721)
7+
- Fix the feature flag condition of `opentelemetry-proto/src/transform/logs.rs` [#1746](https://github.com/open-telemetry/opentelemetry-rust/pull/1746)
78

89
## v0.5.0
910

opentelemetry-proto/src/transform/logs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#[cfg(feature = "gen-tonic")]
1+
#[cfg(feature = "gen-tonic-messages")]
22
pub mod tonic {
33
use crate::{
44
tonic::{

0 commit comments

Comments
 (0)