diff --git a/dd-java-agent/instrumentation/netty-3.9/netty-3.9.gradle b/dd-java-agent/instrumentation/netty-3.8/netty-3.8.gradle similarity index 84% rename from dd-java-agent/instrumentation/netty-3.9/netty-3.9.gradle rename to dd-java-agent/instrumentation/netty-3.8/netty-3.8.gradle index a467162d93..d706cd806b 100644 --- a/dd-java-agent/instrumentation/netty-3.9/netty-3.9.gradle +++ b/dd-java-agent/instrumentation/netty-3.8/netty-3.8.gradle @@ -10,7 +10,7 @@ muzzle { pass { group = "io.netty" module = "netty" - versions = "[3.9.0.Final,3.10)" + versions = "[3.8.0.Final,3.10)" assertInverse = true } fail { @@ -29,9 +29,9 @@ testSets { } dependencies { - compileOnly group: 'io.netty', name: 'netty', version: '3.9.0.Final' + compileOnly group: 'io.netty', name: 'netty', version: '3.8.0.Final' - testCompile group: 'io.netty', name: 'netty', version: '3.9.0.Final' + testCompile group: 'io.netty', name: 'netty', version: '3.8.0.Final' testCompile group: 'com.ning', name: 'async-http-client', version: '1.8.0' latestDepTestCompile group: 'io.netty', name: 'netty', version: '3.9.+' @@ -44,7 +44,7 @@ configurations.testCompile { eachDependency { DependencyResolveDetails details -> //specifying a fixed version for all libraries with io.netty' group if (details.requested.group == 'io.netty') { - details.useVersion "3.9.0.Final" + details.useVersion "3.8.0.Final" } } } 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.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java similarity index 96% rename from dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/ChannelFutureListenerInstrumentation.java rename to dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java index e5cec85663..224d04650a 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.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java @@ -1,4 +1,4 @@ -package datadog.trace.instrumentation.netty39; +package datadog.trace.instrumentation.netty38; import static datadog.trace.agent.tooling.ClassLoaderMatcher.hasClassesNamed; import static datadog.trace.agent.tooling.bytebuddy.matcher.DDElementMatchers.implementsInterface; @@ -17,7 +17,7 @@ import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.Tags; import datadog.trace.context.TraceScope; -import datadog.trace.instrumentation.netty39.server.NettyHttpServerDecorator; +import datadog.trace.instrumentation.netty38.server.NettyHttpServerDecorator; import java.util.Collections; import java.util.Map; import net.bytebuddy.asm.Advice; @@ -41,7 +41,6 @@ public class ChannelFutureListenerInstrumentation extends Instrumenter.Default { // Optimization for expensive typeMatcher. return hasClassesNamed( "org.jboss.netty.channel.ChannelFutureListener", - "org.jboss.netty.buffer.EmptyChannelBuffer", // Not in 3.8 "org.jboss.netty.channel.StaticChannelPipeline" // Not in 3.10 ); } diff --git a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/ChannelTraceContext.java b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelTraceContext.java similarity index 95% rename from dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/ChannelTraceContext.java rename to dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelTraceContext.java index e021002b6c..1bba8ba74a 100644 --- a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/ChannelTraceContext.java +++ b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelTraceContext.java @@ -1,4 +1,4 @@ -package datadog.trace.instrumentation.netty39; +package datadog.trace.instrumentation.netty38; import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; 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.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java similarity index 93% rename from dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/NettyChannelInstrumentation.java rename to dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java index b242b88e8d..7619f91e7a 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.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java @@ -1,10 +1,10 @@ -package datadog.trace.instrumentation.netty39; +package datadog.trace.instrumentation.netty38; import static datadog.trace.agent.tooling.ClassLoaderMatcher.hasClassesNamed; import static datadog.trace.agent.tooling.bytebuddy.matcher.DDElementMatchers.implementsInterface; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeScope; -import static datadog.trace.instrumentation.netty39.NettyChannelPipelineInstrumentation.ADDITIONAL_INSTRUMENTATION_NAMES; -import static datadog.trace.instrumentation.netty39.NettyChannelPipelineInstrumentation.INSTRUMENTATION_NAME; +import static datadog.trace.instrumentation.netty38.NettyChannelPipelineInstrumentation.ADDITIONAL_INSTRUMENTATION_NAMES; +import static datadog.trace.instrumentation.netty38.NettyChannelPipelineInstrumentation.INSTRUMENTATION_NAME; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.returns; @@ -34,7 +34,6 @@ public class NettyChannelInstrumentation extends Instrumenter.Default { // Optimization for expensive typeMatcher. return hasClassesNamed( "org.jboss.netty.channel.Channel", - "org.jboss.netty.buffer.EmptyChannelBuffer", // Not in 3.8 "org.jboss.netty.channel.StaticChannelPipeline" // Not in 3.10 ); } 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.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java similarity index 94% rename from dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/NettyChannelPipelineInstrumentation.java rename to dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java index 697cf14a02..dea115942b 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.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java @@ -1,4 +1,4 @@ -package datadog.trace.instrumentation.netty39; +package datadog.trace.instrumentation.netty38; import static datadog.trace.agent.tooling.ClassLoaderMatcher.hasClassesNamed; import static datadog.trace.agent.tooling.bytebuddy.matcher.DDElementMatchers.implementsInterface; @@ -12,12 +12,12 @@ import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.instrumentation.netty39.client.HttpClientRequestTracingHandler; -import datadog.trace.instrumentation.netty39.client.HttpClientResponseTracingHandler; -import datadog.trace.instrumentation.netty39.client.HttpClientTracingHandler; -import datadog.trace.instrumentation.netty39.server.HttpServerRequestTracingHandler; -import datadog.trace.instrumentation.netty39.server.HttpServerResponseTracingHandler; -import datadog.trace.instrumentation.netty39.server.HttpServerTracingHandler; +import datadog.trace.instrumentation.netty38.client.HttpClientRequestTracingHandler; +import datadog.trace.instrumentation.netty38.client.HttpClientResponseTracingHandler; +import datadog.trace.instrumentation.netty38.client.HttpClientTracingHandler; +import datadog.trace.instrumentation.netty38.server.HttpServerRequestTracingHandler; +import datadog.trace.instrumentation.netty38.server.HttpServerResponseTracingHandler; +import datadog.trace.instrumentation.netty38.server.HttpServerTracingHandler; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -50,7 +50,6 @@ public class NettyChannelPipelineInstrumentation extends Instrumenter.Default { // Optimization for expensive typeMatcher. return hasClassesNamed( "org.jboss.netty.channel.ChannelPipeline", - "org.jboss.netty.buffer.EmptyChannelBuffer", // Not in 3.8 "org.jboss.netty.channel.StaticChannelPipeline" // Not in 3.10 ); } 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.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java similarity index 92% rename from dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/HttpClientRequestTracingHandler.java rename to dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java index df5fd3e079..75d964529b 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.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java @@ -1,17 +1,17 @@ -package datadog.trace.instrumentation.netty39.client; +package datadog.trace.instrumentation.netty38.client; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import static datadog.trace.instrumentation.netty39.client.NettyHttpClientDecorator.DECORATE; -import static datadog.trace.instrumentation.netty39.client.NettyResponseInjectAdapter.SETTER; +import static datadog.trace.instrumentation.netty38.client.NettyHttpClientDecorator.DECORATE; +import static datadog.trace.instrumentation.netty38.client.NettyResponseInjectAdapter.SETTER; 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.ChannelTraceContext; +import datadog.trace.instrumentation.netty38.ChannelTraceContext; import java.net.InetSocketAddress; import lombok.extern.slf4j.Slf4j; import org.jboss.netty.channel.Channel; 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.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java similarity index 91% rename from dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/HttpClientResponseTracingHandler.java rename to dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java index ebd5f6fc66..156af2ec6c 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.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java @@ -1,13 +1,13 @@ -package datadog.trace.instrumentation.netty39.client; +package datadog.trace.instrumentation.netty38.client; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan; -import static datadog.trace.instrumentation.netty39.client.NettyHttpClientDecorator.DECORATE; +import static datadog.trace.instrumentation.netty38.client.NettyHttpClientDecorator.DECORATE; import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -import datadog.trace.instrumentation.netty39.ChannelTraceContext; +import datadog.trace.instrumentation.netty38.ChannelTraceContext; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.MessageEvent; 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.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientTracingHandler.java similarity index 73% rename from dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/HttpClientTracingHandler.java rename to dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientTracingHandler.java index 7e0efa27d9..ebc8ebc0fd 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.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientTracingHandler.java @@ -1,8 +1,8 @@ -package datadog.trace.instrumentation.netty39.client; +package datadog.trace.instrumentation.netty38.client; import datadog.trace.bootstrap.ContextStore; -import datadog.trace.instrumentation.netty39.ChannelTraceContext; -import datadog.trace.instrumentation.netty39.util.CombinedSimpleChannelHandler; +import datadog.trace.instrumentation.netty38.ChannelTraceContext; +import datadog.trace.instrumentation.netty38.util.CombinedSimpleChannelHandler; import org.jboss.netty.channel.Channel; public class HttpClientTracingHandler diff --git a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/NettyHttpClientDecorator.java b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyHttpClientDecorator.java similarity index 96% rename from dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/NettyHttpClientDecorator.java rename to dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyHttpClientDecorator.java index 9ee1c4ea0b..f1f90a206e 100644 --- a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/NettyHttpClientDecorator.java +++ b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyHttpClientDecorator.java @@ -1,4 +1,4 @@ -package datadog.trace.instrumentation.netty39.client; +package datadog.trace.instrumentation.netty38.client; import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.HOST; diff --git a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/NettyResponseInjectAdapter.java b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyResponseInjectAdapter.java similarity index 89% rename from dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/NettyResponseInjectAdapter.java rename to dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyResponseInjectAdapter.java index 985d7e5d5f..7f4dc69580 100644 --- a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/NettyResponseInjectAdapter.java +++ b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyResponseInjectAdapter.java @@ -1,4 +1,4 @@ -package datadog.trace.instrumentation.netty39.client; +package datadog.trace.instrumentation.netty38.client; import datadog.trace.bootstrap.instrumentation.api.AgentPropagation; import org.jboss.netty.handler.codec.http.HttpHeaders; 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.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java similarity index 91% rename from dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/HttpServerRequestTracingHandler.java rename to dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java index 33acba335f..67cda84d9b 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.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java @@ -1,16 +1,16 @@ -package datadog.trace.instrumentation.netty39.server; +package datadog.trace.instrumentation.netty38.server; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import static datadog.trace.instrumentation.netty39.server.NettyHttpServerDecorator.DECORATE; -import static datadog.trace.instrumentation.netty39.server.NettyRequestExtractAdapter.GETTER; +import static datadog.trace.instrumentation.netty38.server.NettyHttpServerDecorator.DECORATE; +import static datadog.trace.instrumentation.netty38.server.NettyRequestExtractAdapter.GETTER; 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.ChannelTraceContext; +import datadog.trace.instrumentation.netty38.ChannelTraceContext; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.MessageEvent; 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.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerResponseTracingHandler.java similarity index 90% rename from dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/HttpServerResponseTracingHandler.java rename to dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerResponseTracingHandler.java index 3b3104a782..d3b511b2b8 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.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerResponseTracingHandler.java @@ -1,11 +1,11 @@ -package datadog.trace.instrumentation.netty39.server; +package datadog.trace.instrumentation.netty38.server; -import static datadog.trace.instrumentation.netty39.server.NettyHttpServerDecorator.DECORATE; +import static datadog.trace.instrumentation.netty38.server.NettyHttpServerDecorator.DECORATE; import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.Tags; -import datadog.trace.instrumentation.netty39.ChannelTraceContext; +import datadog.trace.instrumentation.netty38.ChannelTraceContext; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.MessageEvent; 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.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerTracingHandler.java similarity index 73% rename from dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/HttpServerTracingHandler.java rename to dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerTracingHandler.java index c11867d0ea..c4827a1fb7 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.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerTracingHandler.java @@ -1,8 +1,8 @@ -package datadog.trace.instrumentation.netty39.server; +package datadog.trace.instrumentation.netty38.server; import datadog.trace.bootstrap.ContextStore; -import datadog.trace.instrumentation.netty39.ChannelTraceContext; -import datadog.trace.instrumentation.netty39.util.CombinedSimpleChannelHandler; +import datadog.trace.instrumentation.netty38.ChannelTraceContext; +import datadog.trace.instrumentation.netty38.util.CombinedSimpleChannelHandler; import org.jboss.netty.channel.Channel; public class HttpServerTracingHandler diff --git a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/NettyHttpServerDecorator.java b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/NettyHttpServerDecorator.java similarity index 97% rename from dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/NettyHttpServerDecorator.java rename to dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/NettyHttpServerDecorator.java index e51a9c6ea6..b4baa2dbd1 100644 --- a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/NettyHttpServerDecorator.java +++ b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/NettyHttpServerDecorator.java @@ -1,4 +1,4 @@ -package datadog.trace.instrumentation.netty39.server; +package datadog.trace.instrumentation.netty38.server; import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.HOST; diff --git a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/NettyRequestExtractAdapter.java b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/NettyRequestExtractAdapter.java similarity index 90% rename from dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/NettyRequestExtractAdapter.java rename to dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/NettyRequestExtractAdapter.java index 3834d3209f..39eedcc226 100644 --- a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/NettyRequestExtractAdapter.java +++ b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/NettyRequestExtractAdapter.java @@ -1,4 +1,4 @@ -package datadog.trace.instrumentation.netty39.server; +package datadog.trace.instrumentation.netty38.server; import datadog.trace.bootstrap.instrumentation.api.AgentPropagation; import org.jboss.netty.handler.codec.http.HttpHeaders; diff --git a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/util/CombinedSimpleChannelHandler.java b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/util/CombinedSimpleChannelHandler.java similarity index 98% rename from dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/util/CombinedSimpleChannelHandler.java rename to dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/util/CombinedSimpleChannelHandler.java index 2823bfe72a..d33442e4b7 100644 --- a/dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/util/CombinedSimpleChannelHandler.java +++ b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/util/CombinedSimpleChannelHandler.java @@ -1,4 +1,4 @@ -package datadog.trace.instrumentation.netty39.util; +package datadog.trace.instrumentation.netty38.util; import org.jboss.netty.channel.ChannelEvent; import org.jboss.netty.channel.ChannelHandlerContext; diff --git a/dd-java-agent/instrumentation/netty-3.9/src/test/groovy/Netty39ClientTest.groovy b/dd-java-agent/instrumentation/netty-3.8/src/test/groovy/Netty39ClientTest.groovy similarity index 97% rename from dd-java-agent/instrumentation/netty-3.9/src/test/groovy/Netty39ClientTest.groovy rename to dd-java-agent/instrumentation/netty-3.8/src/test/groovy/Netty39ClientTest.groovy index 25ebbe0ac2..a8a5b0d999 100644 --- a/dd-java-agent/instrumentation/netty-3.9/src/test/groovy/Netty39ClientTest.groovy +++ b/dd-java-agent/instrumentation/netty-3.8/src/test/groovy/Netty39ClientTest.groovy @@ -4,7 +4,7 @@ import com.ning.http.client.AsyncHttpClientConfig import com.ning.http.client.Response import datadog.trace.agent.test.base.HttpClientTest import datadog.trace.bootstrap.instrumentation.api.Tags -import datadog.trace.instrumentation.netty39.client.NettyHttpClientDecorator +import datadog.trace.instrumentation.netty38.client.NettyHttpClientDecorator import spock.lang.AutoCleanup import spock.lang.Shared diff --git a/dd-java-agent/instrumentation/netty-3.9/src/test/groovy/Netty39ServerTest.groovy b/dd-java-agent/instrumentation/netty-3.8/src/test/groovy/Netty39ServerTest.groovy similarity index 98% rename from dd-java-agent/instrumentation/netty-3.9/src/test/groovy/Netty39ServerTest.groovy rename to dd-java-agent/instrumentation/netty-3.8/src/test/groovy/Netty39ServerTest.groovy index ab76a536b1..c3d90a0aa6 100644 --- a/dd-java-agent/instrumentation/netty-3.9/src/test/groovy/Netty39ServerTest.groovy +++ b/dd-java-agent/instrumentation/netty-3.8/src/test/groovy/Netty39ServerTest.groovy @@ -1,5 +1,5 @@ import datadog.trace.agent.test.base.HttpServerTest -import datadog.trace.instrumentation.netty39.server.NettyHttpServerDecorator +import datadog.trace.instrumentation.netty38.server.NettyHttpServerDecorator import org.jboss.netty.bootstrap.ServerBootstrap import org.jboss.netty.buffer.ChannelBuffer import org.jboss.netty.buffer.ChannelBuffers diff --git a/dd-java-agent/instrumentation/netty-3.9/src/test/groovy/NettyServerTestInstrumentation.java b/dd-java-agent/instrumentation/netty-3.8/src/test/groovy/NettyServerTestInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.9/src/test/groovy/NettyServerTestInstrumentation.java rename to dd-java-agent/instrumentation/netty-3.8/src/test/groovy/NettyServerTestInstrumentation.java diff --git a/settings.gradle b/settings.gradle index 0fd80a9c09..e184365078 100644 --- a/settings.gradle +++ b/settings.gradle @@ -112,7 +112,7 @@ include ':dd-java-agent:instrumentation:log4j2' include ':dd-java-agent:instrumentation:mongo' include ':dd-java-agent:instrumentation:mongo:driver-3.1' include ':dd-java-agent:instrumentation:mongo:driver-async-3.3' -include ':dd-java-agent:instrumentation:netty-3.9' +include ':dd-java-agent:instrumentation:netty-3.8' include ':dd-java-agent:instrumentation:netty-4.0' include ':dd-java-agent:instrumentation:netty-4.1' include ':dd-java-agent:instrumentation:okhttp-3'