[WIP] Add file attribute to JUnit reports

.circleci/collect_results.sh

@@ -19,6 +19,16 @@ if [[ ${#TEST_RESULT_DIRS[@]} -eq 0 ]]; then
   exit 0
 fi
 
+# Read sourceFile.xml into map
+declare -A SOURCE_FILE_MAP
+SOURCE_FILE_XML="test-results/sourceFiles.xml"
+while IFS= read -r line
+do
+  KEY=$(echo "$line" | cut -d ":" -f 1)
+  VALUE=$(echo "$line" | cut -d ":" -f 2)
+  SOURCE_FILE_MAP["$KEY"]="$VALUE"
+done < "$SOURCE_FILE_XML"
+
 echo "Saving test results:"
 while IFS= read -r -d '' RESULT_XML_FILE
 do
@@ -30,6 +40,13 @@ do
   sed -i '/<testcase/ s/@[0-9a-f]\{5,\}/@HASHCODE/g' "$TEST_RESULTS_DIR/$AGGREGATED_FILE_NAME"
   # Replace random port numbers by marker in testcase XML nodes to get stable test names
   sed -i '/<testcase/ s/localhost:[0-9]\{2,5\}/localhost:PORT/g' "$TEST_RESULTS_DIR/$AGGREGATED_FILE_NAME"
+
+  # Insert file attribute to testcases
+  for CLASSNAME in "${!SOURCE_FILE_MAP[@]}"; do
+    SOURCE_FILE="${SOURCE_FILE_MAP[CLASSNAME]}"
+    sed -i "/<testcase.*classname=$CLASSNAME/ s/\(time=\"[^\"]*\"\)/file=$SOURCE_FILE \1/g" "$TEST_RESULTS_DIR/$AGGREGATED_FILE_NAME"
+  done
+
   if cmp -s "$RESULT_XML_FILE" "$TEST_RESULTS_DIR/$AGGREGATED_FILE_NAME"; then
     echo ""
   else

components/context/build.gradle.kts

@@ -11,3 +11,7 @@ jmh {
 val excludedClassesInstructionCoverage by extra {
   listOf("datadog.context.ContextProviders") // covered by forked test
 }
+
+tasks.test {
+  jvmArgs("-Djunit.jupiter.extensions.autodetection.enabled=true")
+}

components/context/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension

@@ -0,0 +1 @@
+datadog.context.GetSourceFileInfoExtension

components/context/src/test/java/datadog/context/GetSourceFileInfoExtension.java

@@ -0,0 +1,48 @@
+package datadog.context;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.TestInstancePostProcessor;
+
+public class GetSourceFileInfoExtension implements TestInstancePostProcessor {
+  private static Map<String, String> sourceFiles = new HashMap<String, String>();
+
+  @Override
+  public void postProcessTestInstance(Object testInstance, ExtensionContext context)
+      throws IOException {
+    getTestData(context);
+  }
+
+  public static Map<String, String> getSourceFiles() {
+    return sourceFiles;
+  }
+
+  private static void getTestData(ExtensionContext context) throws IOException {
+    // get test classname and source file
+    String testClassName = context.getTestClass().get().getName();
+    String testClassPath = testClassName.replace(".", "/") + ".java";
+    String root = Paths.get("").toAbsolutePath().toString();
+    String absolutePath = root + "/src/test/java/" + testClassPath;
+    String subPath =
+        absolutePath.substring(absolutePath.indexOf("dd-trace-java") + "dd-trace-java".length());
+
+    // print to sourceFiles.xml only if source file has not already been added
+    if (!sourceFiles.containsKey(testClassName)) {
+      File sourceFile = new File(root + "/build/test-results/sourceFiles.xml");
+      if (!sourceFile.exists()) {
+        sourceFile.createNewFile();
+      }
+      BufferedWriter writer = new BufferedWriter(new FileWriter(sourceFile, true));
+      writer.write(testClassName + ":" + subPath);
+      writer.newLine();
+      writer.close();
+    }
+    sourceFiles.put(testClassName, subPath);
+  }
+}

gradle/java.gradle

@@ -2,3 +2,20 @@ apply plugin: 'datadog.dependency-locking'
 
 apply from: "$rootDir/gradle/java_deps.gradle"
 apply from: "$rootDir/gradle/java_no_deps.gradle"
+
+tasks.named("test") {
+  finalizedBy("myCustomTask")
+}
+
+tasks.named("forkedTest") {
+  finalizedBy("myCustomTask")
+}
+
+tasks.register('myCustomTask') {
+  group = "Custom Tasks" // Optional, for better organization
+  description = "This is a custom task that prints a message"
+
+  doLast {
+    println("Running my custom task!")
+  }
+}

gradle/java_no_deps.gradle

@@ -19,6 +19,7 @@ ext.testcontainersLimit = gradle.sharedServices.registerIfAbsent("testcontainers
 if (tasks.matching({it.name == 'forkedTest'}).empty) {
   tasks.register('forkedTest', Test).configure {
     useJUnitPlatform()
+    jvmArgs("-Djunit.jupiter.extensions.autodetection.enabled=true")
   }
 }