Skip to content

Commit 62acbdf

Browse files
committed
feat(junit-5.3): Migrate to JSON component
1 parent 0fb58fb commit 62acbdf

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

dd-java-agent/instrumentation/junit-5.3/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ muzzle {
2626
addTestSuiteForDir('latestDepTest', 'test')
2727

2828
dependencies {
29+
implementation project(':components:json:json-io')
30+
2931
compileOnly group: 'org.junit.platform', name: 'junit-platform-launcher', version: "$platformVersion"
3032
compileOnly group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: "$jupiterVersion"
3133

dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java

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

3+
import static datadog.json.io.JsonMapper.toJson;
4+
35
import datadog.trace.api.civisibility.config.TestIdentifier;
46
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
57
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
68
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
79
import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
810
import datadog.trace.util.MethodHandles;
9-
import datadog.trace.util.Strings;
10-
import java.lang.invoke.MethodHandle;
11-
import java.lang.reflect.Method;
12-
import java.util.List;
1311
import org.junit.platform.commons.JUnitException;
1412
import org.junit.platform.commons.util.ClassLoaderUtils;
1513
import org.junit.platform.commons.util.ReflectionUtils;
@@ -89,7 +87,7 @@ public static String getParameters(MethodSource methodSource, String displayName
8987
|| methodSource.getMethodParameterTypes().isEmpty()) {
9088
return null;
9189
}
92-
return "{\"metadata\":{\"test_name\":\"" + Strings.escapeToJson(displayName) + "\"}}";
90+
return "{\"metadata\":{\"test_name\":\"" + toJson(displayName) + "\"}}";
9391
}
9492

9593
public static TestIdentifier toTestIdentifier(TestDescriptor testDescriptor) {

0 commit comments

Comments
 (0)