enable parallel tests

Azure · Feb 23, 2021 · 3749fad · 3749fad
1 parent d2f79ae
commit 3749fad
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/sdk/core/azure-core-tracing-opentelemetry/pom.xml b/sdk/core/azure-core-tracing-opentelemetry/pom.xml
@@ -110,6 +110,18 @@
           </compilerArgs>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-surefire-plugin;external_dependency} -->
+        <configuration>
+          <systemPropertyVariables>
+            <!-- Parallel runs disabled due to concurrency issues when registering the global tracer. -->
+            <junit.jupiter.execution.parallel.enabled>false</junit.jupiter.execution.parallel.enabled>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/...opentelemetry/src/main/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracer.java b/...opentelemetry/src/main/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracer.java
@@ -11,7 +11,6 @@
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.core.util.tracing.ProcessKind;
 import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.api.trace.Span;

diff --git a/...telemetry/src/test/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracerTest.java b/...telemetry/src/test/java/com/azure/core/tracing/opentelemetry/OpenTelemetryTracerTest.java
@@ -74,10 +74,9 @@ public class OpenTelemetryTracerTest {
         TRACE_ID_OFFSET + TRACE_ID_HEX_SIZE + TRACEPARENT_DELIMITER_SIZE;
     private static final int TRACE_OPTION_OFFSET =
         SPAN_ID_OFFSET + SPAN_ID_HEX_SIZE + TRACEPARENT_DELIMITER_SIZE;
-    private static OpenTelemetrySdk openTelemetry;
+    private static OpenTelemetryTracer openTelemetryTracer;
 
     private Tracer tracer;
-    private OpenTelemetryTracer openTelemetryTracer;
     private Context tracingContext;
     private Span parentSpan;
     private Scope scope;
@@ -94,19 +93,19 @@ public static void setUpAll() {
         // reset the global object before attempting to register
         GlobalOpenTelemetry.resetForTest();
         // Register the global tracer.
-        openTelemetry = OpenTelemetrySdk.builder().buildAndRegisterGlobal();
+        OpenTelemetrySdk.builder().buildAndRegisterGlobal();
+        openTelemetryTracer = new OpenTelemetryTracer();
     }
 
     @BeforeEach
     public void setUp() {
         // Get the global singleton Tracer object.
-        tracer = openTelemetry.getTracer("TracerSdkTest");
+        tracer = GlobalOpenTelemetry.getTracer("TracerSdkTest");
         // Start user parent span.
         parentSpan = tracer.spanBuilder(PARENT_SPAN_KEY).startSpan();
         scope = parentSpan.makeCurrent();
         // Add parent span to tracingContext
         tracingContext = new Context(PARENT_SPAN_KEY, parentSpan);
-        openTelemetryTracer = new OpenTelemetryTracer();
     }
 
     @AfterEach