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

Reformat code

This commit is contained in:
Luca Abbati 2019-05-27 15:50:47 +02:00
parent 13cf53827d
commit 9d2523a58a
No known key found for this signature in database
GPG Key ID: C901DDA2FFE14529
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dd-java-agent/agent-jmxfetch/integrations-core

@ -1 +1 @@
Subproject commit e6a01f9e885ac9b71c0ffec8c28dc75668570b15
Subproject commit 3e38b4e75edcee3ca84f022ea50240b0fc0537f2

16
dd-java-agent/instrumentation/glassfish-4.1/src/main/java/datadog/trace/instrumentation/glassfish4/GlassfishInstrumentation.java
View File

@ -2,26 +2,21 @@ package datadog.trace.instrumentation.glassfish4;
import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.isPrivate;
import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith;
import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Constants;
import datadog.trace.agent.tooling.ExceptionHandlers;
import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.agent.tooling.Utils;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import net.bytebuddy.agent.builder.AgentBuilder;
import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;
import net.bytebuddy.matcher.ElementMatchers;
import java.util.Map;
/**
* This instrumenter prevents a mechanism from GlassFish classloader to produces a class not found
* exception in our tracer. Link to the GH issue:
@ -45,14 +40,15 @@ public final class GlassfishInstrumentation extends Instrumenter.Default {
@Override
public ElementMatcher<? super TypeDescription> typeMatcher() {
return ElementMatchers.named("com.sun.enterprise.v3.server.APIClassLoaderServiceImpl$APIClassLoader");
return ElementMatchers.named(
"com.sun.enterprise.v3.server.APIClassLoaderServiceImpl$APIClassLoader");
}
@Override
public Map<? extends ElementMatcher<? super MethodDescription>, String> transformers() {
return singletonMap(
isMethod().and(named("addToBlackList")).and(takesArguments(0)),
AvoidGlassFishBlacklistAdvice.class.getName());
isMethod().and(named("addToBlackList")).and(takesArguments(0)),
AvoidGlassFishBlacklistAdvice.class.getName());
}
public static class AvoidGlassFishBlacklistAdvice {
@ -65,7 +61,7 @@ public final class GlassfishInstrumentation extends Instrumenter.Default {
if (log.isDebugEnabled()) {
log.debug(
"Prevented blacklisting of class {}. Stack trace is: \n{}",
name,
name,
Utils.getStackTraceAsString());
}
name = "__datadog_no_blacklist." + name;