Merge branch 'master' into mhlidd/run_spock_with_strict

Author: mhlidd

.gitlab/benchmarks/bp-runner.fail-on-breach.yml

@@ -2,7 +2,7 @@
 # Generated: 2026-03-31
 #
 # Generation Strategy: tight
-#   Formula: CI_bound / (1 ± T) (T = 5.0%)
+#   Formula: CI_bound / (1 ± T) (T = 10.0%)
 #
 # SLO Checking:
 #   - BREACH: 90% CI boundary crosses threshold
@@ -11,7 +11,7 @@
 # DO NOT EDIT MANUALLY - Regenerate using:
 #   benchmark_analyzer generate slos --help
 #
-# Thresholds set based on guidance in https://datadoghq.atlassian.net/wiki/x/LgI1LgE#How-to-choose-thresholds-for-pre-release-gates%3F
+# link to documentation on autogenerated thresholds https://github.com/DataDog/relenv-benchmark-analyzer/blob/main/README.md#generate-slo-thresholds
 
 experiments:
   - name: Run SLO breach check
@@ -31,7 +31,7 @@ experiments:
           # https://benchmarking.us1.prod.dog/trends?projectId=4&branch=master&trendsTab=per_scenario&scenario=normal_operation%2Fonly-tracing&trendsType=scenario
           - name: normal_operation/only-tracing
             thresholds:
-              - agg_http_req_duration_p50 < 2.128 ms
+              - agg_http_req_duration_p50 < 2.526 ms
               - agg_http_req_duration_p99 < 8.5 ms
           # https://benchmarking.us1.prod.dog/trends?projectId=4&branch=master&trendsTab=per_scenario&scenario=normal_operation%2Fotel-latest&trendsType=scenario
           - name: normal_operation/otel-latest

.gitlab/one-pipeline.locked.yml

@@ -1,4 +1,4 @@
 # DO NOT EDIT THIS FILE MANUALLY
 # This file is auto-generated by automation.
 include:
-  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/9cf7d7609ff62e4723c9cbc061ca2a25345ce5d6055b9acad9a13dbf736261f0/one-pipeline.yml
+  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/4667b01c6ae983f92ecf106e110ced3dac798b229cf2a0539c58aa22e95a99d5/one-pipeline.yml

communication/src/test/java/datadog/communication/serialization/msgpack/MsgPackWriterTest.java

