Merge branch 'master' into mcculls/otel-metrics-enabled-flag

Author: mcculls

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 =

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);
 

dd-trace-api/src/main/java/datadog/trace/api/config/OtlpConfig.java

@@ -10,6 +10,7 @@ public final class OtlpConfig {
   public static final String OTLP_METRICS_ENDPOINT = "otlp.metrics.endpoint";
   public static final String OTLP_METRICS_HEADERS = "otlp.metrics.headers";
   public static final String OTLP_METRICS_PROTOCOL = "otlp.metrics.protocol";
+  public static final String OTLP_METRICS_COMPRESSION = "otlp.metrics.compression";
   public static final String OTLP_METRICS_TIMEOUT = "otlp.metrics.timeout";
   public static final String OTLP_METRICS_TEMPORALITY_PREFERENCE =
       "otlp.metrics.temporality.preference";
@@ -20,6 +21,11 @@ public enum Protocol {
     HTTP_JSON
   }
 
+  public enum Compression {
+    NONE,
+    GZIP
+  }
+
   public enum Temporality {
     CUMULATIVE,
     DELTA,

internal-api/src/main/java/datadog/trace/api/Config.java

@@ -449,6 +449,7 @@
 import static datadog.trace.api.config.OtlpConfig.METRICS_OTEL_ENABLED;
 import static datadog.trace.api.config.OtlpConfig.METRICS_OTEL_INTERVAL;
 import static datadog.trace.api.config.OtlpConfig.METRICS_OTEL_TIMEOUT;
+import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_COMPRESSION;
 import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_ENDPOINT;
 import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_HEADERS;
 import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_PROTOCOL;
@@ -919,6 +920,7 @@ public static String getHostName() {
   private final String otlpMetricsEndpoint;
   private final Map<String, String> otlpMetricsHeaders;
   private final OtlpConfig.Protocol otlpMetricsProtocol;
+  private final OtlpConfig.Compression otlpMetricsCompression;
   private final int otlpMetricsTimeout;
   private final OtlpConfig.Temporality otlpMetricsTemporalityPreference;
 
@@ -1929,6 +1931,9 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
     otlpMetricsProtocol =
         configProvider.getEnum(
             OTLP_METRICS_PROTOCOL, OtlpConfig.Protocol.class, OtlpConfig.Protocol.HTTP_PROTOBUF);
+    otlpMetricsCompression =
+        configProvider.getEnum(
+            OTLP_METRICS_COMPRESSION, OtlpConfig.Compression.class, OtlpConfig.Compression.NONE);
 
     String otlpMetricsEndpointFromEnvironment = configProvider.getString(OTLP_METRICS_ENDPOINT);
     if (otlpMetricsEndpointFromEnvironment == null) {
@@ -5227,6 +5232,10 @@ public OtlpConfig.Protocol getOtlpMetricsProtocol() {
     return otlpMetricsProtocol;
   }
 
+  public OtlpConfig.Compression getOtlpMetricsCompression() {
+    return otlpMetricsCompression;
+  }
+
   public int getOtlpMetricsTimeout() {
     return otlpMetricsTimeout;
   }
@@ -6258,6 +6267,8 @@ public String toString() {
         + otlpMetricsHeaders
         + ", otlpMetricsProtocol="
         + otlpMetricsProtocol
+        + ", otlpMetricsCompression="
+        + otlpMetricsCompression
         + ", otlpMetricsTimeout="
         + otlpMetricsTimeout
         + ", otlpMetricsTemporalityPreference="

metadata/supported-configurations.json

@@ -2313,6 +2313,14 @@
         "aliases": []
       }
     ],
+    "DD_OTLP_METRICS_COMPRESSION": [
+      {
+        "version": "A",
+        "type": "string",
+        "default": "NONE",
+        "aliases": []
+      }
+    ],
     "DD_OTLP_METRICS_TIMEOUT": [
       {
         "version": "A",
@@ -11081,6 +11089,14 @@
         "aliases": []
       }
     ],
+    "OTEL_EXPORTER_OTLP_COMPRESSION": [
+      {
+        "version": "A",
+        "type": "string",
+        "default": null,
+        "aliases": []
+      }
+    ],
     "OTEL_EXPORTER_OTLP_TIMEOUT": [
       {
         "version": "A",
@@ -11113,6 +11129,14 @@
         "aliases": []
       }
     ],
+    "OTEL_EXPORTER_OTLP_METRICS_COMPRESSION": [
+      {
+        "version": "A",
+        "type": "string",
+        "default": null,
+        "aliases": []
+      }
+    ],
     "OTEL_EXPORTER_OTLP_METRICS_TIMEOUT": [
       {
         "version": "B",

utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSource.java

@@ -12,6 +12,7 @@
 import static datadog.trace.api.config.OtlpConfig.METRICS_OTEL_ENABLED;
 import static datadog.trace.api.config.OtlpConfig.METRICS_OTEL_INTERVAL;
 import static datadog.trace.api.config.OtlpConfig.METRICS_OTEL_TIMEOUT;
+import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_COMPRESSION;
 import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_ENDPOINT;
 import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_HEADERS;
 import static datadog.trace.api.config.OtlpConfig.OTLP_METRICS_PROTOCOL;
@@ -158,6 +159,9 @@ private void setupMetricsOtelEnvironment() {
       capture(
           OTLP_METRICS_PROTOCOL,
           getOtelOtlpProperty("metrics", "protocol", "dd." + OTLP_METRICS_PROTOCOL));
+      capture(
+          OTLP_METRICS_COMPRESSION,
+          getOtelOtlpProperty("metrics", "compression", "dd." + OTLP_METRICS_COMPRESSION));
       capture(
           OTLP_METRICS_TIMEOUT,
           getOtelOtlpProperty("metrics", "timeout", "dd." + OTLP_METRICS_TIMEOUT));