Merge branch 'main' into cijothomas/metric-api-instrument-builder-sync

cijothomas · web-flow · commit 3c22650ea94c · 2024-05-07T17:09:25.000-07:00
diff --git a/opentelemetry-http/src/lib.rs b/opentelemetry-http/src/lib.rs
@@ -125,7 +125,7 @@ mod isahc {
     }
 }
 
-#[cfg(any(feature = "hyper", feature = "hyper_tls"))]
+#[cfg(feature = "hyper")]
 pub mod hyper {
     use crate::ResponseExt;
 
diff --git a/opentelemetry-proto/CHANGELOG.md b/opentelemetry-proto/CHANGELOG.md
@@ -2,7 +2,8 @@
 
 ## vNext
 
-- Update protobuf definitions to v1.1.0 [#1668](https://github.com/open-telemetry/opentelemetry-rust/pull/1668)
+- Update protobuf definitions to v1.2.0 [#1668](https://github.com/open-telemetry/opentelemetry-rust/pull/1668)
+- Update protobuf definitions to v1.3.1 [#1721](https://github.com/open-telemetry/opentelemetry-rust/pull/1721)
 
 ## v0.5.0
 
diff --git a/opentelemetry-proto/src/proto/opentelemetry-proto b/opentelemetry-proto/src/proto/opentelemetry-proto
@@ -1 +1 @@
-Subproject commit 24d4bc002003c74db7aa608c8e254155daf8e49d
+Subproject commit b3060d2104df364136d75a35779e6bd48bac449a

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ mod isahc {`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`
`128`		`-#[cfg(any(feature = "hyper", feature = "hyper_tls"))]`
	`128`	`+#[cfg(feature = "hyper")]`
`129`	`129`	`pub mod hyper {`
`130`	`130`	`use crate::ResponseExt;`
`131`	`131`