Merge branch 'master' into bbujon/jep500

sarahchen6 · web-flow · commit 7fc22603a4df · 2026-01-29T08:30:47.000-06:00
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginConfigTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginConfigTest.java
@@ -22,8 +22,8 @@ public void defaultConfigJDK25() {
   @EnabledOnJre(JRE.JAVA_21)
   @Test
   public void defaultConfigJDK21() {
-    assertFalse(Config.get().isDebuggerCodeOriginEnabled());
-    assertFalse(InstrumenterConfig.get().isCodeOriginEnabled());
+    assertTrue(Config.get().isDebuggerCodeOriginEnabled());
+    assertTrue(InstrumenterConfig.get().isCodeOriginEnabled());
   }
 
   @EnabledOnJre(JRE.JAVA_17)
diff --git a/internal-api/src/main/java/datadog/trace/api/InstrumenterConfig.java b/internal-api/src/main/java/datadog/trace/api/InstrumenterConfig.java
@@ -690,8 +690,8 @@ public boolean isAppLogsCollectionEnabled() {
               : ConfigProvider.getInstance());
 
   public static boolean getDefaultCodeOriginForSpanEnabled() {
-    if (JavaVirtualMachine.isJavaVersionAtLeast(25)) {
-      // activate by default Code Origin only for JDK25+
+    if (JavaVirtualMachine.isJavaVersionAtLeast(21)) {
+      // activate by default Code Origin only for JDK21+
       return true;
     }
     return false;
diff --git a/internal-api/src/main/java/datadog/trace/util/SizeCheckedInputStream.java b/internal-api/src/main/java/datadog/trace/util/SizeCheckedInputStream.java
@@ -1,23 +1,23 @@
 package datadog.trace.util;
 
+import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
 /** Wraps input stream to check a maximum allowed size */
-public class SizeCheckedInputStream extends InputStream {
-  private final InputStream in;
+public class SizeCheckedInputStream extends FilterInputStream {
   private final long maxSize;
   private long currentSize;
 
   public SizeCheckedInputStream(InputStream in, long maxSize) {
-    this.in = in;
+    super(in);
     this.maxSize = maxSize;
   }
 
   @Override
   public int read() throws IOException {
     checkSize(1);
-    int v = in.read();
+    int v = super.read();
     if (v != -1) {
       updateCurrentSize(1);
     }
@@ -37,7 +37,7 @@ public int read(byte[] b, int off, int len) throws IOException {
 
     long safeLen = Math.min(len, maxSize - currentSize);
     checkSize(safeLen);
-    return updateCurrentSize(in.read(b, off, (int) safeLen));
+    return updateCurrentSize(super.read(b, off, (int) safeLen));
   }
 
   private int updateCurrentSize(int delta) {