@@ -215,7 +215,8 @@ void testStringEscaping() {
       assertEquals("\n", reader.nextString());
       assertEquals("\r", reader.nextString());
       assertEquals("\t", reader.nextString());
-      assertEquals("É", reader.nextString());
+      // Explicit escape for non-ASCII `É` to make test independent of container settings.
+      assertEquals("\u00C9", reader.nextString());
       reader.endArray();
     } catch (IOException e) {
       fail("Failed to read escaped JSON strings", e);

components/json/src/test/java/datadog/json/JsonReaderTest.java

@@ -32,6 +32,7 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
 com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.13.2=spotbugs
 com.google.errorprone:error_prone_annotations:2.41.0=spotbugs
+com.jayway.jsonpath:json-path:2.8.0=testCompileClasspath,testRuntimeClasspath
 com.squareup.moshi:moshi:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.squareup.okhttp3:mockwebserver:3.12.12=testCompileClasspath,testRuntimeClasspath
 com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath
@@ -45,6 +46,11 @@ junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy-agent:1.18.3=testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.3=testCompileClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath
+net.javacrumbs.json-unit:json-unit-assertj:2.40.1=testCompileClasspath,testRuntimeClasspath
+net.javacrumbs.json-unit:json-unit-core:2.40.1=testCompileClasspath,testRuntimeClasspath
+net.javacrumbs.json-unit:json-unit-json-path:2.40.1=testCompileClasspath,testRuntimeClasspath
+net.minidev:accessors-smart:2.4.9=testRuntimeClasspath
+net.minidev:json-smart:2.4.10=testRuntimeClasspath
 net.sf.saxon:Saxon-HE:12.9=spotbugs
 org.apache.ant:ant-antlr:1.10.14=codenarc
 org.apache.ant:ant-junit:1.10.14=codenarc
@@ -55,6 +61,7 @@ org.apache.commons:commons-text:1.14.0=spotbugs
 org.apache.logging.log4j:log4j-api:2.25.2=spotbugs
 org.apache.logging.log4j:log4j-core:2.25.2=spotbugs
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
+org.assertj:assertj-core:3.27.7=testCompileClasspath,testRuntimeClasspath
 org.codehaus.groovy:groovy-ant:3.0.23=codenarc
 org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc
 org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc
@@ -67,7 +74,7 @@ org.codehaus.groovy:groovy:3.0.25=testCompileClasspath,testRuntimeClasspath
 org.codenarc:CodeNarc:3.7.0=codenarc
 org.dom4j:dom4j:2.2.0=spotbugs
 org.gmetrics:GMetrics:2.1.0=codenarc
-org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath
+org.hamcrest:hamcrest-core:2.2=testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
 org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
 org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt

dd-java-agent/agent-crashtracking/gradle.lockfile

@@ -1,9 +1,12 @@
 package datadog.crashtracking.buildid;
 
+import static datadog.environment.OperatingSystem.Architecture.ARM64;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
+import datadog.environment.OperatingSystem;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -134,6 +137,8 @@ private static Stream<Arguments> elfBinaries() {
   @ParameterizedTest(name = "ELF: {1}")
   @MethodSource("elfBinaries")
   void testElfBuildIdExtraction(String containerPath, String description) throws Exception {
+    // TODO: check if arm64 can be supported too.
+    assumeFalse(OperatingSystem.architecture() == ARM64, "Skipping for arm64");
     Path localBinary = copyFromContainer(linuxContainer, containerPath);
 
     ElfBuildIdExtractor extractor = new ElfBuildIdExtractor();

dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/buildid/BuildIdExtractorIntegrationTest.java

@@ -730,7 +730,6 @@ private void processCaptureExpressions(CapturedContext context, LogStatus logSta
                   captureExpression.getName(), Object.class.getTypeName(), null));
         } else {
           if (captureExpression.capture != null) {
-            Value.toCapturedSnapshot(captureExpression.getName(), result);
             context.addCaptureExpression(
                 Value.toCapturedSnapshot(
                     captureExpression.getName(),
@@ -740,8 +739,20 @@ private void processCaptureExpressions(CapturedContext context, LogStatus logSta
                     captureExpression.capture.maxLength,
                     captureExpression.capture.maxFieldCount));
           } else {
-            context.addCaptureExpression(
-                Value.toCapturedSnapshot(captureExpression.getName(), result));
+            // inherit from probe capture field because no specific capture
+            if (capture != null) {
+              context.addCaptureExpression(
+                  Value.toCapturedSnapshot(
+                      captureExpression.getName(),
+                      result,
+                      capture.maxReferenceDepth,
+                      capture.maxCollectionSize,
+                      capture.maxLength,
+                      capture.maxFieldCount));
+            } else {
+              context.addCaptureExpression(
+                  Value.toCapturedSnapshot(captureExpression.getName(), result));
+            }
           }
         }
       } catch (EvaluationException ex) {

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java

@@ -3028,6 +3028,47 @@ public void captureExpressionsWithCaptureLimits() throws IOException, URISyntaxE
     assertEquals("depth", fldValue.getNotCapturedReason());
   }
 
+  @Test
+  public void captureExpressionsWithInheritedCaptureLimits()
+      throws IOException, URISyntaxException {
+    final String CLASS_NAME = "CapturedSnapshot08";
+    LogProbe probe =
+        createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
+            .evaluateAt(MethodLocation.EXIT)
+            .captureSnapshot(false)
+            .capture(new LogProbe.Capture(1, 10, 3, 1))
+            .captureExpressions(
+                Arrays.asList(
+                    new LogProbe.CaptureExpression(
+                        "typed_fld_fld_msg",
+                        new ValueScript(
+                            DSL.getMember(
+                                DSL.getMember(DSL.getMember(DSL.ref("typed"), "fld"), "fld"),
+                                "msg"),
+                            "typed.fld.fld.msg"),
+                        null),
+                    new LogProbe.CaptureExpression(
+                        "typed", new ValueScript(DSL.ref("typed"), "typed"), null)))
+            .build();
+    TestSnapshotListener listener = installProbes(probe);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    int result = Reflect.onClass(testClass).call("main", "1").get();
+    assertEquals(3, result);
+    Snapshot snapshot = assertOneSnapshot(listener);
+    CapturedContext.CapturedValue msgValue =
+        deserializeCapturedValue(
+            snapshot.getCaptures().getReturn().getCaptureExpressions().get("typed_fld_fld_msg"));
+    assertEquals("hel", msgValue.getValue());
+    assertEquals("truncated", msgValue.getNotCapturedReason());
+    CapturedContext.CapturedValue typedValue =
+        deserializeCapturedValue(
+            snapshot.getCaptures().getReturn().getCaptureExpressions().get("typed"));
+    Map<String, CapturedContext.CapturedValue> fields =
+        (Map<String, CapturedContext.CapturedValue>) typedValue.getValue();
+    CapturedContext.CapturedValue fldValue = fields.get("fld");
+    assertEquals("depth", fldValue.getNotCapturedReason());
+  }
+
   @Test
   public void methodParametersAttribute() throws Exception {
     final String CLASS_NAME = "CapturedSnapshot01";

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java

@@ -29,16 +29,20 @@ OtlpDataPoint doCollect(boolean reset) {
     List<Double> binBoundaries;
     List<Double> binCounts;
     double sum;
+    double min;
+    double max;
     synchronized (histogram) {
       count = histogram.getCount();
       binBoundaries = histogram.getBinBoundaries();
       binCounts = histogram.getBinCounts();
       sum = histogram.getSum();
+      min = histogram.getMinValue();
+      max = histogram.getMaxValue();
       if (reset) {
         histogram.clear();
       }
     }
-    return new OtlpHistogramPoint(count, binBoundaries, binCounts, sum);
+    return new OtlpHistogramPoint(count, binBoundaries, binCounts, sum, min, max);
   }
 
   /** Truncate IEEE-754 floating-point value to 10 bits precision. */

dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelHistogramSketch.java

@@ -7,12 +7,21 @@ public final class OtlpHistogramPoint extends OtlpDataPoint {
   public final List<Double> bucketBoundaries;
   public final List<Double> bucketCounts;
   public final double sum;
+  public final double min;
+  public final double max;
 
   OtlpHistogramPoint(
-      double count, List<Double> bucketBoundaries, List<Double> bucketCounts, double sum) {
+      double count,
+      List<Double> bucketBoundaries,
+      List<Double> bucketCounts,
+      double sum,
+      double min,
+      double max) {
     this.count = count;
     this.bucketBoundaries = bucketBoundaries;
     this.bucketCounts = bucketCounts;
     this.sum = sum;
+    this.min = min;
+    this.max = max;
   }
 }