Skip to content

Commit 3c22650

Browse files
authored
Merge branch 'main' into cijothomas/metric-api-instrument-builder-sync
2 parents 41587fa + ecfad5f commit 3c22650

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

opentelemetry-http/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ mod isahc {
125125
}
126126
}
127127

128-
#[cfg(any(feature = "hyper", feature = "hyper_tls"))]
128+
#[cfg(feature = "hyper")]
129129
pub mod hyper {
130130
use crate::ResponseExt;
131131

opentelemetry-proto/CHANGELOG.md

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

33
## vNext
44

5-
- Update protobuf definitions to v1.1.0 [#1668](https://github.com/open-telemetry/opentelemetry-rust/pull/1668)
5+
- Update protobuf definitions to v1.2.0 [#1668](https://github.com/open-telemetry/opentelemetry-rust/pull/1668)
6+
- Update protobuf definitions to v1.3.1 [#1721](https://github.com/open-telemetry/opentelemetry-rust/pull/1721)
67

78
## v0.5.0
89

0 commit comments

Comments
 (0)