remove custom interval and do shutdown

Author: cijothomas

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

@@ -11,6 +11,7 @@ use std::fs::File;
 use std::io::BufReader;
 use std::io::Read;
 use std::time::Duration;
+use tracing::info;
 
 static RESULT_PATH: &str = "actual/metrics.json";
 pub const SLEEP_DURATION: Duration = Duration::from_secs(5);
@@ -40,9 +41,7 @@ fn create_exporter() -> MetricExporter {
 /// Initializes the OpenTelemetry metrics pipeline
 fn init_meter_provider() -> SdkMeterProvider {
     let exporter = create_exporter();
-    let reader = PeriodicReader::builder(exporter)
-        .with_interval(Duration::from_secs(2))
-        .build();
+    let reader = PeriodicReader::builder(exporter).build();
     let resource = Resource::builder_empty()
         .with_service_name("metrics-integration-test")
         .build();
@@ -61,6 +60,7 @@ pub async fn setup_metrics_tokio() -> SdkMeterProvider {
     let _ = test_utils::start_collector_container().await;
     // Truncate results
     _ = File::create(RESULT_PATH).expect("it's good");
+    info!("Truncated metrics file");
 
     init_meter_provider()
 }

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

@@ -43,7 +43,7 @@ fn init_tracing() {
     INIT_TRACING.call_once(|| {
         // Info and above for all, debug for opentelemetry
         let filter_fmt =
-            EnvFilter::new("info").add_directive("opentelemetry=debug".parse().unwrap());
+            EnvFilter::new("info").add_directive("opentelemetry=warn".parse().unwrap());
         let fmt_layer = tracing_subscriber::fmt::layer()
             .with_thread_names(true)
             .with_filter(filter_fmt);

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

@@ -47,7 +47,7 @@ mod metrictests_roundtrip {
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
     async fn test_u64_counter() -> Result<()> {
-        let _result_path = metric_helpers::setup_metrics_tokio().await;
+        let meter_provider = metric_helpers::setup_metrics_tokio().await;
         const METER_NAME: &str = "test_u64_counter_meter";
 
         // Add data to u64_counter
@@ -62,6 +62,7 @@ mod metrictests_roundtrip {
             ],
         );
 
+        meter_provider.shutdown()?;
         tokio::time::sleep(SLEEP_DURATION).await;
 
         // Validate metrics against results file
@@ -72,13 +73,15 @@ mod metrictests_roundtrip {
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
     async fn test_histogram() -> Result<()> {
-        let _result_path = metric_helpers::setup_metrics_tokio().await;
+        let meter_provider = metric_helpers::setup_metrics_tokio().await;
         const METER_NAME: &str = "test_histogram_meter";
 
         // Add data to histogram
         let meter = opentelemetry::global::meter_provider().meter(METER_NAME);
         let histogram = meter.u64_histogram("example_histogram").build();
         histogram.record(42, &[KeyValue::new("mykey3", "myvalue4")]);
+
+        meter_provider.shutdown()?;
         tokio::time::sleep(SLEEP_DURATION).await;
 
         validate_metrics_against_results(METER_NAME)?;
@@ -88,13 +91,15 @@ mod metrictests_roundtrip {
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
     async fn test_up_down_counter() -> Result<()> {
-        let _result_path = metric_helpers::setup_metrics_tokio().await;
+        let meter_provider = metric_helpers::setup_metrics_tokio().await;
         const METER_NAME: &str = "test_up_down_meter";
 
         // Add data to up_down_counter
         let meter = opentelemetry::global::meter_provider().meter(METER_NAME);
         let up_down_counter = meter.i64_up_down_counter("example_up_down_counter").build();
         up_down_counter.add(-1, &[KeyValue::new("mykey5", "myvalue5")]);
+
+        meter_provider.shutdown()?;
         tokio::time::sleep(SLEEP_DURATION).await;
 
         validate_metrics_against_results(METER_NAME)?;