From 9297ff39f47b797a9990b169692234144e66bfb6 Mon Sep 17 00:00:00 2001 From: Brian Devins-Suresh Date: Fri, 20 Mar 2020 08:00:34 -0400 Subject: [PATCH] Less ambiguous name, also doesn't collide with netty class --- .../ChannelFutureListenerInstrumentation.java | 12 ++++++------ ...nelState.java => ChannelTraceContext.java} | 8 ++++---- .../netty39/NettyChannelInstrumentation.java | 12 +++++++----- .../NettyChannelPipelineInstrumentation.java | 16 ++++++++-------- .../HttpClientRequestTracingHandler.java | 19 ++++++++++--------- .../HttpClientResponseTracingHandler.java | 17 +++++++++-------- .../client/HttpClientTracingHandler.java | 4 ++-- .../HttpServerRequestTracingHandler.java | 15 ++++++++------- .../HttpServerResponseTracingHandler.java | 13 +++++++------ .../server/HttpServerTracingHandler.java | 4 ++-- 10 files changed, 63 insertions(+), 57 deletions(-) rename dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/{ChannelState.java => ChannelTraceContext.java} (87%) diff --git a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/ChannelFutureListenerInstrumentation.java index a0682c3c95..e5cec85663 100644 --- a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/ChannelFutureListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/ChannelFutureListenerInstrumentation.java @@ -54,8 +54,8 @@ public class ChannelFutureListenerInstrumentation extends Instrumenter.Default { @Override public String[] helperClassNames() { return new String[] { - packageName + ".ChannelState", - packageName + ".ChannelState$Factory", + packageName + ".ChannelTraceContext", + packageName + ".ChannelTraceContext$Factory", packageName + ".server.NettyHttpServerDecorator", packageName + ".server.NettyRequestExtractAdapter" }; @@ -73,7 +73,7 @@ public class ChannelFutureListenerInstrumentation extends Instrumenter.Default { @Override public Map contextStore() { return Collections.singletonMap( - "org.jboss.netty.channel.Channel", ChannelState.class.getName()); + "org.jboss.netty.channel.Channel", ChannelTraceContext.class.getName()); } public static class OperationCompleteAdvice { @@ -89,12 +89,12 @@ public class ChannelFutureListenerInstrumentation extends Instrumenter.Default { return null; } - final ContextStore contextStore = - InstrumentationContext.get(Channel.class, ChannelState.class); + final ContextStore contextStore = + InstrumentationContext.get(Channel.class, ChannelTraceContext.class); final TraceScope.Continuation continuation = contextStore - .putIfAbsent(future.getChannel(), ChannelState.Factory.INSTANCE) + .putIfAbsent(future.getChannel(), ChannelTraceContext.Factory.INSTANCE) .getConnectionContinuationAndRemove(); if (continuation == null) { return null; diff --git a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/ChannelState.java b/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/ChannelTraceContext.java similarity index 87% rename from dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/ChannelState.java rename to dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/ChannelTraceContext.java index 3c19f4ebb6..e021002b6c 100644 --- a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/ChannelState.java +++ b/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/ChannelTraceContext.java @@ -6,13 +6,13 @@ import datadog.trace.context.TraceScope; import lombok.Data; @Data -public class ChannelState { - public static class Factory implements ContextStore.Factory { +public class ChannelTraceContext { + public static class Factory implements ContextStore.Factory { public static final Factory INSTANCE = new Factory(); @Override - public ChannelState create() { - return new ChannelState(); + public ChannelTraceContext create() { + return new ChannelTraceContext(); } } diff --git a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/NettyChannelInstrumentation.java b/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/NettyChannelInstrumentation.java index 1be3b2bcc1..b242b88e8d 100644 --- a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/NettyChannelInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/NettyChannelInstrumentation.java @@ -46,7 +46,9 @@ public class NettyChannelInstrumentation extends Instrumenter.Default { @Override public String[] helperClassNames() { - return new String[] {packageName + ".ChannelState", packageName + ".ChannelState$Factory"}; + return new String[] { + packageName + ".ChannelTraceContext", packageName + ".ChannelTraceContext$Factory" + }; } @Override @@ -63,7 +65,7 @@ public class NettyChannelInstrumentation extends Instrumenter.Default { @Override public Map contextStore() { return Collections.singletonMap( - "org.jboss.netty.channel.Channel", ChannelState.class.getName()); + "org.jboss.netty.channel.Channel", ChannelTraceContext.class.getName()); } public static class ChannelConnectAdvice { @@ -73,11 +75,11 @@ public class NettyChannelInstrumentation extends Instrumenter.Default { if (scope != null) { final TraceScope.Continuation continuation = scope.capture(); if (continuation != null) { - final ContextStore contextStore = - InstrumentationContext.get(Channel.class, ChannelState.class); + final ContextStore contextStore = + InstrumentationContext.get(Channel.class, ChannelTraceContext.class); if (!contextStore - .putIfAbsent(channel, ChannelState.Factory.INSTANCE) + .putIfAbsent(channel, ChannelTraceContext.Factory.INSTANCE) .compareAndSet(null, continuation)) { continuation.close(); } diff --git a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/NettyChannelPipelineInstrumentation.java b/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/NettyChannelPipelineInstrumentation.java index 5a5530d465..697cf14a02 100644 --- a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/NettyChannelPipelineInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/NettyChannelPipelineInstrumentation.java @@ -63,8 +63,8 @@ public class NettyChannelPipelineInstrumentation extends Instrumenter.Default { @Override public String[] helperClassNames() { return new String[] { - packageName + ".ChannelState", - packageName + ".ChannelState$Factory", + packageName + ".ChannelTraceContext", + packageName + ".ChannelTraceContext$Factory", NettyChannelPipelineInstrumentation.class.getName() + "$ChannelPipelineAdviceUtil", // Util packageName + ".util.CombinedSimpleChannelHandler", @@ -102,7 +102,7 @@ public class NettyChannelPipelineInstrumentation extends Instrumenter.Default { @Override public Map contextStore() { return Collections.singletonMap( - "org.jboss.netty.channel.Channel", ChannelState.class.getName()); + "org.jboss.netty.channel.Channel", ChannelTraceContext.class.getName()); } /** @@ -112,7 +112,7 @@ public class NettyChannelPipelineInstrumentation extends Instrumenter.Default { */ public static class ChannelPipelineAdviceUtil { public static void wrapHandler( - final ContextStore contextStore, + final ContextStore contextStore, final ChannelPipeline pipeline, final ChannelHandler handler) { try { @@ -173,8 +173,8 @@ public class NettyChannelPipelineInstrumentation extends Instrumenter.Default { return; } - final ContextStore contextStore = - InstrumentationContext.get(Channel.class, ChannelState.class); + final ContextStore contextStore = + InstrumentationContext.get(Channel.class, ChannelTraceContext.class); ChannelPipelineAdviceUtil.wrapHandler(contextStore, pipeline, handler); } @@ -203,8 +203,8 @@ public class NettyChannelPipelineInstrumentation extends Instrumenter.Default { return; } - final ContextStore contextStore = - InstrumentationContext.get(Channel.class, ChannelState.class); + final ContextStore contextStore = + InstrumentationContext.get(Channel.class, ChannelTraceContext.class); ChannelPipelineAdviceUtil.wrapHandler(contextStore, pipeline, handler); } diff --git a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/HttpClientRequestTracingHandler.java b/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/HttpClientRequestTracingHandler.java index 1e2acd9e0b..df5fd3e079 100644 --- a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/HttpClientRequestTracingHandler.java +++ b/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/HttpClientRequestTracingHandler.java @@ -11,7 +11,7 @@ import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.context.TraceScope; -import datadog.trace.instrumentation.netty39.ChannelState; +import datadog.trace.instrumentation.netty39.ChannelTraceContext; import java.net.InetSocketAddress; import lombok.extern.slf4j.Slf4j; import org.jboss.netty.channel.Channel; @@ -23,9 +23,10 @@ import org.jboss.netty.handler.codec.http.HttpRequest; @Slf4j public class HttpClientRequestTracingHandler extends SimpleChannelDownstreamHandler { - private final ContextStore contextStore; + private final ContextStore contextStore; - public HttpClientRequestTracingHandler(final ContextStore contextStore) { + public HttpClientRequestTracingHandler( + final ContextStore contextStore) { this.contextStore = contextStore; } @@ -37,19 +38,19 @@ public class HttpClientRequestTracingHandler extends SimpleChannelDownstreamHand return; } - final ChannelState channelState = - contextStore.putIfAbsent(ctx.getChannel(), ChannelState.Factory.INSTANCE); + final ChannelTraceContext channelTraceContext = + contextStore.putIfAbsent(ctx.getChannel(), ChannelTraceContext.Factory.INSTANCE); TraceScope parentScope = null; - final TraceScope.Continuation continuation = channelState.getConnectionContinuation(); + final TraceScope.Continuation continuation = channelTraceContext.getConnectionContinuation(); if (continuation != null) { parentScope = continuation.activate(); - channelState.setConnectionContinuation(null); + channelTraceContext.setConnectionContinuation(null); } final HttpRequest request = (HttpRequest) msg.getMessage(); - channelState.setClientParentSpan(activeSpan()); + channelTraceContext.setClientParentSpan(activeSpan()); final AgentSpan span = startSpan("netty.client.request"); try (final AgentScope scope = activateSpan(span, false)) { @@ -62,7 +63,7 @@ public class HttpClientRequestTracingHandler extends SimpleChannelDownstreamHand propagate().inject(span, request.headers(), SETTER); } - channelState.setClientSpan(span); + channelTraceContext.setClientSpan(span); try { ctx.sendDownstream(msg); diff --git a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/HttpClientResponseTracingHandler.java b/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/HttpClientResponseTracingHandler.java index db8e4db40d..ebd5f6fc66 100644 --- a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/HttpClientResponseTracingHandler.java +++ b/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/HttpClientResponseTracingHandler.java @@ -7,7 +7,7 @@ import static datadog.trace.instrumentation.netty39.client.NettyHttpClientDecora import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -import datadog.trace.instrumentation.netty39.ChannelState; +import datadog.trace.instrumentation.netty39.ChannelTraceContext; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.MessageEvent; @@ -16,24 +16,25 @@ import org.jboss.netty.handler.codec.http.HttpResponse; public class HttpClientResponseTracingHandler extends SimpleChannelUpstreamHandler { - private final ContextStore contextStore; + private final ContextStore contextStore; - public HttpClientResponseTracingHandler(final ContextStore contextStore) { + public HttpClientResponseTracingHandler( + final ContextStore contextStore) { this.contextStore = contextStore; } @Override public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent msg) throws Exception { - final ChannelState channelState = - contextStore.putIfAbsent(ctx.getChannel(), ChannelState.Factory.INSTANCE); + final ChannelTraceContext channelTraceContext = + contextStore.putIfAbsent(ctx.getChannel(), ChannelTraceContext.Factory.INSTANCE); - AgentSpan parent = channelState.getClientParentSpan(); + AgentSpan parent = channelTraceContext.getClientParentSpan(); if (parent == null) { parent = noopSpan(); - channelState.setClientParentSpan(noopSpan()); + channelTraceContext.setClientParentSpan(noopSpan()); } - final AgentSpan span = channelState.getClientSpan(); + final AgentSpan span = channelTraceContext.getClientSpan(); final boolean finishSpan = msg.getMessage() instanceof HttpResponse; diff --git a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/HttpClientTracingHandler.java b/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/HttpClientTracingHandler.java index 325249581a..7e0efa27d9 100644 --- a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/HttpClientTracingHandler.java +++ b/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/HttpClientTracingHandler.java @@ -1,7 +1,7 @@ package datadog.trace.instrumentation.netty39.client; import datadog.trace.bootstrap.ContextStore; -import datadog.trace.instrumentation.netty39.ChannelState; +import datadog.trace.instrumentation.netty39.ChannelTraceContext; import datadog.trace.instrumentation.netty39.util.CombinedSimpleChannelHandler; import org.jboss.netty.channel.Channel; @@ -9,7 +9,7 @@ public class HttpClientTracingHandler extends CombinedSimpleChannelHandler< HttpClientResponseTracingHandler, HttpClientRequestTracingHandler> { - public HttpClientTracingHandler(final ContextStore contextStore) { + public HttpClientTracingHandler(final ContextStore contextStore) { super( new HttpClientResponseTracingHandler(contextStore), new HttpClientRequestTracingHandler(contextStore)); diff --git a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/HttpServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/HttpServerRequestTracingHandler.java index 08c6724319..33acba335f 100644 --- a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/HttpServerRequestTracingHandler.java +++ b/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/HttpServerRequestTracingHandler.java @@ -10,7 +10,7 @@ import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan.Context; -import datadog.trace.instrumentation.netty39.ChannelState; +import datadog.trace.instrumentation.netty39.ChannelTraceContext; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.MessageEvent; @@ -19,20 +19,21 @@ import org.jboss.netty.handler.codec.http.HttpRequest; public class HttpServerRequestTracingHandler extends SimpleChannelUpstreamHandler { - private final ContextStore contextStore; + private final ContextStore contextStore; - public HttpServerRequestTracingHandler(final ContextStore contextStore) { + public HttpServerRequestTracingHandler( + final ContextStore contextStore) { this.contextStore = contextStore; } @Override public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent msg) throws Exception { - final ChannelState channelState = - contextStore.putIfAbsent(ctx.getChannel(), ChannelState.Factory.INSTANCE); + final ChannelTraceContext channelTraceContext = + contextStore.putIfAbsent(ctx.getChannel(), ChannelTraceContext.Factory.INSTANCE); if (!(msg.getMessage() instanceof HttpRequest)) { - final AgentSpan span = channelState.getServerSpan(); + final AgentSpan span = channelTraceContext.getServerSpan(); if (span == null) { ctx.sendUpstream(msg); // superclass does not throw } else { @@ -56,7 +57,7 @@ public class HttpServerRequestTracingHandler extends SimpleChannelUpstreamHandle scope.setAsyncPropagation(true); - channelState.setServerSpan(span); + channelTraceContext.setServerSpan(span); try { ctx.sendUpstream(msg); diff --git a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/HttpServerResponseTracingHandler.java b/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/HttpServerResponseTracingHandler.java index aed1388be0..3b3104a782 100644 --- a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/HttpServerResponseTracingHandler.java +++ b/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/HttpServerResponseTracingHandler.java @@ -5,7 +5,7 @@ import static datadog.trace.instrumentation.netty39.server.NettyHttpServerDecora import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.Tags; -import datadog.trace.instrumentation.netty39.ChannelState; +import datadog.trace.instrumentation.netty39.ChannelTraceContext; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.MessageEvent; @@ -14,19 +14,20 @@ import org.jboss.netty.handler.codec.http.HttpResponse; public class HttpServerResponseTracingHandler extends SimpleChannelDownstreamHandler { - private final ContextStore contextStore; + private final ContextStore contextStore; - public HttpServerResponseTracingHandler(final ContextStore contextStore) { + public HttpServerResponseTracingHandler( + final ContextStore contextStore) { this.contextStore = contextStore; } @Override public void writeRequested(final ChannelHandlerContext ctx, final MessageEvent msg) throws Exception { - final ChannelState channelState = - contextStore.putIfAbsent(ctx.getChannel(), ChannelState.Factory.INSTANCE); + final ChannelTraceContext channelTraceContext = + contextStore.putIfAbsent(ctx.getChannel(), ChannelTraceContext.Factory.INSTANCE); - final AgentSpan span = channelState.getServerSpan(); + final AgentSpan span = channelTraceContext.getServerSpan(); if (span == null || !(msg.getMessage() instanceof HttpResponse)) { ctx.sendDownstream(msg); return; diff --git a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/HttpServerTracingHandler.java b/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/HttpServerTracingHandler.java index 0037028fa0..c11867d0ea 100644 --- a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/HttpServerTracingHandler.java +++ b/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/HttpServerTracingHandler.java @@ -1,7 +1,7 @@ package datadog.trace.instrumentation.netty39.server; import datadog.trace.bootstrap.ContextStore; -import datadog.trace.instrumentation.netty39.ChannelState; +import datadog.trace.instrumentation.netty39.ChannelTraceContext; import datadog.trace.instrumentation.netty39.util.CombinedSimpleChannelHandler; import org.jboss.netty.channel.Channel; @@ -9,7 +9,7 @@ public class HttpServerTracingHandler extends CombinedSimpleChannelHandler< HttpServerRequestTracingHandler, HttpServerResponseTracingHandler> { - public HttpServerTracingHandler(final ContextStore contextStore) { + public HttpServerTracingHandler(final ContextStore contextStore) { super( new HttpServerRequestTracingHandler(contextStore), new HttpServerResponseTracingHandler(contextStore));