Merge branch 'master' into mcculls/otlp-compression-config

mcculls · web-flow · commit 477fe57e9813 · 2026-02-25T23:13:29.000+01:00
diff --git a/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilingAgent.java b/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilingAgent.java
@@ -2,6 +2,7 @@
 
 import static datadog.environment.JavaVirtualMachine.isJavaVersion;
 import static datadog.environment.JavaVirtualMachine.isJavaVersionAtLeast;
+import static datadog.environment.JavaVirtualMachine.isOracleJDK8;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_SCRUB_ENABLED;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_SCRUB_ENABLED_DEFAULT;
 import static datadog.trace.api.config.ProfilingConfig.PROFILING_SCRUB_FAIL_OPEN;
@@ -152,7 +153,10 @@ public static synchronized boolean run(final boolean earlyStart, Instrumentation
               };
         }
         // Scrubber wraps the combined dumper+uploader so debug dumps also contain scrubbed data
-        if (configProvider.getBoolean(PROFILING_SCRUB_ENABLED, PROFILING_SCRUB_ENABLED_DEFAULT)) {
+        // Oracle JDK 8 JFR format has quirks that make scrubbing unreliable — skip it to avoid
+        // corrupting customer data
+        if (configProvider.getBoolean(PROFILING_SCRUB_ENABLED, PROFILING_SCRUB_ENABLED_DEFAULT)
+            && !isOracleJDK8()) {
           List<String> excludeEventTypes =
               configProvider.getList(ProfilingConfig.PROFILING_SCRUB_EXCLUDE_EVENTS);
           boolean failOpen =
diff --git a/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/JFRBasedProfilingIntegrationTest.java b/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/JFRBasedProfilingIntegrationTest.java
@@ -977,6 +977,10 @@ public static boolean isJavaVersionAtLeast24() {
   @Test
   @DisplayName("Test JFR scrubbing")
   void testJfrScrubbing(final TestInfo testInfo) throws Exception {
+    Assumptions.assumeFalse(JavaVirtualMachine.isJ9());
+    // Oracle JDK 8 JFR format has quirks that make scrubbing unreliable
+    Assumptions.assumeFalse(JavaVirtualMachine.isOracleJDK8());
+
     testWithRetry(
         () -> {
           try {
@@ -997,8 +1001,6 @@ void testJfrScrubbing(final TestInfo testInfo) throws Exception {
                         "-Ddd.profiling.scrub.enabled=true")
                     .start();
 
-            Assumptions.assumeFalse(JavaVirtualMachine.isJ9());
-
             final RecordedRequest request = retrieveRequest();
             assertNotNull(request);
 
