Address internal inconsistency & test instability

Squashed 3 commits

Author: MattAlp

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java

@@ -430,7 +430,7 @@ public static void patchJPSAccess(Instrumentation inst) {
       // Unclear if supported for J9, may need to revisit
       try {
         Class.forName("datadog.trace.util.JPMSJPSAccess")
-            .getMethod("patchModuleAccess")
+            .getMethod("patchModuleAccess", Instrumentation.class)
             .invoke(inst);
       } catch (Exception e) {
         log.debug(

dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/JFRBasedProfilingIntegrationTest.java

@@ -507,8 +507,6 @@ void testShutdown(final TestInfo testInfo) throws Exception {
             assertTrue(
                 targetProcess.waitFor(
                     duration + PROFILING_UPLOAD_TIMEOUT_SECONDS + 1, TimeUnit.SECONDS));
-            assertTrue(
-                checkLogLines(logFilePath, it -> it.contains("Successfully invoked jvmstat")));
           } finally {
             if (targetProcess != null) {
               targetProcess.destroyForcibly();

internal-api/internal-api-9/build.gradle

@@ -41,10 +41,6 @@ forbiddenApisMain {
   failOnMissingClasses = false
 }
 
-forbiddenApisMain_java11 {
-  failOnMissingClasses = false
-}
-
 idea {
   module {
     jdkName = '11'

internal-api/internal-api-9/src/main_java11/java/datadog/trace/util/JPMSJPSAccess.java renamed to internal-api/internal-api-9/src/main/java/datadog/trace/util/JPMSJPSAccess.java

@@ -1,11 +1,21 @@
 package datadog.trace.util
 
 import datadog.trace.test.util.DDSpecification
+import net.bytebuddy.agent.ByteBuddyAgent
 
 class PidHelperTest extends DDSpecification {
 
   def "PID is available everywhere we test"() {
     expect:
     !PidHelper.getPid().isEmpty()
   }
+
+  def "JPS via jvmstat is used when possible"() {
+    when:
+    def inst = ByteBuddyAgent.install()
+    JPMSJPSAccess.patchModuleAccess(inst)
+
+    then:
+    JPSUtils.VMPids != null
+  }
 }

internal-api/internal-api-9/src/test/groovy/datadog/trace/util/PidHelperTest.groovy

@@ -2,8 +2,6 @@
 
 import de.thetaphi.forbiddenapis.SuppressForbidden;
 import java.lang.reflect.Method;
-import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,21 +11,15 @@ public final class JPSUtils {
 
   @SuppressForbidden
   public static Set<String> getVMPids() {
-    Set<String> vmPids = new HashSet<>();
     try {
       Class<?> monitoredHostClass = Class.forName("sun.jvmstat.monitor.MonitoredHost");
       Method getMonitoredHostMethod =
           monitoredHostClass.getDeclaredMethod("getMonitoredHost", String.class);
       Object vmHost = getMonitoredHostMethod.invoke(null, "localhost");
-      for (Integer vmPid :
-          (List<Integer>) monitoredHostClass.getDeclaredMethod("activeVms").invoke(vmHost)) {
-        vmPids.add(vmPid.toString());
-      }
-      log.debug("Successfully invoked jvmstat");
+      return (Set<String>) monitoredHostClass.getDeclaredMethod("activeVms").invoke(vmHost);
     } catch (Exception e) {
       log.debug("Failed to invoke jvmstat with exception ", e);
       return null;
     }
-    return vmPids;
   }
 }