Skip to content

Fix content-type extraction for akka-http #10742

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

Merged
gh-worker-dd-mergequeue-cf854d merged 2 commits into from
Mar 5, 2026
Merged

Fix content-type extraction for akka-http #10742

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86745ad
Fix and more tests
jandro996 Mar 4, 2026
82fac88
Merge branch 'master' into alejandro.gonzalez/APPSEC-61554-flaky-test
jandro996 Mar 5, 2026
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
13 changes: 9 additions & 4 deletions ...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
Expand Up @@ -31,14 +31,19 @@ private static void doForEachKey(
HttpMessage carrier,
akka.http.javadsl.model.HttpEntity entity,
AgentPropagation.KeyClassifier classifier) {
if (entity instanceof HttpEntity.Strict) {
HttpEntity.Strict strictEntity = (HttpEntity.Strict) entity;
ContentType contentType = strictEntity.contentType();
// In Akka HTTP, Content-Type is part of the entity, not a regular header.
// Extract it for all entity types (Default, Chunked, etc.), not only Strict.
if (entity instanceof HttpEntity) {
ContentType contentType = ((HttpEntity) entity).contentType();
if (contentType != null) {
if (!classifier.accept("content-type", contentType.value())) {
String contentTypeValue = contentType.value();
if (!contentTypeValue.isEmpty() && !classifier.accept("content-type", contentTypeValue)) {
return;
}
}
}
if (entity instanceof HttpEntity.Strict) {
HttpEntity.Strict strictEntity = (HttpEntity.Strict) entity;
if (!classifier.accept("content-length", Long.toString(strictEntity.contentLength()))) {
return;
}
Expand Down
Loading