remove serial_test dependency

Author: lalitb

opentelemetry-otlp/tests/integration_test/Cargo.toml

@@ -17,7 +17,6 @@ ctor = "0.2.9"
 uuid = { version = "1.3", features = ["v4"] }
 tracing-subscriber = { workspace = true, features = ["env-filter","registry", "std", "fmt"] }
 tracing = {workspace = true}
-serial_test = "3.2.0"
 
 [target.'cfg(unix)'.dependencies]
 opentelemetry-appender-tracing = { path = "../../../opentelemetry-appender-tracing", default-features = false}

opentelemetry-otlp/tests/integration_test/tests/logs.rs

@@ -89,42 +89,18 @@ mod logtests {
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
     #[cfg(any(feature = "tonic-client", feature = "reqwest-blocking-client"))]
-    #[serial_test::serial]
-    pub async fn test_logs() -> Result<()> {
-        // Make sure the container is running
-        use crate::{assert_logs_results, init_logs};
-        test_utils::start_collector_container().await?;
-        test_utils::cleanup_file("./actual/logs.json"); // Ensure logs.json is empty before the test
-        let logger_provider = init_logs(false).unwrap();
-        let layer = layer::OpenTelemetryTracingBridge::new(&logger_provider);
-        let subscriber = tracing_subscriber::registry().with(layer);
-        {
-            let _guard = tracing::subscriber::set_default(subscriber);
-            info!(target: "my-target", "hello from {}. My price is {}.", "banana", 2.99);
-        }
-        let _ = logger_provider.shutdown();
-        tokio::time::sleep(Duration::from_secs(5)).await;
-        assert_logs_results(test_utils::LOGS_FILE, "expected/logs.json")?;
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-    #[cfg(any(feature = "tonic-client", feature = "reqwest-blocking-client"))]
-    #[serial_test::parallel]
     pub async fn logs_batch_tokio_multi_thread() -> Result<()> {
         logs_tokio_helper(false).await
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
     #[cfg(any(feature = "tonic-client", feature = "reqwest-blocking-client"))]
-    #[serial_test::parallel]
     pub async fn logs_batch_tokio_multi_with_one_worker() -> Result<()> {
         logs_tokio_helper(false).await
     }
 
     #[tokio::test(flavor = "current_thread")]
     #[cfg(any(feature = "tonic-client", feature = "reqwest-blocking-client"))]
-    #[serial_test::parallel]
     pub async fn logs_batch_tokio_current() -> Result<()> {
         logs_tokio_helper(false).await
     }
@@ -151,14 +127,12 @@ mod logtests {
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
     #[cfg(any(feature = "tonic-client", feature = "reqwest-client"))]
-    #[serial_test::parallel]
     pub async fn logs_simple_tokio_multi_thread() -> Result<()> {
         logs_tokio_helper(true).await
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
     #[cfg(any(feature = "tonic-client", feature = "reqwest-client"))]
-    #[serial_test::parallel]
     pub async fn logs_simple_tokio_multi_with_one_worker() -> Result<()> {
         logs_tokio_helper(true).await
     }
@@ -167,14 +141,12 @@ mod logtests {
     #[ignore]
     #[tokio::test(flavor = "current_thread")]
     #[cfg(any(feature = "tonic-client", feature = "reqwest-client"))]
-    #[serial_test::parallel]
     pub async fn logs_simple_tokio_current() -> Result<()> {
         logs_tokio_helper(true).await
     }
 
     #[test]
     #[cfg(any(feature = "tonic-client", feature = "reqwest-blocking-client"))]
-    #[serial_test::parallel]
     pub fn logs_batch_non_tokio_main() -> Result<()> {
         logs_non_tokio_helper(false)
     }
@@ -207,7 +179,6 @@ mod logtests {
 
     #[test]
     #[cfg(any(feature = "tonic-client", feature = "reqwest-blocking-client"))]
-    #[serial_test::parallel]
     pub fn logs_simple_non_tokio_main() -> Result<()> {
         logs_non_tokio_helper(true)
     }

opentelemetry-otlp/tests/integration_test/tests/logs_serialize_deserialize.rs

@@ -0,0 +1,64 @@
+#![cfg(unix)]
+
+use anyhow::Result;
+use ctor::dtor;
+use integration_test_runner::logs_asserter::{read_logs_from_json, LogsAsserter};
+use integration_test_runner::test_utils;
+use opentelemetry_appender_tracing::layer;
+use opentelemetry_otlp::LogExporter;
+use opentelemetry_sdk::logs::LoggerProvider;
+use opentelemetry_sdk::Resource;
+use std::fs::File;
+use std::os::unix::fs::MetadataExt;
+use tracing::info;
+use tracing_subscriber::layer::SubscriberExt;
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+#[cfg(feature = "tonic-client")]
+pub async fn test_logs() -> Result<()> {
+    test_utils::start_collector_container().await?;
+    test_utils::cleanup_file("./actual/logs.json"); // Ensure logs.json is empty before the test
+    let exporter_builder = LogExporter::builder().with_tonic();
+    let exporter = exporter_builder.build()?;
+    let mut logger_provider_builder = LoggerProvider::builder();
+    logger_provider_builder = logger_provider_builder.with_batch_exporter(exporter);
+    let logger_provider = logger_provider_builder
+        .with_resource(
+            Resource::builder_empty()
+                .with_service_name("logs-integration-test")
+                .build(),
+        )
+        .build();
+    let layer = layer::OpenTelemetryTracingBridge::new(&logger_provider);
+    let subscriber = tracing_subscriber::registry().with(layer);
+
+    {
+        let _guard = tracing::subscriber::set_default(subscriber);
+        info!(target: "my-target", "hello from {}. My price is {}.", "banana", 2.99);
+    }
+
+    let _ = logger_provider.shutdown();
+    tokio::time::sleep(std::time::Duration::from_secs(5)).await;
+    assert_logs_results(test_utils::LOGS_FILE, "expected/logs.json")?;
+    Ok(())
+}
+
+fn assert_logs_results(result: &str, expected: &str) -> Result<()> {
+    let left = read_logs_from_json(File::open(expected)?)?;
+    let right = read_logs_from_json(File::open(result)?)?;
+
+    LogsAsserter::new(left, right).assert();
+
+    assert!(File::open(result).unwrap().metadata().unwrap().size() > 0);
+    Ok(())
+}
+
+///
+/// Make sure we stop the collector container, otherwise it will sit around hogging our
+/// ports and subsequent test runs will fail.
+///
+#[dtor]
+fn shutdown() {
+    println!("metrics::shutdown");
+    test_utils::stop_collector_container();
+}