Merge branch 'main' into cijothomas/tracing-error

Author: cijothomas

README.md

@@ -181,7 +181,6 @@ you're more than welcome to participate!
 
 * [Cijo Thomas](https://github.com/cijothomas)
 * [Harold Dost](https://github.com/hdost)
-* [Julian Tescher](https://github.com/jtescher)
 * [Lalit Kumar Bhasin](https://github.com/lalitb)
 * [Utkarsh Umesan Pillai](https://github.com/utpilla)
 * [Zhongyang Wu](https://github.com/TommyCpp)
@@ -195,6 +194,7 @@ you're more than welcome to participate!
 
 * [Dirkjan Ochtman](https://github.com/djc)
 * [Jan Kühle](https://github.com/frigus02)
+* [Julian Tescher](https://github.com/jtescher)
 * [Isobel Redelmeier](https://github.com/iredelmeier)
 * [Mike Goldsmith](https://github.com/MikeGoldsmith)
 

opentelemetry-otlp/src/exporter/mod.rs

@@ -342,6 +342,7 @@ mod tests {
     #[cfg(feature = "logs")]
     #[cfg(any(feature = "http-proto", feature = "http-json"))]
     #[test]
+    #[ignore = "Unstable due to interference from env variable tests. Re-enable after https://github.com/open-telemetry/opentelemetry-rust/issues/2818 is resolved."]
     fn export_builder_error_invalid_http_endpoint() {
         use std::time::Duration;
 
@@ -358,15 +359,20 @@ mod tests {
             .with_export_config(ex_config)
             .build();
 
-        assert!(matches!(
-            exporter_result,
-            Err(crate::exporter::ExporterBuildError::InvalidUri(_, _))
-        ));
+        assert!(
+            matches!(
+                exporter_result,
+                Err(crate::exporter::ExporterBuildError::InvalidUri(_, _))
+            ),
+            "Expected InvalidUri error, but got {:?}",
+            exporter_result
+        );
     }
 
     #[cfg(feature = "grpc-tonic")]
-    #[test]
-    fn export_builder_error_invalid_grpc_endpoint() {
+    #[tokio::test]
+    #[ignore = "Unstable due to interference from env variable tests. Re-enable after https://github.com/open-telemetry/opentelemetry-rust/issues/2818 is resolved."]
+    async fn export_builder_error_invalid_grpc_endpoint() {
         use std::time::Duration;
 
         use crate::{ExportConfig, LogExporter, Protocol, WithExportConfig};