Skip to content

Fix Synapse passthru spans finishing before status code is available #10478

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 5 commits into
base: master
Choose a base branch
from
+46 −15
Open

Fix Synapse passthru spans finishing before status code is available #10478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
871a6f2
Fix Synapse passthru spans finishing before status code is available
ValentinZakharov Jan 29, 2026
33ad902
Fix for Muzzle check
ValentinZakharov Jan 30, 2026
75f4a4f
Dummy commit
ValentinZakharov Jan 30, 2026
7bdce96
Clean test
ValentinZakharov Jan 30, 2026
3f18bf9
Updated comments
ValentinZakharov Jan 31, 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
32 changes: 24 additions & 8 deletions ....0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import net.bytebuddy.asm.Advice;
import org.apache.axis2.context.MessageContext;
import org.apache.http.HttpResponse;
import org.apache.http.nio.NHttpClientConnection;
import org.apache.synapse.transport.passthru.TargetContext;

Expand Down Expand Up @@ -113,8 +114,8 @@ public static final class ClientResponseAdvice {
@Advice.OnMethodEnter(suppress = Throwable.class)
public static ContextScope beginResponse(
@Advice.Argument(0) final NHttpClientConnection connection) {
// check and remove context so it won't be finished twice
Context context = (Context) connection.getContext().removeAttribute(SYNAPSE_CONTEXT_KEY);
// don't remove stored context here because the response callback may run multiple times
Context context = (Context) connection.getContext().getAttribute(SYNAPSE_CONTEXT_KEY);
if (null != context) {
return context.attach();
}
Expand All @@ -129,15 +130,30 @@ public static void responseReceived(
if (null == scope) {
return;
}
AgentSpan span = spanFromContext(scope.context());
DECORATE.onResponse(span, connection.getHttpResponse());
final AgentSpan span = spanFromContext(scope.context());
final HttpResponse httpResponse = connection.getHttpResponse();
boolean isFinal = false;
if (httpResponse != null && httpResponse.getStatusLine() != null) {
int statusCode = httpResponse.getStatusLine().getStatusCode();
// 1xx (e.g. 100 Continue) - not final response
isFinal = statusCode >= 200;
}

if (isFinal) {
DECORATE.onResponse(span, httpResponse);
}
if (null != error) {
DECORATE.onError(span, error);
}
DECORATE.beforeFinish(scope.context());
scope.close();
if (span != null) {
span.finish();
if ((isFinal || error != null)
&& connection.getContext().removeAttribute(SYNAPSE_CONTEXT_KEY) != null) {
DECORATE.beforeFinish(scope.context());
scope.close();
if (span != null) {
span.finish();
}
} else {
scope.close();
}
}
}
Expand Down
29 changes: 22 additions & 7 deletions ....0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import net.bytebuddy.asm.Advice;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.nio.NHttpServerConnection;

@AutoService(InstrumenterModule.class)
Expand Down Expand Up @@ -92,8 +93,8 @@ public static final class ServerResponseAdvice {
@Advice.OnMethodEnter(suppress = Throwable.class)
public static ContextScope beginResponse(
@Advice.Argument(0) final NHttpServerConnection connection) {
// check and remove context so it won't be finished twice
Context context = (Context) connection.getContext().removeAttribute(SYNAPSE_CONTEXT_KEY);
// don't remove stored context here because the response callback may run multiple times
Context context = (Context) connection.getContext().getAttribute(SYNAPSE_CONTEXT_KEY);
if (null != context) {
return context.attach();
}
Expand All @@ -108,14 +109,28 @@ public static void responseReady(
if (null == scope) {
return;
}
AgentSpan span = spanFromContext(scope.context());
DECORATE.onResponse(span, connection.getHttpResponse());
final AgentSpan span = spanFromContext(scope.context());
final HttpResponse httpResponse = connection.getHttpResponse();
boolean isFinal = false;
if (httpResponse != null && httpResponse.getStatusLine() != null) {
isFinal = httpResponse.getStatusLine().getStatusCode() >= 200;
}

if (isFinal) {
DECORATE.onResponse(span, httpResponse);
}
if (null != error) {
DECORATE.onError(span, error);
}
DECORATE.beforeFinish(scope.context());
scope.close();
span.finish();

if ((isFinal || error != null)
&& connection.getContext().removeAttribute(SYNAPSE_CONTEXT_KEY) != null) {
DECORATE.beforeFinish(scope.context());
scope.close();
span.finish();
} else {
scope.close();
}
}
}

Expand Down