diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java index 86895ee1ba6..d8435812082 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java @@ -22,6 +22,7 @@ import org.junit.platform.commons.JUnitException; import org.junit.platform.commons.util.ClassLoaderUtils; import org.junit.platform.commons.util.ReflectionUtils; +import org.junit.platform.engine.ConfigurationParameters; import org.junit.platform.engine.EngineExecutionListener; import org.junit.platform.engine.ExecutionRequest; import org.junit.platform.engine.TestDescriptor; @@ -116,12 +117,6 @@ private JUnitPlatformUtils() {} METHOD_HANDLES.method(ExecutionRequest.class, "getOutputDirectoryProvider"); private static final MethodHandle GET_STORE = METHOD_HANDLES.method(ExecutionRequest.class, "getStore"); - private static final String[] CREATE_FALLBACK_PARAMETER_TYPES = - new String[] { - "org.junit.platform.engine.TestDescriptor", - "org.junit.platform.engine.EngineExecutionListener", - "org.junit.platform.engine.ConfigurationParameters" - }; private static final String[] CREATE_PARAMETER_TYPES = new String[] { "org.junit.platform.engine.TestDescriptor", @@ -143,14 +138,11 @@ private static MethodHandle createExecutionRequestHandle() { Arrays.stream(m.getParameterTypes()).map(Class::getName).toArray(), CREATE_PARAMETER_TYPES)); } else { - return METHOD_HANDLES.method( + return METHOD_HANDLES.constructor( ExecutionRequest.class, - m -> - "create".equals(m.getName()) - && m.getParameterCount() == 3 - && Arrays.equals( - Arrays.stream(m.getParameterTypes()).map(Class::getName).toArray(), - CREATE_FALLBACK_PARAMETER_TYPES)); + TestDescriptor.class, + EngineExecutionListener.class, + ConfigurationParameters.class); } }