Merge branch 'master' into alexeyk/spotless-for-build-src

Author: AlexeyKuznetsov-DD

.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/311d4ed6e0cd674e45520ecc38dfccff5c59bc987122305b2ae39600ce5e8a25/one-pipeline.yml
+  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/04f6a88e3db67cb88821632d138a2a5c3105ba59760bd3dfc60b54733501ecc3/one-pipeline.yml

dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/build.gradle

@@ -11,18 +11,20 @@ muzzle {
   }
 }
 
+addTestSuiteForDir('latestDepTest', 'test')
+
+tasks.named("latestDepTest", Test) {
+  testJvmConstraints {
+    minJavaVersion = JavaVersion.VERSION_11
+  }
+}
+
 dependencies {
   implementation project(':dd-java-agent:instrumentation:kafka:kafka-common')
   compileOnly group: 'io.confluent', name: 'kafka-schema-registry-client', version: '4.1.0'
-  compileOnly group: 'io.confluent', name: 'kafka-avro-serializer', version: '4.1.0'
-  compileOnly group: 'io.confluent', name: 'kafka-protobuf-serializer', version: '4.1.0'
-  compileOnly group: 'org.apache.kafka', name: 'kafka-clients', version: '3.0.0'
 
-  testImplementation project(':dd-java-agent:instrumentation:kafka:kafka-common')
-  testImplementation group: 'io.confluent', name: 'kafka-schema-registry-client', version: '7.5.2'
-  testImplementation group: 'io.confluent', name: 'kafka-avro-serializer', version: '7.5.2'
-  testImplementation group: 'io.confluent', name: 'kafka-protobuf-serializer', version: '7.5.1'
-  testImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '3.5.0'
-  testImplementation group: 'org.apache.avro', name: 'avro', version: '1.11.0'
+  testImplementation group: 'io.confluent', name: 'kafka-avro-serializer', version: '7.4.0'
+
+  latestDepTestImplementation group: 'io.confluent', name: 'kafka-avro-serializer', version: '+'
 }
 

dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumHttpServletResponseWrapper.java

@@ -107,6 +107,7 @@ public void setHeader(String name, String value) {
       if (isContentLengthHeader(name)) {
         return;
       }
+      checkForContentType(name, value);
       checkForContentSecurityPolicy(name);
     }
     super.setHeader(name, value);
@@ -118,6 +119,7 @@ public void addHeader(String name, String value) {
       if (isContentLengthHeader(name)) {
         return;
       }
+      checkForContentType(name, value);
       checkForContentSecurityPolicy(name);
     }
     super.addHeader(name, value);
@@ -133,6 +135,12 @@ private void checkForContentSecurityPolicy(String name) {
     }
   }
 
+  private void checkForContentType(String name, String value) {
+    if ("content-type".equalsIgnoreCase(name)) {
+      handleContentType(value);
+    }
+  }
+
   @Override
   public void setContentLength(int len) {
     // don't set it since we don't know if we will inject
@@ -182,15 +190,20 @@ public void onInjected() {
     }
   }
 
