From 1f9fbf7d2b07a8cf5e5adc47e08b2534a1eb0b26 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Tue, 8 Apr 2025 16:57:50 +0200 Subject: [PATCH] expand munit runners filter to catch munit.MUnitRunner --- .../trace/instrumentation/junit4/JUnit4Instrumentation.java | 2 +- .../java/datadog/trace/instrumentation/junit4/JUnit4Utils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java index 884b92f903c..46ece26f80a 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java @@ -57,7 +57,7 @@ public ElementMatcher hierarchyMatcher() { .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.")))) + .and(not(extendsClass(nameStartsWith("munit")))) // PowerMock runner is being instrumented, // so do not instrument its internal delegates .and( diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java index d491a72a756..2351d58a076 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java @@ -348,7 +348,7 @@ 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")) { + } else if (runnerClassName.startsWith("munit")) { return TestFrameworkInstrumentation.MUNIT; } else { return TestFrameworkInstrumentation.JUNIT4;