.

Author: scottgerring

opentelemetry-otlp/tests/integration_test/src/test_utils.rs

@@ -18,17 +18,20 @@
 //!
 #![cfg(unix)]
 
-use std::collections::HashMap;
+use anyhow::Result;
+use opentelemetry::{otel_debug, otel_info};
 use std::fs;
 use std::fs::File;
 use std::os::unix::fs::PermissionsExt;
 use std::sync::{Arc, Mutex, Once, OnceLock};
-use testcontainers::{core::{IntoContainerPort, WaitFor}, runners::AsyncRunner, ContainerAsync, GenericImage, ImageExt};
-use testcontainers::core::{ContainerPort, Mount};
 use testcontainers::core::wait::HttpWaitStrategy;
+use testcontainers::core::{ContainerPort, Mount};
+use testcontainers::{
+    core::WaitFor,
+    runners::AsyncRunner,
+    ContainerAsync, GenericImage, ImageExt,
+};
 use tracing_subscriber::FmtSubscriber;
-use opentelemetry::{otel_debug, otel_info};
-use anyhow::Result;
 
 // Static references for container management
 static COLLECTOR_ARC: OnceLock<Mutex<Option<Arc<ContainerAsync<GenericImage>>>>> = OnceLock::new();
@@ -71,13 +74,26 @@ pub async fn start_collector_container() -> Result<()> {
             .with_wait_for(WaitFor::http(
                 HttpWaitStrategy::new("/")
                     .with_expected_status_code(404u16)
-                    .with_port(ContainerPort::Tcp(4318))))
+                    .with_port(ContainerPort::Tcp(4318)),
+            ))
             .with_mapped_port(4317, ContainerPort::Tcp(4317))
             .with_mapped_port(4318, ContainerPort::Tcp(4318))
-            .with_mount(Mount::bind_mount(fs::canonicalize("./otel-collector-config.yaml")?.to_string_lossy(), "/etc/otelcol/config.yaml"))
-            .with_mount(Mount::bind_mount(fs::canonicalize("./actual/logs.json")?.to_string_lossy(), "/testresults/logs.json"))
-            .with_mount(Mount::bind_mount(fs::canonicalize("./actual/metrics.json")?.to_string_lossy(), "/testresults/metrics.json"))
-            .with_mount(Mount::bind_mount(fs::canonicalize("./actual/traces.json")?.to_string_lossy(), "/testresults/traces.json"))
+            .with_mount(Mount::bind_mount(
+                fs::canonicalize("./otel-collector-config.yaml")?.to_string_lossy(),
+                "/etc/otelcol/config.yaml",
+            ))
+            .with_mount(Mount::bind_mount(
+                fs::canonicalize("./actual/logs.json")?.to_string_lossy(),
+                "/testresults/logs.json",
+            ))
+            .with_mount(Mount::bind_mount(
+                fs::canonicalize("./actual/metrics.json")?.to_string_lossy(),
+                "/testresults/metrics.json",
+            ))
+            .with_mount(Mount::bind_mount(
+                fs::canonicalize("./actual/traces.json")?.to_string_lossy(),
+                "/testresults/traces.json",
+            ))
             .start()
             .await?;
 
@@ -112,12 +128,24 @@ fn upsert_empty_file(path: &str) -> File {
 /// suite shutting down!
 ///
 pub fn stop_collector_container() {
+    // This is a bit heinous. We get called after tokio has shutdown, but testcontainers
+    // needs an async runtime to shutdown, so we create a temporary new one just for this
+    // purpose.
+    // https://github.com/testcontainers/testcontainers-rs/issues/707
     otel_debug!(name: "stop_collector_container");
+    tokio::runtime::Runtime::new()
+        .unwrap()
+        .block_on(stop_it())
+        .expect("Couldn't create runtime to shutdown");
+}
+
+async fn stop_it() -> Result<()> {
     if let Some(container) = COLLECTOR_ARC
         .get()
         .and_then(|arc_lock| arc_lock.lock().unwrap().take())
     {
-        container.stop();
+        container.stop().await?;
         otel_debug!(name: "stop_collector_container::stopped");
     }
+    Ok(())
 }

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

@@ -137,7 +137,7 @@ pub fn fetch_latest_metrics_for_scope(scope_name: &str) -> Result<Value> {
 ///
 /// Performs setup for metrics tests
 ///
-async fn setup_metrics_test() {
+async fn setup_metrics_test() -> Result<()> {
     // Make sure the collector container is running
     start_collector_container().await?;
 
@@ -152,6 +152,8 @@ async fn setup_metrics_test() {
 
     // Truncate results
     _ = File::create(RESULT_PATH).expect("it's good");
+
+    Ok(())
 }
 
 ///