diff --git a/.circleci/config.continue.yml.j2 b/.circleci/config.continue.yml.j2 index 005dfcdd7e7..c02f4cc337c 100644 --- a/.circleci/config.continue.yml.j2 +++ b/.circleci/config.continue.yml.j2 @@ -36,7 +36,7 @@ instrumentation_modules: &instrumentation_modules "dd-java-agent/instrumentation debugger_modules: &debugger_modules "dd-java-agent/agent-debugger|dd-java-agent/agent-bootstrap|dd-java-agent/agent-builder|internal-api|communication|dd-trace-core" profiling_modules: &profiling_modules "dd-java-agent/agent-profiling" -default_system_tests_commit: &default_system_tests_commit b0b2e1f212f8c483b52aa3adc6ffd4132b1ba9b8 +default_system_tests_commit: &default_system_tests_commit 9049791de92dcb72b104e99a80f6f9914c1b96fb parameters: nightly: diff --git a/internal-api/internal-api-9/src/main/java/datadog/trace/util/JPMSJPSAccess.java b/internal-api/internal-api-9/src/main/java/datadog/trace/util/JPMSJPSAccess.java index 10fe58446b3..e02e0c253ff 100644 --- a/internal-api/internal-api-9/src/main/java/datadog/trace/util/JPMSJPSAccess.java +++ b/internal-api/internal-api-9/src/main/java/datadog/trace/util/JPMSJPSAccess.java @@ -1,11 +1,18 @@ package datadog.trace.util; +import static datadog.trace.api.telemetry.LogCollector.SEND_TELEMETRY; + +import datadog.trace.api.Platform; import java.lang.instrument.Instrumentation; import java.util.Collections; import java.util.Map; import java.util.Set; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JPMSJPSAccess { + private static Logger log = LoggerFactory.getLogger(JPMSJPSAccess.class); + public static void patchModuleAccess(Instrumentation inst) { Module unnamedModule = ClassLoader.getSystemClassLoader().getUnnamedModule(); Module jvmstatModule = ModuleLayer.boot().findModule("jdk.internal.jvmstat").orElse(null); @@ -21,6 +28,13 @@ public static void patchModuleAccess(Instrumentation inst) { extraOpens, Collections.emptySet(), Collections.emptyMap()); + } else { + log.debug( + SEND_TELEMETRY, + "Failed to find the jdk.internal.jvmstat module, skipping patching of module access on " + + Platform.getRuntimeVersion() + + " " + + Platform.getRuntimeVendor()); } } }