Merge branch 'mattalp/patch-jvmstat-access' of github.com:DataDog/dd-trace-java into mattalp/patch-jvmstat-access

Author: Matt

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkModule.java

@@ -28,8 +28,6 @@ TestSuiteImpl testSuiteStart(
    */
   boolean isNew(@Nonnull TestIdentifier test);
 
-  boolean isFlaky(@Nonnull TestIdentifier test);
-
   boolean isModified(@Nonnull TestSourceData testSourceData);
 
   boolean isQuarantined(TestIdentifier test);

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java

@@ -98,11 +98,6 @@ public boolean isNew(@Nonnull TestIdentifier test) {
     return executionStrategy.isNew(test);
   }
 
-  @Override
-  public boolean isFlaky(@Nonnull TestIdentifier test) {
-    return executionStrategy.isFlaky(test);
-  }
-
   @Override
   public boolean isModified(@Nonnull TestSourceData testSourceData) {
     return executionStrategy.isModified(testSourceData);

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java

@@ -84,11 +84,6 @@ public boolean isNew(@Nonnull TestIdentifier test) {
     return executionStrategy.isNew(test);
   }
 
-  @Override
-  public boolean isFlaky(@Nonnull TestIdentifier test) {
-    return executionStrategy.isFlaky(test);
-  }
-
   @Override
   public boolean isModified(@Nonnull TestSourceData testSourceData) {
     return executionStrategy.isModified(testSourceData);

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/NoOpTestEventsHandler.java

@@ -105,16 +105,6 @@ public TestExecutionPolicy executionPolicy(
     return Regular.INSTANCE;
   }
 
-  @Override
-  public boolean isNew(@Nonnull TestIdentifier test) {
-    return false;
-  }
-
-  @Override
-  public boolean isFlaky(@Nonnull TestIdentifier test) {
-    return false;
-  }
-
   @Override
   public int executionPriority(
       @Nullable TestIdentifier test, @Nonnull TestSourceData testSourceData) {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java

@@ -305,16 +305,6 @@ public int executionPriority(@Nullable TestIdentifier test, @Nonnull TestSourceD
     return testModule.executionPriority(test, testSource);
   }
 
-  @Override
-  public boolean isNew(@Nonnull TestIdentifier test) {
-    return testModule.isNew(test);
-  }
-
-  @Override
-  public boolean isFlaky(@Nonnull TestIdentifier test) {
-    return testModule.isFlaky(test);
-  }
-
   @Nullable
   @Override
   public SkipReason skipReason(TestIdentifier test) {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java

@@ -60,7 +60,7 @@ public boolean isNew(@Nonnull TestIdentifier test) {
         && !executionSettings.isKnown(test.toFQN());
   }
 
-  public boolean isFlaky(@Nonnull TestIdentifier test) {
+  private boolean isFlaky(@Nonnull TestIdentifier test) {
     return executionSettings.isFlaky(test.toFQN());
   }
 

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DefaultProductConfigUpdater.java

@@ -70,10 +70,12 @@ private static void startOrStopFeature(
       LOGGER.debug("Feature {} is explicitly disabled", booleanKey);
       return;
     }
-    if (currentStatus != null && currentStatus) {
-      start.run();
-    } else {
-      stop.run();
+    if (currentStatus != null) {
+      if (currentStatus) {
+        start.run();
+      } else {
+        stop.run();
+      }
     }
   }
 }

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DefaultProductConfigUpdaterTest.java

@@ -24,6 +24,11 @@ public void enableDisable() {
     assertTrue(productConfigUpdater.isExceptionReplayEnabled());
     assertTrue(productConfigUpdater.isCodeOriginEnabled());
     assertTrue(productConfigUpdater.isDistributedDebuggerEnabled());
+    productConfigUpdater.updateConfig(null, null, null, null);
+    assertTrue(productConfigUpdater.isDynamicInstrumentationEnabled());
+    assertTrue(productConfigUpdater.isExceptionReplayEnabled());
+    assertTrue(productConfigUpdater.isCodeOriginEnabled());
+    assertTrue(productConfigUpdater.isDistributedDebuggerEnabled());
     productConfigUpdater.updateConfig(false, false, false, false);
     assertFalse(productConfigUpdater.isDynamicInstrumentationEnabled());
     assertFalse(productConfigUpdater.isExceptionReplayEnabled());

dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java

@@ -57,7 +57,7 @@ public ElementMatcher<TypeDescription> hierarchyMatcher() {
         .and(not(extendsClass(named("com.intuit.karate.junit4.Karate"))))
         // do not instrument MUnit-JUnit 4 interface runner
         // since MUnit has a dedicated instrumentation
-        .and(not(extendsClass(nameStartsWith("munit.internal.junitinterface."))))
+        .and(not(extendsClass(nameStartsWith("munit"))))
         // PowerMock runner is being instrumented,
         // so do not instrument its internal delegates
         .and(

dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java

@@ -348,7 +348,7 @@ public static TestFrameworkInstrumentation runnerToFramework(Runner runner) {
       return TestFrameworkInstrumentation.KARATE;
     } else if (runnerClassName.startsWith("io.cucumber")) {
       return TestFrameworkInstrumentation.CUCUMBER;
-    } else if (runnerClassName.startsWith("munit.internal.junitinterface")) {
+    } else if (runnerClassName.startsWith("munit")) {
       return TestFrameworkInstrumentation.MUNIT;
     } else {
       return TestFrameworkInstrumentation.JUNIT4;