From 51baf9fbe2224868681ad365635d2c49f20a6b3a Mon Sep 17 00:00:00 2001 From: Reiley Yang Date: Wed, 24 Apr 2024 14:46:05 -0700 Subject: [PATCH] Improve BatchExportActivityProcessorTest.CheckShutdownExport stability (#5567) --- .../Trace/BatchExportActivityProcessorTest.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/OpenTelemetry.Tests/Trace/BatchExportActivityProcessorTest.cs b/test/OpenTelemetry.Tests/Trace/BatchExportActivityProcessorTest.cs index 14a97e39c91..bce50338359 100644 --- a/test/OpenTelemetry.Tests/Trace/BatchExportActivityProcessorTest.cs +++ b/test/OpenTelemetry.Tests/Trace/BatchExportActivityProcessorTest.cs @@ -118,7 +118,7 @@ public void CheckForceFlushExport(int timeout) [InlineData(Timeout.Infinite)] [InlineData(0)] [InlineData(1)] - public void CheckShutdownExport(int timeout) + public void CheckShutdownExport(int timeoutMilliseconds) { var exportedItems = new List(); using var exporter = new InMemoryExporter(exportedItems); @@ -134,12 +134,11 @@ public void CheckShutdownExport(int timeout) }; processor.OnEnd(activity); - processor.Shutdown(timeout); + processor.Shutdown(timeoutMilliseconds); - if (timeout == 0) + if (timeoutMilliseconds < 1_000) { - // Shutdown(0) will trigger flush and return immediately, so let's sleep for a while - Thread.Sleep(1_000); + Thread.Sleep(1_000 - timeoutMilliseconds); } Assert.Single(exportedItems);