Merge branch 'main' into cijothomas/metric-observables1

cijothomas · web-flow · commit 5a41a1f6eb81 · 2024-05-07T11:00:15.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;
 

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`