-  @Override
-  public void setContentType(String type) {
+  private void handleContentType(String type) {
+    final boolean wasInjecting = shouldInject;
     if (shouldInject) {
       shouldInject = type != null && type.contains("text/html");
     }
-    if (!shouldInject) {
+    if (wasInjecting && !shouldInject) {
       commit();
       stopFiltering();
     }
+  }
+
+  @Override
+  public void setContentType(String type) {
+    handleContentType(type);
     super.setContentType(type);
   }
 

dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/groovy/RumHttpServletResponseWrapperTest.groovy

@@ -54,15 +54,36 @@ class RumHttpServletResponseWrapperTest extends InstrumentationSpecification {
     1 * mockResponse.getOutputStream()
   }
 
-  void 'getWriter with non-HTML content reports skipped'() {
-    setup:
+  void 'getWriter with non-HTML content reports skipped (setContentType)'() {
+    when:
     wrapper.setContentType("text/plain")
+    wrapper.getWriter()
+
+    then:
+    1 * mockTelemetryCollector.onInjectionSkipped(SERVLET_VERSION)
+    1 * mockResponse.setContentType("text/plain")
+    1 * mockResponse.getWriter()
+  }
+
+  void 'getWriter with non-HTML content reports skipped (setHeader)'() {
+    when:
+    wrapper.setHeader("Content-Type", "text/plain")
+    wrapper.getWriter()
+
+    then:
+    1 * mockTelemetryCollector.onInjectionSkipped(SERVLET_VERSION)
+    1 * mockResponse.setHeader("Content-Type", "text/plain")
+    1 * mockResponse.getWriter()
+  }
 
+  void 'getWriter with non-HTML content reports skipped (addHeader)'() {
     when:
+    wrapper.addHeader("Content-Type", "text/plain")
     wrapper.getWriter()
 
     then:
     1 * mockTelemetryCollector.onInjectionSkipped(SERVLET_VERSION)
+    1 * mockResponse.addHeader("Content-Type", "text/plain")
     1 * mockResponse.getWriter()
   }
 

dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumHttpServletResponseWrapper.java

@@ -126,6 +126,7 @@ public void setHeader(String name, String value) {
       if (isContentLengthHeader(name)) {
         return;
       }
+      checkForContentType(name, value);
       checkForContentSecurityPolicy(name);
     }
     super.setHeader(name, value);
@@ -137,6 +138,7 @@ public void addHeader(String name, String value) {
       if (isContentLengthHeader(name)) {
         return;
       }
+      checkForContentType(name, value);
       checkForContentSecurityPolicy(name);
     }
     super.addHeader(name, value);
@@ -205,15 +207,26 @@ public void onInjected() {
     }
   }
 
-  @Override
-  public void setContentType(String type) {
+  private void handleContentType(String type) {
+    final boolean wasInjecting = shouldInject;
     if (shouldInject) {
       shouldInject = type != null && type.contains("text/html");
     }
-    if (!shouldInject) {
+    if (wasInjecting && !shouldInject) {
       commit();
       stopFiltering();
     }
+  }
+
+  private void checkForContentType(String name, String value) {
+    if ("content-type".equalsIgnoreCase(name)) {
+      handleContentType(value);
+    }
+  }
+
+  @Override
+  public void setContentType(String type) {
+    handleContentType(type);
     super.setContentType(type);
   }
 

dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/RumHttpServletResponseWrapperTest.groovy

@@ -54,15 +54,36 @@ class RumHttpServletResponseWrapperTest extends InstrumentationSpecification {
     1 * mockResponse.getOutputStream()
   }
 
-  void 'getWriter with non-HTML content reports skipped'() {
-    setup:
+  void 'getWriter with non-HTML content reports skipped (setContentType)'() {
+    when:
     wrapper.setContentType("text/plain")
+    wrapper.getWriter()
+
+    then:
+    1 * mockTelemetryCollector.onInjectionSkipped(SERVLET_VERSION)
+    1 * mockResponse.setContentType("text/plain")
+    1 * mockResponse.getWriter()
+  }
+
+  void 'getWriter with non-HTML content reports skipped (setHeader)'() {
+    when:
+    wrapper.setHeader("Content-Type", "text/plain")
+    wrapper.getWriter()
+
+    then:
+    1 * mockTelemetryCollector.onInjectionSkipped(SERVLET_VERSION)
+    1 * mockResponse.setHeader("Content-Type", "text/plain")
+    1 * mockResponse.getWriter()
+  }
 
+  void 'getWriter with non-HTML content reports skipped (addHeader)'() {
     when:
+    wrapper.addHeader("Content-Type", "text/plain")
     wrapper.getWriter()
 
     then:
     1 * mockTelemetryCollector.onInjectionSkipped(SERVLET_VERSION)
+    1 * mockResponse.addHeader("Content-Type", "text/plain")
     1 * mockResponse.getWriter()
   }
 

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

@@ -290,7 +290,7 @@ public final String tag() {
     }
 
     public final boolean matches(String tag) {
-      return this.tag.equals(tag);
+      return (this.tag == tag) || this.tag.equals(tag);
     }
 
     public abstract boolean isRemoval();