Skip to content

Commit f61d4e7

Browse files
Fix duplicate events
1 parent 8d2f57b commit f61d4e7

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestInstrumentation.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package datadog.trace.instrumentation.scalatest;
22

3-
import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface;
43
import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
54
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
65
import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
@@ -11,14 +10,12 @@
1110
import datadog.trace.bootstrap.CallDepthThreadLocalMap;
1211
import java.util.Set;
1312
import net.bytebuddy.asm.Advice;
14-
import net.bytebuddy.description.type.TypeDescription;
15-
import net.bytebuddy.matcher.ElementMatcher;
1613
import org.scalatest.Reporter;
1714
import org.scalatest.events.Event;
1815

1916
@AutoService(InstrumenterModule.class)
2017
public class ScalatestInstrumentation extends InstrumenterModule.CiVisibility
21-
implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
18+
implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
2219

2320
public ScalatestInstrumentation() {
2421
super("ci-visibility", "scalatest");
@@ -30,13 +27,10 @@ public boolean isApplicable(Set<TargetSystem> enabledSystems) {
3027
}
3128

3229
@Override
33-
public String hierarchyMarkerType() {
34-
return "org.scalatest.Reporter";
35-
}
36-
37-
@Override
38-
public ElementMatcher<TypeDescription> hierarchyMatcher() {
39-
return implementsInterface(named(hierarchyMarkerType()));
30+
public String[] knownMatchingTypes() {
31+
return new String[] {
32+
"org.scalatest.DispatchReporter", "org.scalatest.tools.TestSortingReporter",
33+
};
4034
}
4135

4236
@Override

0 commit comments

Comments
 (0)