open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Works with 3.8 also, still need to fix muzzle again

This commit is contained in:
Brian Devins-Suresh 2020-03-20 14:11:53 -04:00
parent 9297ff39f4
commit 4ae71c8087
20 changed files with 45 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dd-java-agent/instrumentation/netty-3.9/netty-3.9.gradle → dd-java-agent/instrumentation/netty-3.8/netty-3.8.gradle
View File

@ -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"
}
}
}

5
dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/ChannelFutureListenerInstrumentation.java → dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java
View File

@ -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
);
}

2
dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/ChannelTraceContext.java → dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelTraceContext.java
View File

@ -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;

7
dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/NettyChannelInstrumentation.java → dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java
View File

@ -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
);
}

15
dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/NettyChannelPipelineInstrumentation.java → dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java
View File

@ -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
);
}

8
dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/HttpClientRequestTracingHandler.java → dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java
View File

@ -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;

6
dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/HttpClientResponseTracingHandler.java → dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java
View File

@ -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;

6
dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/HttpClientTracingHandler.java → dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientTracingHandler.java
View File

@ -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

2
dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/NettyHttpClientDecorator.java → dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyHttpClientDecorator.java
View File

@ -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;

2
dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/client/NettyResponseInjectAdapter.java → dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyResponseInjectAdapter.java
View File

@ -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;

8
dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/HttpServerRequestTracingHandler.java → dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java
View File

@ -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;

6
dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/HttpServerResponseTracingHandler.java → dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerResponseTracingHandler.java
View File

@ -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;

6
dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/HttpServerTracingHandler.java → dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerTracingHandler.java
View File

@ -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

2
dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/NettyHttpServerDecorator.java → dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/NettyHttpServerDecorator.java
View File

@ -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;

2
dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/server/NettyRequestExtractAdapter.java → dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/NettyRequestExtractAdapter.java
View File

@ -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;

2
dd-java-agent/instrumentation/netty-3.9/src/main/java/datadog/trace/instrumentation/netty39/util/CombinedSimpleChannelHandler.java → dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/util/CombinedSimpleChannelHandler.java
View File

@ -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;

2
dd-java-agent/instrumentation/netty-3.9/src/test/groovy/Netty39ClientTest.groovy → dd-java-agent/instrumentation/netty-3.8/src/test/groovy/Netty39ClientTest.groovy
View File

@ -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

2
dd-java-agent/instrumentation/netty-3.9/src/test/groovy/Netty39ServerTest.groovy → dd-java-agent/instrumentation/netty-3.8/src/test/groovy/Netty39ServerTest.groovy
View File

@ -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

0
dd-java-agent/instrumentation/netty-3.9/src/test/groovy/NettyServerTestInstrumentation.java → dd-java-agent/instrumentation/netty-3.8/src/test/groovy/NettyServerTestInstrumentation.java
View File

2
settings.gradle
View File

@ -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'