Fix OTel agent detector test that was polluting the JVM for later tests

Signed-off-by: Tim Quinn <[email protected]>
helidon-io · Mar 2, 2024 · 4f58c97 · 4f58c97
1 parent fd7f3b9
commit 4f58c97
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/microprofile/telemetry/pom.xml b/microprofile/telemetry/pom.xml
@@ -137,12 +137,16 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkCount>1</forkCount>
-                    <reuseForks>false</reuseForks>
-                    <!-- The default for the following is 5000 ms. Reducing it significantly speeds up tests. -->
-                    <argLine>-Dotel.bsp.schedule.delay=100</argLine>
-                </configuration>
+                <executions>
+                    <execution>
+                        <id>default-test</id>
+                        <configuration>
+                            <!-- The default for the following is 5000 ms. Reducing it significantly speeds up tests. -->
+                            <argLine>-Dotel.bsp.schedule.delay=100</argLine>
+
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

diff --git a/...oprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/AgentDetectorTest.java b/...oprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/AgentDetectorTest.java
@@ -24,6 +24,7 @@
 import io.helidon.tracing.providers.opentelemetry.HelidonOpenTelemetry;
 
 import jakarta.enterprise.inject.spi.CDI;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -54,9 +55,18 @@ void shouldNotBeNoOpTelemetry(){
 
     @Test
     void checkEnvVariable(){
-        System.setProperty(HelidonOpenTelemetry.IO_OPENTELEMETRY_JAVAAGENT, "true");
-        Config config = CDI.current().select(Config.class).get();
-        boolean present = HelidonOpenTelemetry.AgentDetector.isAgentPresent(config);
-        assertThat(present, is(true));
+        var originalAgentPropertyValue = System.setProperty(HelidonOpenTelemetry.IO_OPENTELEMETRY_JAVAAGENT, "true");
+        try {
+            Config config = CDI.current().select(Config.class).get();
+            boolean present = HelidonOpenTelemetry.AgentDetector.isAgentPresent(config);
+            assertThat(present, is(true));
+        } finally {
+            // Restore or clear the agent setting to avoid polluting other tests which might follow.
+            if (originalAgentPropertyValue != null) {
+                System.setProperty(HelidonOpenTelemetry.IO_OPENTELEMETRY_JAVAAGENT, originalAgentPropertyValue);
+            } else {
+                System.clearProperty(HelidonOpenTelemetry.IO_OPENTELEMETRY_JAVAAGENT);
+            }
+        }
     }
 }