Merge branch 'main' into fix-metrics-u64-serialization

lalitb · web-flow · commit 56b975d813c7 · 2025-01-04T02:02:49.000+05:30
diff --git a/opentelemetry-otlp/tests/integration_test/tests/logs.rs b/opentelemetry-otlp/tests/integration_test/tests/logs.rs
@@ -99,6 +99,7 @@ mod logtests {
         Ok(())
     }
 
+    #[ignore = "TODO: [Fix Me] Failing on CI. Needs to be investigated and resolved."]
     #[test]
     #[cfg(any(feature = "tonic-client", feature = "reqwest-blocking-client"))]
     pub fn logs_batch_non_tokio_main() -> Result<()> {
diff --git a/opentelemetry-otlp/tests/integration_test/tests/traces.rs b/opentelemetry-otlp/tests/integration_test/tests/traces.rs
@@ -141,6 +141,7 @@ pub fn test_serde() -> Result<()> {
     Ok(())
 }
 
+#[ignore = "TODO: [Fix Me] Failing on CI. Needs to be investigated and resolved."]
 #[test]
 #[cfg(any(feature = "tonic-client", feature = "reqwest-blocking-client"))]
 pub fn span_batch_non_tokio_main() -> Result<()> {

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,7 @@ mod logtests {`
`99`	`99`	`Ok(())`
`100`	`100`	`}`
`101`	`101`
	`102`	`+ #[ignore = "TODO: [Fix Me] Failing on CI. Needs to be investigated and resolved."]`
`102`	`103`	`#[test]`
`103`	`104`	`#[cfg(any(feature = "tonic-client", feature = "reqwest-blocking-client"))]`
`104`	`105`	`pub fn logs_batch_non_tokio_main() -> Result<()> {`
Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,7 @@ pub fn test_serde() -> Result<()> {`
`141`	`141`	`Ok(())`
`142`	`142`	`}`
`143`	`143`
	`144`	`+#[ignore = "TODO: [Fix Me] Failing on CI. Needs to be investigated and resolved."]`
`144`	`145`	`#[test]`
`145`	`146`	`#[cfg(any(feature = "tonic-client", feature = "reqwest-blocking-client"))]`
`146`	`147`	`pub fn span_batch_non_tokio_main() -> Result<()> {`