Skip to content

Fix NPE in akka-http and pekko-http integrations #9019

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
merged 1 commit into from
Jun 20, 2025
Merged

Fix NPE in akka-http and pekko-http integrations #9019

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
4 changes: 2 additions & 2 deletions .../java/datadog/trace/instrumentation/akkahttp/DatadogServerRequestResponseFlowWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,16 +168,16 @@ public void onUpstreamFinish() throws Exception {
@Override
public void onUpstreamFailure(final Throwable ex) throws Exception {
ContextScope scope = scopes.poll();
AgentSpan span = AgentSpan.fromContext(scope.context());
if (scope != null) {
// Mark the span as failed
AgentSpan span = AgentSpan.fromContext(scope.context());
DatadogWrapperHelper.finishSpan(span, ex);
}
// We will not receive any more responses from the user code, so clean up any
// remaining spans
scope = scopes.poll();
while (scope != null) {
span.finish();
AgentSpan.fromContext(scope.context()).finish();
scope = scopes.poll();
}
fail(responseOutlet, ex);
Expand Down
4 changes: 2 additions & 2 deletions ...java/datadog/trace/instrumentation/pekkohttp/DatadogServerRequestResponseFlowWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,16 +141,16 @@ public void onUpstreamFinish() throws Exception {
@Override
public void onUpstreamFailure(final Throwable ex) throws Exception {
ContextScope scope = scopes.poll();
AgentSpan span = AgentSpan.fromContext(scope.context());
if (scope != null) {
// Mark the span as failed
AgentSpan span = AgentSpan.fromContext(scope.context());
DatadogWrapperHelper.finishSpan(span, ex);
}
// We will not receive any more responses from the user code, so clean up any
// remaining spans
scope = scopes.poll();
while (scope != null) {
span.finish();
AgentSpan.fromContext(scope.context()).finish();
scope = scopes.poll();
}
fail(responseOutlet, ex);
Expand Down