Skip to content

Commit 5d679e6

Browse files
author
Matt
authored
Add additional debug logging related to JPS (#8718)
1 parent a4b7a7b commit 5d679e6

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

.circleci/config.continue.yml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ instrumentation_modules: &instrumentation_modules "dd-java-agent/instrumentation
3636
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"
3737
profiling_modules: &profiling_modules "dd-java-agent/agent-profiling"
3838

39-
default_system_tests_commit: &default_system_tests_commit b0b2e1f212f8c483b52aa3adc6ffd4132b1ba9b8
39+
default_system_tests_commit: &default_system_tests_commit 9049791de92dcb72b104e99a80f6f9914c1b96fb
4040

4141
parameters:
4242
nightly:

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
package datadog.trace.util;
22

3+
import static datadog.trace.api.telemetry.LogCollector.SEND_TELEMETRY;
4+
5+
import datadog.trace.api.Platform;
36
import java.lang.instrument.Instrumentation;
47
import java.util.Collections;
58
import java.util.Map;
69
import java.util.Set;
10+
import org.slf4j.Logger;
11+
import org.slf4j.LoggerFactory;
712

813
public class JPMSJPSAccess {
14+
private static Logger log = LoggerFactory.getLogger(JPMSJPSAccess.class);
15+
916
public static void patchModuleAccess(Instrumentation inst) {
1017
Module unnamedModule = ClassLoader.getSystemClassLoader().getUnnamedModule();
1118
Module jvmstatModule = ModuleLayer.boot().findModule("jdk.internal.jvmstat").orElse(null);
@@ -21,6 +28,13 @@ public static void patchModuleAccess(Instrumentation inst) {
2128
extraOpens,
2229
Collections.emptySet(),
2330
Collections.emptyMap());
31+
} else {
32+
log.debug(
33+
SEND_TELEMETRY,
34+
"Failed to find the jdk.internal.jvmstat module, skipping patching of module access on "
35+
+ Platform.getRuntimeVersion()
36+
+ " "
37+
+ Platform.getRuntimeVendor());
2438
}
2539
}
2640
}

0 commit comments

Comments
 (0)