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

Merge pull request #181 from DataDog/tyler/cleanup 

Fix types for Intellij
This commit is contained in:
Andrew Kent 2018-01-02 13:36:19 -08:00 committed by GitHub
parent cd0cc3bce2 596a1abc65
commit eff8c0627f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dd-java-agent/integrations/mongo-3.1/src/main/java/dd/inst/mongo/MongoClientInstrumentation.java
View File

@ -1,6 +1,10 @@
package dd.inst.mongo;
import static net.bytebuddy.matcher.ElementMatchers.*;
import static net.bytebuddy.matcher.ElementMatchers.declaresMethod;
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
import com.google.auto.service.AutoService;
import com.mongodb.MongoClientOptions;
@ -9,6 +13,7 @@ import dd.trace.HelperInjector;
import dd.trace.Instrumenter;
import io.opentracing.util.GlobalTracer;
import java.lang.reflect.Modifier;
import java.util.Collections;
import net.bytebuddy.agent.builder.AgentBuilder;
import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.type.TypeDescription;
@ -19,7 +24,7 @@ public final class MongoClientInstrumentation implements Instrumenter {
new HelperInjector("dd.inst.mongo.DDTracingCommandListener");
@Override
public AgentBuilder instrument(AgentBuilder agentBuilder) {
public AgentBuilder instrument(final AgentBuilder agentBuilder) {
return agentBuilder
.type(
named("com.mongodb.MongoClientOptions$Builder")
@ -32,7 +37,7 @@ public final class MongoClientInstrumentation implements Instrumenter {
"com.mongodb.event.CommandListener",
Modifier.PUBLIC,
null,
new TypeDescription.Generic[] {})))
Collections.<TypeDescription.Generic>emptyList())))
.and(isPublic()))))
.transform(MONGO_HELPER_INJECTOR)
.transform(
@ -49,7 +54,7 @@ public final class MongoClientInstrumentation implements Instrumenter {
public static void injectTraceListener(@Advice.This final Object dis) {
// referencing "this" in the method args causes the class to load under a transformer.
// This bypasses the Builder instrumentation. Casting as a workaround.
MongoClientOptions.Builder builder = (MongoClientOptions.Builder) dis;
final MongoClientOptions.Builder builder = (MongoClientOptions.Builder) dis;
final DDTracingCommandListener listener = new DDTracingCommandListener(GlobalTracer.get());
builder.addCommandListener(listener);
}

11
dd-java-agent/integrations/mongo-async-3.3/src/main/java/dd/inst/mongo/MongoAsyncClientInstrumentation.java
View File

@ -1,6 +1,10 @@
package dd.inst.mongo;
import static net.bytebuddy.matcher.ElementMatchers.*;
import static net.bytebuddy.matcher.ElementMatchers.declaresMethod;
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
import com.google.auto.service.AutoService;
import com.mongodb.async.client.MongoClientSettings;
@ -8,6 +12,7 @@ import dd.trace.DDAdvice;
import dd.trace.Instrumenter;
import io.opentracing.util.GlobalTracer;
import java.lang.reflect.Modifier;
import java.util.Collections;
import net.bytebuddy.agent.builder.AgentBuilder;
import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.type.TypeDescription;
@ -16,7 +21,7 @@ import net.bytebuddy.description.type.TypeDescription;
public final class MongoAsyncClientInstrumentation implements Instrumenter {
@Override
public AgentBuilder instrument(AgentBuilder agentBuilder) {
public AgentBuilder instrument(final AgentBuilder agentBuilder) {
return agentBuilder
.type(
named("com.mongodb.async.client.MongoClientSettings$Builder")
@ -29,7 +34,7 @@ public final class MongoAsyncClientInstrumentation implements Instrumenter {
"com.mongodb.event.CommandListener",
Modifier.PUBLIC,
null,
new TypeDescription.Generic[] {})))
Collections.<TypeDescription.Generic>emptyList())))
.and(isPublic()))))
.transform(MongoClientInstrumentation.MONGO_HELPER_INJECTOR)
.transform(

25
dd-java-agent/tooling/src/main/java/dd/trace/HelperInjector.java
View File

@ -3,6 +3,7 @@ package dd.trace;
import com.datadoghq.agent.Utils;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@ -20,7 +21,7 @@ import net.bytebuddy.utility.JavaModule;
public class HelperInjector implements Transformer {
private final Set<String> helperClassNames;
private Map<TypeDescription, byte[]> helperMap = null;
private final Set<ClassLoader> injectedClassLoaders = new HashSet<ClassLoader>();
private final Set<ClassLoader> injectedClassLoaders = new HashSet<>();
/**
* Construct HelperInjector.
@ -28,18 +29,20 @@ public class HelperInjector implements Transformer {
* @param helperClassNames binary names of the helper classes to inject. These class names must be
* resolvable by the classloader returned by dd.trace.DDAdvice#getAgentClassLoader()
*/
public HelperInjector(String... helperClassNames) {
this.helperClassNames = new HashSet<String>(Arrays.asList(helperClassNames));
public HelperInjector(final String... helperClassNames) {
this.helperClassNames = new HashSet<>(Arrays.asList(helperClassNames));
}
private synchronized Map<TypeDescription, byte[]> getHelperMap() throws IOException {
if (helperMap == null) {
helperMap = new HashMap<TypeDescription, byte[]>(helperClassNames.size());
for (String helperName : helperClassNames) {
helperMap = new HashMap<>(helperClassNames.size());
for (final String helperName : helperClassNames) {
final ClassFileLocator locator =
ClassFileLocator.ForClassLoader.of(Utils.getAgentClassLoader());
final byte[] classBytes = locator.locate(helperName).resolve();
final TypeDescription typeDesc = new TypeDescription.Latent(helperName, 0, null);
final TypeDescription typeDesc =
new TypeDescription.Latent(
helperName, 0, null, Collections.<TypeDescription.Generic>emptyList());
helperMap.put(typeDesc, classBytes);
}
}
@ -48,16 +51,16 @@ public class HelperInjector implements Transformer {
@Override
public DynamicType.Builder<?> transform(
DynamicType.Builder<?> builder,
TypeDescription typeDescription,
ClassLoader classLoader,
JavaModule module) {
final DynamicType.Builder<?> builder,
final TypeDescription typeDescription,
final ClassLoader classLoader,
final JavaModule module) {
if (helperClassNames.size() > 0 && classLoader != null) {
synchronized (this) {
if (!injectedClassLoaders.contains(classLoader)) {
try {
new ClassInjector.UsingReflection(classLoader).inject(getHelperMap());
} catch (Exception e) {
} catch (final Exception e) {
log.error("Failed to inject helper classes into " + classLoader, e);
throw new RuntimeException(e);
}