Skip to content

Verify validity of extracted SpanID for compound header extraction span links #8003

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

Closed
mhlidd wants to merge 9 commits into from
Closed

Verify validity of extracted SpanID for compound header extraction span links #8003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
38c4abd
verify extracted SpanID is valid before creating span link
mhlidd Nov 22, 2024
1af74f6
spotless
mhlidd Nov 22, 2024
c2c4c3e
adding check in contextinterpreter
mhlidd Nov 25, 2024
46c023d
updating unit tests
mhlidd Nov 26, 2024
b752a18
trying addHeader
mhlidd Nov 26, 2024
477d25a
fixing final tests
mhlidd Nov 26, 2024
1074154
replacing span-id with parent-id
mhlidd Nov 26, 2024
f8cce3c
adding span id to one more test
mhlidd Nov 27, 2024
478e2e4
adding default test case
mhlidd Dec 3, 2024
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
2 changes: 1 addition & 1 deletion ...ion/akka-http/akka-http-10.0/src/baseTest/groovy/AkkaHttpServerInstrumentationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ abstract class AkkaHttpServerInstrumentationTest extends HttpServerTest<AkkaHttp
def type = id & 1 ? "p" : "f"
String url = address.resolve("/injected-id/${type}ing/$id")
def traceId = totalInvocations + id
def request = new Request.Builder().url(url).get().header("x-datadog-trace-id", traceId.toString()).build()
def request = new Request.Builder().url(url).get().addHeader("x-datadog-trace-id", traceId.toString()).addHeader("x-datadog-parent-id", "1").build()
def response = client.newCall(request).execute()
def responseBodyStr = response.body().string()
assert responseBodyStr == "${type}ong $id -> $traceId"
Expand Down
2 changes: 1 addition & 1 deletion ...ntation/akka-http/akka-http-10.6/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ abstract class AkkaHttpServerInstrumentationTest extends HttpServerTest<AkkaHttp
def type = id & 1 ? "p" : "f"
String url = address.resolve("/injected-id/${type}ing/$id")
def traceId = totalInvocations + id
def request = new Request.Builder().url(url).get().header("x-datadog-trace-id", traceId.toString()).build()
def request = new Request.Builder().url(url).get().addHeader("x-datadog-trace-id", traceId.toString()).addHeader("x-datadog-parent-id", "1").build()
def response = client.newCall(request).execute()
def responseBodyStr = response.body().string()
assert responseBodyStr == "${type}ong $id -> $traceId"
Expand Down
2 changes: 1 addition & 1 deletion ...trumentation/pekko-http-1.0/src/baseTest/groovy/PekkoHttpServerInstrumentationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ abstract class PekkoHttpServerInstrumentationTest extends HttpServerTest<PekkoHt
def type = id & 1 ? "p" : "f"
String url = address.resolve("/injected-id/${type}ing/$id")
def traceId = totalInvocations + id
def request = new Request.Builder().url(url).get().header("x-datadog-trace-id", traceId.toString()).build()
def request = new Request.Builder().url(url).get().addHeader("x-datadog-trace-id", traceId.toString()).addHeader("x-datadog-parent-id", "1").build()
def response = client.newCall(request).execute()
def responseBodyStr = response.body().string()
assert responseBodyStr == "${type}ong $id -> $traceId"
Expand Down
2 changes: 1 addition & 1 deletion dd-trace-core/src/main/java/datadog/trace/core/propagation/ContextInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ public ContextInterpreter reset(TraceConfig traceConfig) {

protected TagContext build() {
if (valid) {
if (fullContext && !DDTraceId.ZERO.equals(traceId)) {
if (fullContext && !DDTraceId.ZERO.equals(traceId) && DDSpanId.ZERO != spanId) {
if (propagationTags == null) {
propagationTags = propagationTagsFactory.empty();
}
Expand Down
3 changes: 2 additions & 1 deletion dd-trace-core/src/test/groovy/datadog/trace/core/propagation/DatadogHttpExtractorTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,11 +355,12 @@ class DatadogHttpExtractorTest extends DDSpecification {
"-1" | "1" | null | null
"1" | "-1" | null | null
"0" | "1" | null | null
"1" | "0" | DD64bTraceId.ONE | DDSpanId.ZERO
"1" | "0" | null | null
"$TRACE_ID_MAX" | "1" | DD64bTraceId.MAX | 1
"${TRACE_ID_MAX + 1}" | "1" | null | null
"1" | "$TRACE_ID_MAX" | DD64bTraceId.ONE | DDSpanId.MAX
"1" | "${TRACE_ID_MAX + 1}" | null | null
"1" | "1" | DD64bTraceId.ONE | 1
}

def "extract http headers with end to end"() {
Expand Down
2 changes: 2 additions & 0 deletions dd-trace-core/src/test/groovy/datadog/trace/lambda/LambdaHandlerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class LambdaHandlerTest extends DDCoreSpecification {
response
.status(200)
.addHeader("x-datadog-trace-id", "1234")
.addHeader("x-datadog-parent-id", "1")
.addHeader("x-datadog-sampling-priority", "2")
.send()
}
Expand Down Expand Up @@ -70,6 +71,7 @@ class LambdaHandlerTest extends DDCoreSpecification {
response
.status(200)
.addHeader("x-datadog-trace-id", "5744042798732701615")
.addHeader("x-datadog-parent-id", "1")
.addHeader("x-datadog-sampling-priority", "2")
.addHeader("x-datadog-tags", "_dd.p.tid=1914fe7789eb32be")
.send()
Expand Down
Loading