Remove async propagating disable instrumentation (#177)
This commit is contained in:
Trask Stalnaker
GitHub
parent
d54f0cd31f
commit
ab8fb882f8
|
|
@ -37,7 +37,6 @@ class HystrixTest extends AgentTestRunner {
|
||||||
operation(command)
|
operation(command)
|
||||||
}
|
}
|
||||||
expect:
|
expect:
|
||||||
TRANSFORMED_CLASSES.contains("com.netflix.hystrix.strategy.concurrency.HystrixContextScheduler\$ThreadPoolWorker")
|
|
||||||
TRANSFORMED_CLASSES.contains("HystrixTest\$1")
|
TRANSFORMED_CLASSES.contains("HystrixTest\$1")
|
||||||
result == "Hello!"
|
result == "Hello!"
|
||||||
|
|
||||||
|
|
@ -103,7 +102,6 @@ class HystrixTest extends AgentTestRunner {
|
||||||
operation(command)
|
operation(command)
|
||||||
}
|
}
|
||||||
expect:
|
expect:
|
||||||
TRANSFORMED_CLASSES.contains("com.netflix.hystrix.strategy.concurrency.HystrixContextScheduler\$ThreadPoolWorker")
|
|
||||||
TRANSFORMED_CLASSES.contains("HystrixTest\$2")
|
TRANSFORMED_CLASSES.contains("HystrixTest\$2")
|
||||||
result == "Fallback!"
|
result == "Fallback!"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,104 +0,0 @@
|
||||||
package io.opentelemetry.auto.instrumentation.java.concurrent;
|
|
||||||
|
|
||||||
import static io.opentelemetry.auto.instrumentation.java.concurrent.AdviceUtils.TRACER;
|
|
||||||
import static io.opentelemetry.auto.tooling.ByteBuddyElementMatchers.safeHasSuperType;
|
|
||||||
import static java.util.Collections.singletonMap;
|
|
||||||
import static net.bytebuddy.matcher.ElementMatchers.named;
|
|
||||||
|
|
||||||
import com.google.auto.service.AutoService;
|
|
||||||
import com.google.common.collect.ImmutableMap;
|
|
||||||
import io.opentelemetry.auto.tooling.Instrumenter;
|
|
||||||
import io.opentelemetry.context.Scope;
|
|
||||||
import io.opentelemetry.trace.DefaultSpan;
|
|
||||||
import io.opentelemetry.trace.Span;
|
|
||||||
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;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sometimes classes do lazy initialization for scheduling of tasks. If this is done during a trace
|
|
||||||
* it can cause the trace to never be reported. Add matchers below to disable async propagation
|
|
||||||
* during this period.
|
|
||||||
*/
|
|
||||||
@Slf4j
|
|
||||||
@AutoService(Instrumenter.class)
|
|
||||||
public final class AsyncPropagatingDisableInstrumentation implements Instrumenter {
|
|
||||||
|
|
||||||
private static final Map<
|
|
||||||
ElementMatcher<? super TypeDescription>, ElementMatcher<? super MethodDescription>>
|
|
||||||
CLASS_AND_METHODS =
|
|
||||||
new ImmutableMap.Builder<
|
|
||||||
ElementMatcher<? super TypeDescription>,
|
|
||||||
ElementMatcher<? super MethodDescription>>()
|
|
||||||
.put(safeHasSuperType(named("rx.Scheduler$Worker")), named("schedulePeriodically"))
|
|
||||||
.build();
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AgentBuilder instrument(AgentBuilder agentBuilder) {
|
|
||||||
|
|
||||||
for (final Map.Entry<
|
|
||||||
ElementMatcher<? super TypeDescription>, ElementMatcher<? super MethodDescription>>
|
|
||||||
entry : CLASS_AND_METHODS.entrySet()) {
|
|
||||||
agentBuilder =
|
|
||||||
new DisableAsyncInstrumentation(entry.getKey(), entry.getValue())
|
|
||||||
.instrument(agentBuilder);
|
|
||||||
}
|
|
||||||
return agentBuilder;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Not Using AutoService to hook up this instrumentation
|
|
||||||
public static class DisableAsyncInstrumentation extends Default {
|
|
||||||
|
|
||||||
private final ElementMatcher<? super TypeDescription> typeMatcher;
|
|
||||||
private final ElementMatcher<? super MethodDescription> methodMatcher;
|
|
||||||
|
|
||||||
/** No-arg constructor only used by muzzle and tests. */
|
|
||||||
public DisableAsyncInstrumentation() {
|
|
||||||
this(ElementMatchers.<TypeDescription>none(), ElementMatchers.<MethodDescription>none());
|
|
||||||
}
|
|
||||||
|
|
||||||
public DisableAsyncInstrumentation(
|
|
||||||
final ElementMatcher<? super TypeDescription> typeMatcher,
|
|
||||||
final ElementMatcher<? super MethodDescription> methodMatcher) {
|
|
||||||
super(AbstractExecutorInstrumentation.EXEC_NAME);
|
|
||||||
this.typeMatcher = typeMatcher;
|
|
||||||
this.methodMatcher = methodMatcher;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ElementMatcher<? super TypeDescription> typeMatcher() {
|
|
||||||
return typeMatcher;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Map<? extends ElementMatcher<? super MethodDescription>, String> transformers() {
|
|
||||||
return singletonMap(
|
|
||||||
methodMatcher,
|
|
||||||
AsyncPropagatingDisableInstrumentation.class.getName() + "$DisableAsyncAdvice");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class DisableAsyncAdvice {
|
|
||||||
|
|
||||||
@Advice.OnMethodEnter(suppress = Throwable.class)
|
|
||||||
public static Scope enter() {
|
|
||||||
final Span span = TRACER.getCurrentSpan();
|
|
||||||
if (span.getContext().isValid()) {
|
|
||||||
return TRACER.withSpan(DefaultSpan.getInvalid());
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Advice.OnMethodExit(suppress = Throwable.class)
|
|
||||||
public static void exit(@Advice.Enter final Scope scope) {
|
|
||||||
if (scope != null) {
|
|
||||||
scope.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue