Skip to content

Honour request header tags mapped onto headers #12695

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

Open
ValentinZakharov wants to merge 1 commit into
base: master
Choose a base branch
from
+265 −48
Open

Honour request header tags mapped onto headers #12695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 4 additions & 8 deletions dd-trace-core/src/main/java/datadog/trace/core/propagation/B3HttpCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ public boolean accept(final String key, final String value) {
log.debug("Header: {}", key);
}
try {
handleTags(key, value);
char first = Character.toLowerCase(key.charAt(0));
switch (first) {
case 'x':
Expand Down Expand Up @@ -250,10 +251,7 @@ public boolean accept(final String key, final String value) {
break;
default:
}
if (handledIpHeaders(key, value)) {
return true;
}
handleTags(key, value);
handledIpHeaders(key, value);
} catch (RuntimeException e) {
invalidateContext();
log.debug("Exception when extracting context", e);
Expand Down Expand Up @@ -282,6 +280,7 @@ public boolean accept(String key, String value) {
if (LOG_EXTRACT_HEADER_NAMES) {
log.debug("Header: {}", key);
}
handleTags(key, value);
if (B3_KEY.equalsIgnoreCase(key)) {
return extractB3(firstHeaderValue(value));
} else {
Expand All @@ -304,10 +303,7 @@ public boolean accept(String key, String value) {
break;
}
}
if (handledIpHeaders(key, value)) {
return true;
}
handleTags(key, value);
handledIpHeaders(key, value);
} catch (RuntimeException e) {
invalidateContext();
log.debug("Exception when extracting context", e);
Expand Down
11 changes: 4 additions & 7 deletions dd-trace-core/src/main/java/datadog/trace/core/propagation/DatadogHttpCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ public boolean accept(String key, String value) {
if (LOG_EXTRACT_HEADER_NAMES) {
log.debug("Header: {}", key);
}
if (!handleTags(key, value)) {
handleMappedBaggage(key, value);
}
String lowerCaseKey = null;
int classification = IGNORE;
char first = Character.toLowerCase(key.charAt(0));
Expand Down Expand Up @@ -198,13 +201,7 @@ public boolean accept(String key, String value) {
return false;
}
} else {
if (handledIpHeaders(key, value)) {
return true;
}
if (handleTags(key, value)) {
return true;
}
handleMappedBaggage(key, value);
handledIpHeaders(key, value);
}
return true;
}
Expand Down
11 changes: 4 additions & 7 deletions dd-trace-core/src/main/java/datadog/trace/core/propagation/HaystackHttpCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,9 @@ public boolean accept(String key, String value) {
if (LOG_EXTRACT_HEADER_NAMES) {
log.debug("Header: {}", key);
}
if (!handleTags(key, value)) {
handleMappedBaggage(key, value);
}
char first = Character.toLowerCase(key.charAt(0));
String lowerCaseKey = null;
int classification = IGNORE;
Expand Down Expand Up @@ -230,13 +233,7 @@ public boolean accept(String key, String value) {
return false;
}
} else {
if (handledIpHeaders(key, value)) {
return true;
}
if (handleTags(key, value)) {
return true;
}
handleMappedBaggage(key, value);
handledIpHeaders(key, value);
}
return true;
}
Expand Down
11 changes: 4 additions & 7 deletions dd-trace-core/src/main/java/datadog/trace/core/propagation/NoneCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ public boolean accept(String key, String value) {
if (LOG_EXTRACT_HEADER_NAMES) {
log.debug("Header: {}", key);
}
if (!handleTags(key, value)) {
handleMappedBaggage(key, value);
}
char first = Character.toLowerCase(key.charAt(0));
switch (first) {
case 'x':
Expand All @@ -50,13 +53,7 @@ public boolean accept(String key, String value) {
default:
}

if (handledIpHeaders(key, value)) {
return true;
}
if (handleTags(key, value)) {
return true;
}
handleMappedBaggage(key, value);
handledIpHeaders(key, value);
return true;
}
}
Expand Down
11 changes: 4 additions & 7 deletions dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@ public boolean accept(String key, String value) {
if (LOG_EXTRACT_HEADER_NAMES) {
log.debug("Header: {}", key);
}
if (!handleTags(key, value)) {
handleMappedBaggage(key, value);
}
String lowerCaseKey = null;
int classification = IGNORE;
char first = Character.toLowerCase(key.charAt(0));
Expand Down Expand Up @@ -213,13 +216,7 @@ public boolean accept(String key, String value) {
return false;
}
} else {
if (handledIpHeaders(key, value)) {
return true;
}
if (handleTags(key, value)) {
return true;
}
handleMappedBaggage(key, value);
handledIpHeaders(key, value);
}
return true;
}
Expand Down
15 changes: 3 additions & 12 deletions dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayHttpCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ public boolean accept(String key, String value) {
log.debug("Header: {}", key);
}
try {
handleTags(key, value);
handleMappedBaggage(key, value);
char first = Character.toLowerCase(key.charAt(0));
switch (first) {
case 'x':
Expand All @@ -174,18 +176,7 @@ public boolean accept(String key, String value) {
default:
}

if (handledIpHeaders(key, value)) {
return true;
} else {
handleTags(key, value);
}

if (!baggageMapping.isEmpty()) {
String mappedKey = baggageMapping.get(toLowerCase(key));
if (null != mappedKey) {
addBaggageItem(mappedKey, value);
}
}
handledIpHeaders(key, value);
return true;
} catch (RuntimeException e) {
invalidateContext();
Expand Down
Loading
Loading