From cb782fdd0ea43baf060cbce3368312f17f38164c Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Thu, 5 Mar 2020 12:00:18 -0800 Subject: [PATCH] Fix muzzle for trace-annotation. --- .../trace_annotation/TraceConfigInstrumentation.java | 3 ++- .../trace-annotation/trace-annotation.gradle | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceConfigInstrumentation.java b/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceConfigInstrumentation.java index c0515991bd..cd8faadb7f 100644 --- a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceConfigInstrumentation.java +++ b/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceConfigInstrumentation.java @@ -9,6 +9,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.api.Config; +import datadog.trace.api.Trace; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -116,7 +117,7 @@ public class TraceConfigInstrumentation implements Instrumenter { /** No-arg constructor only used by muzzle and tests. */ public TracerClassInstrumentation() { - this("noop", Collections.singleton("noop")); + this(Trace.class.getName(), Collections.singleton("noop")); } public TracerClassInstrumentation(final String className, final Set methodNames) { diff --git a/dd-java-agent/instrumentation/trace-annotation/trace-annotation.gradle b/dd-java-agent/instrumentation/trace-annotation/trace-annotation.gradle index da1c3d20e0..b1d8af0bce 100644 --- a/dd-java-agent/instrumentation/trace-annotation/trace-annotation.gradle +++ b/dd-java-agent/instrumentation/trace-annotation/trace-annotation.gradle @@ -1,3 +1,12 @@ +muzzle { + pass { + group = "com.datadoghq" + module = "dd-trace-api" + versions = "[0.31.0,]" + assertInverse = true + } +} + apply from: "${rootDir}/gradle/java.gradle" dependencies {