Merge branch 'main' into re-export-tonic

cijothomas · web-flow · commit a46b8811de7a · 2025-04-06T09:37:28.000-07:00
diff --git a/opentelemetry-sdk/src/trace/mod.rs b/opentelemetry-sdk/src/trace/mod.rs
@@ -136,7 +136,11 @@ mod tests {
             }
         }
 
-        fn on_end(&self, _span: SpanData) {}
+        fn on_end(&self, _span: SpanData) {
+            // TODO: Accessing Context::current() will panic today and hence commented out.
+            // See https://github.com/open-telemetry/opentelemetry-rust/issues/2871
+            // let _c = Context::current();
+        }
 
         fn force_flush(&self) -> crate::error::OTelSdkResult {
             Ok(())

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,11 @@ mod tests {`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
`139`		`- fn on_end(&self, _span: SpanData) {}`
	`139`	`+ fn on_end(&self, _span: SpanData) {`
	`140`	`+ // TODO: Accessing Context::current() will panic today and hence commented out.`
	`141`	`+ // See https://github.com/open-telemetry/opentelemetry-rust/issues/2871`
	`142`	`+ // let _c = Context::current();`
	`143`	`+ }`
`140`	`144`
`141`	`145`	`fn force_flush(&self) -> crate::error::OTelSdkResult {`
`142`	`146`	`Ok(())`