Make the test extensions defensively reset the GlobalOpenTelemetry in…

…stance before setting. (#3110)
open-telemetry · Apr 7, 2021 · 9a330d0 · 9a330d0
1 parent 531abc0
commit 9a330d0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/junit4/OpenTelemetryRule.java b/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/junit4/OpenTelemetryRule.java
@@ -92,6 +92,7 @@ public void clearSpans() {
 
   @Override
   protected void before() {
+    GlobalOpenTelemetry.resetForTest();
     GlobalOpenTelemetry.set(openTelemetry);
     clearSpans();
   }

diff --git a/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/junit5/OpenTelemetryExtension.java b/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/junit5/OpenTelemetryExtension.java
@@ -120,6 +120,7 @@ public void beforeEach(ExtensionContext context) {
 
   @Override
   public void beforeAll(ExtensionContext context) {
+    GlobalOpenTelemetry.resetForTest();
     GlobalOpenTelemetry.set(openTelemetry);
   }