Fix TestNG instrumentation to use immutable ITestResult.getName() instead of mutable ITestResult.getTestName() (#5606)

Author: nikita-tkachenko-datadog

dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TracingListener.java

@@ -82,52 +82,39 @@ public void onConfigurationSkip(ITestResult result) {
   public void onTestStart(final ITestResult result) {
     String testSuiteName = result.getInstanceName();
     String testName =
-        (result.getTestName() != null) ? result.getTestName() : result.getMethod().getMethodName();
-    String testQualifier = result.getTestContext().getName();
+        (result.getName() != null) ? result.getName() : result.getMethod().getMethodName();
     String testParameters = TestNGUtils.getParameters(result);
     List<String> groups = TestNGUtils.getGroups(result);
 
     Class<?> testClass = TestNGUtils.getTestClass(result);
     Method testMethod = TestNGUtils.getTestMethod(result);
 
     testEventsHandler.onTestStart(
-        testSuiteName,
-        testName,
-        testQualifier,
-        null,
-        null,
-        testParameters,
-        groups,
-        testClass,
-        testMethod);
+        testSuiteName, testName, result, null, null, testParameters, groups, testClass, testMethod);
   }
 
   @Override
   public void onTestSuccess(final ITestResult result) {
     final String testSuiteName = result.getInstanceName();
     final Class<?> testClass = TestNGUtils.getTestClass(result);
     String testName =
-        (result.getTestName() != null) ? result.getTestName() : result.getMethod().getMethodName();
-    String testQualifier = result.getTestContext().getName();
+        (result.getName() != null) ? result.getName() : result.getMethod().getMethodName();
     String testParameters = TestNGUtils.getParameters(result);
-    testEventsHandler.onTestFinish(
-        testSuiteName, testClass, testName, testQualifier, testParameters);
+    testEventsHandler.onTestFinish(testSuiteName, testClass, testName, result, testParameters);
   }
 
   @Override
   public void onTestFailure(final ITestResult result) {
     final String testSuiteName = result.getInstanceName();
     final Class<?> testClass = TestNGUtils.getTestClass(result);
     String testName =
-        (result.getTestName() != null) ? result.getTestName() : result.getMethod().getMethodName();
-    String testQualifier = result.getTestContext().getName();
+        (result.getName() != null) ? result.getName() : result.getMethod().getMethodName();
     String testParameters = TestNGUtils.getParameters(result);
 
     final Throwable throwable = result.getThrowable();
     testEventsHandler.onTestFailure(
-        testSuiteName, testClass, testName, testQualifier, testParameters, throwable);
-    testEventsHandler.onTestFinish(
-        testSuiteName, testClass, testName, testQualifier, testParameters);
+        testSuiteName, testClass, testName, result, testParameters, throwable);
+    testEventsHandler.onTestFinish(testSuiteName, testClass, testName, result, testParameters);
   }
 
   @Override
@@ -140,16 +127,14 @@ public void onTestSkipped(final ITestResult result) {
     final String testSuiteName = result.getInstanceName();
     final Class<?> testClass = TestNGUtils.getTestClass(result);
     String testName =
-        (result.getTestName() != null) ? result.getTestName() : result.getMethod().getMethodName();
-    String testQualifier = result.getTestContext().getName();
+        (result.getName() != null) ? result.getName() : result.getMethod().getMethodName();
     String testParameters = TestNGUtils.getParameters(result);
 
     // Typically the way of skipping a TestNG test is throwing a SkipException
     Throwable throwable = result.getThrowable();
     String reason = throwable != null ? throwable.getMessage() : null;
     testEventsHandler.onTestSkip(
-        testSuiteName, testClass, testName, testQualifier, testParameters, reason);
-    testEventsHandler.onTestFinish(
-        testSuiteName, testClass, testName, testQualifier, testParameters);
+        testSuiteName, testClass, testName, result, testParameters, reason);
+    testEventsHandler.onTestFinish(testSuiteName, testClass, testName, result, testParameters);
   }
 }