diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadEndEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadEndEvent.java index 67152e7afe8..2c504fca4a8 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadEndEvent.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadEndEvent.java @@ -26,7 +26,6 @@ package jdk.jfr.events; import jdk.jfr.Category; -import jdk.jfr.Experimental; import jdk.jfr.Label; import jdk.jfr.Name; import jdk.jfr.internal.MirrorEvent; @@ -35,7 +34,6 @@ import jdk.jfr.internal.MirrorEvent; @Label("Virtual Thread End") @Name("jdk.VirtualThreadEnd") @MirrorEvent(className = "jdk.internal.event.VirtualThreadEndEvent") -@Experimental public final class VirtualThreadEndEvent extends AbstractJDKEvent { @Label("Thread Id") diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadPinnedEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadPinnedEvent.java index d1407c97563..f109966f1be 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadPinnedEvent.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadPinnedEvent.java @@ -26,7 +26,6 @@ package jdk.jfr.events; import jdk.jfr.Category; -import jdk.jfr.Experimental; import jdk.jfr.Label; import jdk.jfr.Name; import jdk.jfr.internal.MirrorEvent; @@ -35,6 +34,5 @@ import jdk.jfr.internal.MirrorEvent; @Label("Virtual Thread Pinned") @Name("jdk.VirtualThreadPinned") @MirrorEvent(className = "jdk.internal.event.VirtualThreadPinnedEvent") -@Experimental public final class VirtualThreadPinnedEvent extends AbstractJDKEvent { } diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadStartEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadStartEvent.java index 1a035622b9b..e109aefb3bb 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadStartEvent.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadStartEvent.java @@ -26,7 +26,6 @@ package jdk.jfr.events; import jdk.jfr.Category; -import jdk.jfr.Experimental; import jdk.jfr.Label; import jdk.jfr.Name; import jdk.jfr.internal.MirrorEvent; @@ -35,7 +34,6 @@ import jdk.jfr.internal.MirrorEvent; @Label("Virtual Thread Start") @Name("jdk.VirtualThreadStart") @MirrorEvent(className = "jdk.internal.event.VirtualThreadStartEvent") -@Experimental public final class VirtualThreadStartEvent extends AbstractJDKEvent { @Label("Thread Id") diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadSubmitFailedEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadSubmitFailedEvent.java index 662cd0e6539..292b90c378b 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadSubmitFailedEvent.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadSubmitFailedEvent.java @@ -27,7 +27,6 @@ package jdk.jfr.events; import jdk.jfr.Category; import jdk.jfr.Description; -import jdk.jfr.Experimental; import jdk.jfr.Label; import jdk.jfr.Name; import jdk.jfr.internal.MirrorEvent; @@ -37,7 +36,6 @@ import jdk.jfr.internal.MirrorEvent; @Name("jdk.VirtualThreadSubmitFailed") @Description("Submit of task for virtual thread failed") @MirrorEvent(className = "jdk.internal.event.VirtualThreadSubmitFailedEvent") -@Experimental public final class VirtualThreadSubmitFailedEvent extends AbstractJDKEvent { @Label("Thread Id") diff --git a/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java b/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java index de514579dcb..0e0891615ac 100644 --- a/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java +++ b/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java @@ -77,6 +77,9 @@ public class TestLookForUntestedEvents { "ContainerConfiguration", "ContainerCPUUsage", "ContainerCPUThrottling", "ContainerMemoryUsage", "ContainerIOUsage") ); + // These events are tested in test/jdk/java/lang/Thread/virtual/JfrEvents.java + private static final Set coveredVirtualThreadEvents = Set.of( + "VirtualThreadPinned", "VirtualThreadSubmitFailed"); // This is a "known failure list" for this test. // NOTE: if the event is not covered, a bug should be open, and bug number @@ -85,16 +88,8 @@ public class TestLookForUntestedEvents { ); // Experimental events - private static final Set experimentalEvents = new HashSet<>( - Arrays.asList( - "Flush", - "SyncOnValueBasedClass", - "VirtualThreadStart", - "VirtualThreadEnd", - "VirtualThreadPinned", - "VirtualThreadSubmitFailed") - ); - + private static final Set experimentalEvents = Set.of( + "Flush", "SyncOnValueBasedClass"); public static void main(String[] args) throws Exception { for (EventType type : FlightRecorder.getFlightRecorder().getEventTypes()) { @@ -127,6 +122,7 @@ public class TestLookForUntestedEvents { // Account for hard-to-test, experimental and GC tested events eventsNotCoveredByTest.removeAll(hardToTestEvents); eventsNotCoveredByTest.removeAll(coveredGcEvents); + eventsNotCoveredByTest.removeAll(coveredVirtualThreadEvents); eventsNotCoveredByTest.removeAll(coveredContainerEvents); eventsNotCoveredByTest.removeAll(knownNotCoveredEvents);