From 12ab0336b7b3a9b93f9d3628d32b1c4f0dbc2a51 Mon Sep 17 00:00:00 2001
From: Kristofer Karlsson <krka@spotify.com>
Date: Tue, 13 Sep 2022 08:27:04 +0200
Subject: [PATCH 1/2] Fix issue 2801 - Only resolve hostname once

---
 .../testng/reporters/JUnitReportReporter.java   | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/testng-core/src/main/java/org/testng/reporters/JUnitReportReporter.java b/testng-core/src/main/java/org/testng/reporters/JUnitReportReporter.java
index 3e5d4ffb7b..fe9f81cdd0 100644
--- a/testng-core/src/main/java/org/testng/reporters/JUnitReportReporter.java
+++ b/testng-core/src/main/java/org/testng/reporters/JUnitReportReporter.java
@@ -60,6 +60,8 @@ public void generateReport(
       }
     }
 
+    final String hostname = getHostName();
+
     for (Map.Entry<Class<?>, Set<ITestResult>> entry : results.entrySet()) {
       Class<?> cls = entry.getKey();
       Properties p1 = new Properties();
@@ -116,10 +118,8 @@ public void generateReport(
       p1.setProperty(XMLConstants.ATTR_NAME, cls.getName());
       p1.setProperty(XMLConstants.ATTR_TESTS, Integer.toString(testCount + ignored));
       p1.setProperty(XMLConstants.ATTR_TIME, "" + formatTime(totalTime));
-      try {
-        p1.setProperty(XMLConstants.ATTR_HOSTNAME, InetAddress.getLocalHost().getHostName());
-      } catch (UnknownHostException e) {
-        // ignore
+      if (hostname != null) {
+        p1.setProperty(XMLConstants.ATTR_HOSTNAME, hostname);
       }
 
       //
@@ -159,6 +159,15 @@ private static Collection<ITestResult> sort(Set<ITestResult> results) {
     return Collections.unmodifiableList(sortedResults);
   }
 
+  private static String getHostName() {
+    try {
+      return InetAddress.getLocalHost().getHostName();
+    } catch (UnknownHostException e) {
+      // ignore
+      return null;
+    }
+  }
+
   private static int getDisabledTestCount(Set<ITestNGMethod> methods) {
     int count = 0;
     for (ITestNGMethod method : methods) {

From e76ec27e2803c656b7e629eb5bc21a9d73652742 Mon Sep 17 00:00:00 2001
From: Kristofer Karlsson <krka@spotify.com>
Date: Tue, 13 Sep 2022 13:50:09 +0200
Subject: [PATCH 2/2] Update CHANGES.txt

---
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 577483cc4b..4686db82fc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
 Current
 New: Ability to provide custom error message for assertThrows\expectThrows methods (Anatolii Yuzhakov)
 Fixed: GITHUB-2780: Use SpotBugs instead of abandoned FindBugs
+Fixed: GITHUB-2801: JUnitReportReporter is too slow
 
 7.6.1
 Fixed: GITHUB-2761: Exception: ERROR java.nio.file.NoSuchFileException: /tmp/testngXmlPathInJar-15086412835569336174 (Krishnan Mahadevan)