Fix OpenTelemetry tests

.github/workflows/ci.yml

@@ -30,11 +30,10 @@ jobs:
       - run: cargo test --features=prometheus-exporter,prometheus-0_13
       - run: cargo test --features=prometheus-exporter,prometheus-client-0_21,exemplars-tracing
       - run: cargo test --features=prometheus-exporter,prometheus-client-0_21,exemplars-tracing-opentelemetry
-      # The tests using opentelemetry are currently failing because of this issue:
+      # The tests using opentelemetry need to be run with only one thread because of
       # https://github.com/open-telemetry/opentelemetry-rust/issues/1070
-      # We should remove the continue-on-error once that is fixed
-      - run: cargo test --features=prometheus-exporter,opentelemetry-0_19
-        continue-on-error: true
+      # We should remove the test-threads setting once that is fixed
+      - run: cargo test --features=prometheus-exporter,opentelemetry-0_19 -- --test-threads=1
 
       # Build the crate using the other optional features
       - run: cargo build --features=metrics-0_21,custom-objective-percentile,custom-objective-latency

autometrics/src/prometheus_exporter.rs

@@ -29,10 +29,6 @@ use once_cell::sync::OnceCell;
 use opentelemetry_api::metrics::MetricsError;
 #[cfg(opentelemetry)]
 use opentelemetry_prometheus::{exporter, PrometheusExporter};
-#[cfg(opentelemetry)]
-use opentelemetry_sdk::export::metrics::aggregation;
-#[cfg(opentelemetry)]
-use opentelemetry_sdk::metrics::{controllers, processors, selectors};
 #[cfg(any(opentelemetry, prometheus))]
 use prometheus::TextEncoder;
 use thiserror::Error;
@@ -237,15 +233,21 @@ fn initialize_prometheus_exporter() -> Result<GlobalPrometheus, ExporterInitiali
             .install_recorder()?,
 
         #[cfg(opentelemetry)]
-        opentelemetry_exporter: exporter(
-            controllers::basic(processors::factory(
+        opentelemetry_exporter: {
+            use opentelemetry_sdk::export::metrics::aggregation;
+            use opentelemetry_sdk::metrics::{controllers, processors, selectors};
+
+            let controller = controllers::basic(processors::factory(
                 selectors::simple::histogram(
                     crate::settings::get_settings().histogram_buckets.clone(),
                 ),
                 aggregation::cumulative_temporality_selector(),
-            ))
-            .build(),
-        )
-        .try_init()?,
+            ));
+
+            #[cfg(debug_assertions)]
+            let controller = controller.with_collect_period(std::time::Duration::ZERO);
+
+            exporter(controller.build()).try_init()?
+        },
     })
 }

autometrics/tests/integration_test.rs

@@ -14,7 +14,6 @@ fn single_function() {
     hello_world();
 
     let metrics = prometheus_exporter::encode_to_string().unwrap();
-    println!("{}", metrics);
     assert!(metrics.lines().any(|line| {
         (line.starts_with("function_calls_total{"))
             && line.contains(r#"function="hello_world""#)
@@ -163,7 +162,6 @@ fn caller_labels() {
     module_1::function_1();
 
     let metrics = prometheus_exporter::encode_to_string().unwrap();
-    println!("{}", metrics);
     assert!(metrics.lines().any(|line| {
         line.starts_with("function_calls_total{")
             && line.contains(r#"caller_function="function_1""#)