Skip to content

Do not apply JUnit 4 instrumentation to MUnit runners #8675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 7, 2025
Merged

Do not apply JUnit 4 instrumentation to MUnit runners #8675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .../junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.extendsClass;
import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface;
import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.nameStartsWith;
import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
import static net.bytebuddy.matcher.ElementMatchers.not;
Expand Down Expand Up @@ -54,6 +55,9 @@ public ElementMatcher<TypeDescription> hierarchyMatcher() {
// do not instrument Karate JUnit 4 runner
// since Karate has a dedicated instrumentation
.and(not(extendsClass(named("com.intuit.karate.junit4.Karate"))))
// do not instrument MUnit-JUnit 4 interface runner
// since MUnit has a dedicated instrumentation
.and(not(extendsClass(nameStartsWith("munit.internal.junitinterface."))))
// PowerMock runner is being instrumented,
// so do not instrument its internal delegates
.and(
Expand Down
2 changes: 2 additions & 0 deletions ...umentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,8 @@ public static TestFrameworkInstrumentation runnerToFramework(Runner runner) {
return TestFrameworkInstrumentation.KARATE;
} else if (runnerClassName.startsWith("io.cucumber")) {
return TestFrameworkInstrumentation.CUCUMBER;
} else if (runnerClassName.startsWith("munit.internal.junitinterface")) {
return TestFrameworkInstrumentation.MUNIT;
} else {
return TestFrameworkInstrumentation.JUNIT4;
}
Expand Down
Loading