Skip to content
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

Create netty connection failure span only when first operation fails #3228

Merged
merged 1 commit into from
Jun 9, 2021
Merged

Create netty connection failure span only when first operation fails #3228

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
8 changes: 4 additions & 4 deletions ...ntelemetry/javaagent/instrumentation/netty/v4_0/ChannelFutureListenerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ public static Scope activateScope(@Advice.Argument(0) ChannelFuture future) {
- To return scope only if we have captured it.
- To capture scope only in case of error.
*/
Throwable cause = future.cause();
if (cause == null) {
return null;
}
Context parentContext = future.channel().attr(AttributeKeys.CONNECT_CONTEXT).getAndRemove();
if (parentContext == null) {
return null;
}
Throwable cause = future.cause();
if (cause == null) {
return null;
}

Scope parentScope = parentContext.makeCurrent();
if (tracer().shouldStartSpan(parentContext)) {
Expand Down
8 changes: 4 additions & 4 deletions ...ntelemetry/javaagent/instrumentation/netty/v4_1/ChannelFutureListenerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ public static Scope activateScope(@Advice.Argument(0) ChannelFuture future) {
- To return scope only if we have captured it.
- To capture scope only in case of error.
*/
Throwable cause = future.cause();
if (cause == null) {
return null;
}
Context parentContext = future.channel().attr(AttributeKeys.CONNECT_CONTEXT).getAndRemove();
if (parentContext == null) {
return null;
}
Throwable cause = future.cause();
if (cause == null) {
return null;
}

Scope parentScope = parentContext.makeCurrent();
if (tracer().shouldStartSpan(parentContext, SpanKind.CLIENT)) {
Expand Down