From 517e69f50765f8795778a80a7c37cd18ba9f7ab1 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 22 Apr 2025 09:22:17 -0400 Subject: [PATCH 1/3] Add additional debug logging related to jps --- .../main/java/datadog/trace/util/JPMSJPSAccess.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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..da6784a094d 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,11 @@ 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 " + + Platform.getRuntimeVersion()); } } } From 0715c4c18fb680a807ad11b1c4147618ced33f4e Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 22 Apr 2025 10:15:58 -0400 Subject: [PATCH 2/3] Add additional debug logging related to jps --- .../src/main/java/datadog/trace/util/JPMSJPSAccess.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 da6784a094d..33e3360376e 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 @@ -31,8 +31,10 @@ public static void patchModuleAccess(Instrumentation inst) { } else { log.debug( SEND_TELEMETRY, - "Failed to find the jdk.internal.jvmstat module, skipping patching of module access " - + Platform.getRuntimeVersion()); + "Failed to find the jdk.internal.jvmstat module, skipping patching of module access on" + + Platform.getRuntimeVersion() + + " " + + Platform.getRuntimeVendor()); } } } From 9cf4033b1e7b8e3a5706fe7f8564ee9a167de9c9 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 5 May 2025 13:10:50 -0400 Subject: [PATCH 3/3] Minor systems-test related fixes --- .circleci/config.continue.yml.j2 | 2 +- .../src/main/java/datadog/trace/util/JPMSJPSAccess.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.continue.yml.j2 b/.circleci/config.continue.yml.j2 index 6596d1e74cf..3fb1c9b0f0e 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 08276e905c5c81055412ea4c318856d879cf15e5 +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 33e3360376e..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 @@ -31,7 +31,7 @@ public static void patchModuleAccess(Instrumentation inst) { } else { log.debug( SEND_TELEMETRY, - "Failed to find the jdk.internal.jvmstat module, skipping patching of module access on" + "Failed to find the jdk.internal.jvmstat module, skipping patching of module access on " + Platform.getRuntimeVersion() + " " + Platform.getRuntimeVendor());