Merge pull request #6101 from DataDog/glopes/akka-skip-raw-req-uri

Akka: skip synthetic header Raw-Request-Uri
DataDog · Oct 26, 2023 · 848d377 · 848d377
2 parents 9ae368f + cc7aa22
commit 848d377
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerHeaders.java b/...http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerHeaders.java
@@ -1,6 +1,7 @@
 package datadog.trace.instrumentation.akkahttp;
 
 import akka.http.javadsl.model.HttpHeader;
+import akka.http.javadsl.model.headers.RawRequestURI;
 import akka.http.javadsl.model.headers.RemoteAddress;
 import akka.http.javadsl.model.headers.TimeoutAccess;
 import akka.http.scaladsl.model.ContentType;
@@ -45,7 +46,9 @@ private static void doForEachKey(
 
     for (final HttpHeader header : carrier.getHeaders()) {
       // skip synthetic headers
-      if (header instanceof RemoteAddress || header instanceof TimeoutAccess) {
+      if (header instanceof RemoteAddress
+          || header instanceof TimeoutAccess
+          || header instanceof RawRequestURI) {
         continue;
       }
       if (!classifier.accept(header.lowercaseName(), header.value())) {

diff --git a/dd-java-agent/instrumentation/play-2.6/build.gradle b/dd-java-agent/instrumentation/play-2.6/build.gradle
@@ -13,20 +13,23 @@ muzzle {
     module = "play_$scalaVersion"
     versions = "[$playVersion,)"
     assertInverse = true
+    javaVersion = 11
   }
   pass {
     name = 'play26Plus'
     group = 'com.typesafe.play'
     module = 'play_2.12'
     versions = "[$playVersion,)"
     assertInverse = true
+    javaVersion = 11
   }
   pass {
     name = 'play26Plus'
     group = 'com.typesafe.play'
     module = 'play_2.13'
     versions = "[$playVersion,)"
     assertInverse = true
+    javaVersion = 11
   }
 
   pass {