Skip to content

ensure no duplicate spans get created in http test server #9593

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

ensure no duplicate spans get created in http test server #9593

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e1bd4f
ensure no duplicate spans get created in http test server
vandonr Sep 23, 2025
ed81a60
Merge branch 'master' into vandonr/wip
vandonr Sep 24, 2025
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
33 changes: 24 additions & 9 deletions ...-agent/testing/src/main/groovy/datadog/trace/agent/test/server/http/TestHttpServer.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,20 +377,35 @@ class TestHttpServer implements AutoCloseable {
}

void handleDistributedRequest() {
final String ddSpanAttribute = "datadog.span"

boolean isDDServer = true
if (request.getHeader("is-dd-server") != null) {
isDDServer = Boolean.parseBoolean(request.getHeader("is-dd-server"))
}
if (isDDServer) {
final AgentSpanContext extractedContext = extractContextAndGetSpanContext(req.orig, GETTER)
if (extractedContext != null) {
startSpan("test", "test-http-server", extractedContext)
.setTag("path", request.path)
.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER).finish()
} else {
startSpan("test", "test-http-server")
.setTag("path", request.path)
.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER).finish()
// Synchronize on the request to make check-and-set atomic across threads
synchronized (req.orig) {
// Check if span already exists for this request to prevent duplicates
Object existingSpan = req.orig.getAttribute(ddSpanAttribute)
if (existingSpan != null) {
// Span already created by another thread, skip creating duplicate
return
}

final AgentSpanContext extractedContext = extractContextAndGetSpanContext(req.orig, GETTER)
def span
if (extractedContext != null) {
span = startSpan("test", "test-http-server", extractedContext)
} else {
span = startSpan("test", "test-http-server")
}
span.setTag("path", request.path)
.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER)
.finish()

// Store span in request attribute before finishing to prevent race conditions
req.orig.setAttribute(ddSpanAttribute, span)
}
}
}
Expand Down