Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Skip synthetic header Raw-Request-Uri #6101

Merged
merged 2 commits into from
Oct 26, 2023
Merged

Skip synthetic header Raw-Request-Uri #6101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b09a13
Akka: skip sythentic header Raw-Request-Uri
cataphract Oct 25, 2023
cc7aa22
Fix play muzzle against 2.9.0
cataphract Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerHeaders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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())) {
Expand Down
3 changes: 3 additions & 0 deletions dd-java-agent/instrumentation/play-2.6/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading