From 2376a9e9727e9cb3020dd3f57584950a4cdcdab6 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Mon, 6 Oct 2025 17:30:42 +0000
Subject: [PATCH] 8365630: jdk/jfr/tool/TestPrintContextual.java fails with
 wrong spanId

Reviewed-by: shade
---
 test/jdk/jdk/jfr/tool/TestPrintContextual.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/test/jdk/jdk/jfr/tool/TestPrintContextual.java b/test/jdk/jdk/jfr/tool/TestPrintContextual.java
index 15486148b9c..e6df9c7c729 100644
--- a/test/jdk/jdk/jfr/tool/TestPrintContextual.java
+++ b/test/jdk/jdk/jfr/tool/TestPrintContextual.java
@@ -25,6 +25,7 @@ package jdk.jfr.tool;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.time.Instant;
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.List;
@@ -264,7 +265,8 @@ public class TestPrintContextual {
         }
     }
 
-    private static void span(int depth) {
+    private static void span(int depth) throws InterruptedException {
+        awaitUniqueTimestamp();
         SpanEvent span = new SpanEvent();
         span.name = "span";
         span.spanId = depth;
@@ -277,6 +279,13 @@ public class TestPrintContextual {
         span.commit();
     }
 
+    private static void awaitUniqueTimestamp() throws InterruptedException {
+        Instant timestamp = Instant.now();
+        while (timestamp.equals(Instant.now())) {
+            Thread.sleep(1);
+        }
+    }
+
     // Tests that context values are only inhjected into events in the same thread.
     private static void testThreadedContext() throws Exception {
         try (Recording r = new Recording()) {