use skipcount and add new tests

roberttoyonaga · roberttoyonaga · commit 936b8fcca875 · 2025-01-08T16:50:44.000-05:00
diff --git a/substratevm/mx.substratevm/mx_substratevm.py b/substratevm/mx.substratevm/mx_substratevm.py
@@ -545,7 +545,6 @@ def native_unittests_task(extra_build_args=None):
             out.write(f"Simple file{i}" + '\n')
 
     additional_build_args = svm_experimental_options([
-        '-H:-JfrTrimInternalStackTraces',
         '-H:AdditionalSecurityProviders=com.oracle.svm.test.services.SecurityServiceTest$NoOpProvider',
         '-H:AdditionalSecurityServiceTypes=com.oracle.svm.test.services.SecurityServiceTest$JCACompliantNoOpService',
         '-cp', cp_entry_name
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameSourceInfo.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameSourceInfo.java
@@ -68,7 +68,6 @@ public Class<?> getSourceClass() {
         return sourceClass;
     }
 
-    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     public String getSourceClassName() {
         Class<?> clazz = getSourceClass();
         return (clazz != null) ? clazz.getName() : "";
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrEvent.java
@@ -32,13 +32,16 @@
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.collections.EnumBitmask;
 import com.oracle.svm.core.thread.JavaThreads;
+import com.oracle.svm.core.VMInspectionOptions;
 
 /**
  * This file contains the VM-level events that Native Image supports on all JDK versions. The event
  * IDs depend on the JDK version (see metadata.xml file) and are computed at image build time.
  */
 public final class JfrEvent {
-    public static final JfrEvent ThreadStart = create("jdk.ThreadStart");
+    private static final int defaultInternalSkipCount = VMInspectionOptions.JfrTrimInternalStackTraces.getValue() ? 3 : 0;
+
+    public static final JfrEvent ThreadStart = create("jdk.ThreadStart", defaultInternalSkipCount);
     public static final JfrEvent ThreadEnd = create("jdk.ThreadEnd");
     public static final JfrEvent ThreadCPULoad = create("jdk.ThreadCPULoad");
     public static final JfrEvent DataLoss = create("jdk.DataLoss");
@@ -60,41 +63,53 @@ public final class JfrEvent {
     public static final JfrEvent SafepointBegin = create("jdk.SafepointBegin", JfrEventFlags.HasDuration);
     public static final JfrEvent SafepointEnd = create("jdk.SafepointEnd", JfrEventFlags.HasDuration);
     public static final JfrEvent ExecuteVMOperation = create("jdk.ExecuteVMOperation", JfrEventFlags.HasDuration);
-    public static final JfrEvent JavaMonitorEnter = create("jdk.JavaMonitorEnter", JfrEventFlags.HasDuration);
-    public static final JfrEvent ThreadPark = create("jdk.ThreadPark", JfrEventFlags.HasDuration);
-    public static final JfrEvent JavaMonitorWait = create("jdk.JavaMonitorWait", JfrEventFlags.HasDuration);
-    public static final JfrEvent JavaMonitorInflate = create("jdk.JavaMonitorInflate", JfrEventFlags.HasDuration);
-    public static final JfrEvent ObjectAllocationInNewTLAB = create("jdk.ObjectAllocationInNewTLAB");
+    public static final JfrEvent JavaMonitorEnter = create("jdk.JavaMonitorEnter", defaultInternalSkipCount, JfrEventFlags.HasDuration);
+    public static final JfrEvent ThreadPark = create("jdk.ThreadPark", defaultInternalSkipCount, JfrEventFlags.HasDuration);
+    public static final JfrEvent JavaMonitorWait = create("jdk.JavaMonitorWait", defaultInternalSkipCount, JfrEventFlags.HasDuration);
+    public static final JfrEvent JavaMonitorInflate = create("jdk.JavaMonitorInflate", defaultInternalSkipCount, JfrEventFlags.HasDuration);
+    public static final JfrEvent ObjectAllocationInNewTLAB = create("jdk.ObjectAllocationInNewTLAB", defaultInternalSkipCount);
     public static final JfrEvent GCHeapSummary = create("jdk.GCHeapSummary");
     public static final JfrEvent ThreadAllocationStatistics = create("jdk.ThreadAllocationStatistics");
-    public static final JfrEvent SystemGC = create("jdk.SystemGC", JfrEventFlags.HasDuration);
-    public static final JfrEvent AllocationRequiringGC = create("jdk.AllocationRequiringGC");
-    public static final JfrEvent OldObjectSample = create("jdk.OldObjectSample");
-    public static final JfrEvent ObjectAllocationSample = create("jdk.ObjectAllocationSample", JfrEventFlags.SupportsThrottling);
+    public static final JfrEvent SystemGC = create("jdk.SystemGC", defaultInternalSkipCount, JfrEventFlags.HasDuration);
+    public static final JfrEvent AllocationRequiringGC = create("jdk.AllocationRequiringGC", defaultInternalSkipCount);
+    public static final JfrEvent OldObjectSample = create("jdk.OldObjectSample", defaultInternalSkipCount);
+    public static final JfrEvent ObjectAllocationSample = create("jdk.ObjectAllocationSample", defaultInternalSkipCount, JfrEventFlags.SupportsThrottling);
     public static final JfrEvent NativeMemoryUsage = create("jdk.NativeMemoryUsage");
     public static final JfrEvent NativeMemoryUsageTotal = create("jdk.NativeMemoryUsageTotal");
 
     private final long id;
     private final String name;
     private final int flags;
+    private final int skipCount;
 
     @Platforms(Platform.HOSTED_ONLY.class)
     public static JfrEvent create(String name, JfrEventFlags... flags) {
-        return new JfrEvent(name, flags);
+        return new JfrEvent(name, 0, flags);
+    }
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    public static JfrEvent create(String name, int skipCount, JfrEventFlags... flags) {
+        return new JfrEvent(name, skipCount, flags);
     }
 
     @Platforms(Platform.HOSTED_ONLY.class)
-    private JfrEvent(String name, JfrEventFlags... flags) {
+    private JfrEvent(String name, int skipCount, JfrEventFlags... flags) {
         this.id = JfrMetadataTypeLibrary.lookupPlatformEvent(name);
         this.name = name;
         this.flags = EnumBitmask.computeBitmask(flags);
+        this.skipCount = skipCount;
     }
 
     @Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
     public long getId() {
         return id;
     }
 
+    @Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
+    public int getSkipCount() {
+        return skipCount;
+    }
+
     @Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
     public String getName() {
         return name;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrManager.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrManager.java
@@ -84,6 +84,7 @@ public static RuntimeSupport.Hook initializationHook() {
     public static RuntimeSupport.Hook startupHook() {
         return isFirstIsolate -> {
             periodicEventSetup();
+
             boolean startRecording = SubstrateOptions.FlightRecorder.getValue() || !SubstrateOptions.StartFlightRecording.getValue().isEmpty();
             if (startRecording) {
                 initRecording();
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/SubstrateJVM.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/SubstrateJVM.java
@@ -293,8 +293,8 @@ public long getStackTraceId(int skipCount) {
     }
 
     @Uninterruptible(reason = "Result is only valid until epoch changes.", callerMustBe = true)
-    public long getStackTraceId(JfrEvent eventType, int skipCount) {
-        return getStackTraceId(eventType.getId(), skipCount);
+    public long getStackTraceId(JfrEvent eventType) {
+        return getStackTraceId(eventType.getId(), eventType.getSkipCount());
     }
 
     /**
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/AllocationRequiringGCEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/AllocationRequiringGCEvent.java
@@ -54,7 +54,7 @@ private static void emit0(UnsignedWord gcId, UnsignedWord size) {
             JfrNativeEventWriter.beginSmallEvent(data, JfrEvent.AllocationRequiringGC);
             JfrNativeEventWriter.putLong(data, JfrTicks.elapsedTicks());
             JfrNativeEventWriter.putEventThread(data);
-            JfrNativeEventWriter.putLong(data, SubstrateJVM.get().getStackTraceId(JfrEvent.AllocationRequiringGC, 0));
+            JfrNativeEventWriter.putLong(data, SubstrateJVM.get().getStackTraceId(JfrEvent.AllocationRequiringGC));
             JfrNativeEventWriter.putLong(data, gcId.rawValue());
             JfrNativeEventWriter.putLong(data, size.rawValue());
             JfrNativeEventWriter.endSmallEvent(data);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorEnterEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorEnterEvent.java
@@ -56,7 +56,7 @@ public static void emit0(Object obj, long previousOwnerTid, long startTicks) {
             JfrNativeEventWriter.putLong(data, startTicks);
             JfrNativeEventWriter.putLong(data, duration);
             JfrNativeEventWriter.putEventThread(data);
-            JfrNativeEventWriter.putLong(data, SubstrateJVM.get().getStackTraceId(JfrEvent.JavaMonitorEnter, 0));
+            JfrNativeEventWriter.putLong(data, SubstrateJVM.get().getStackTraceId(JfrEvent.JavaMonitorEnter));
             JfrNativeEventWriter.putClass(data, obj.getClass());
             JfrNativeEventWriter.putLong(data, previousOwnerTid);
             JfrNativeEventWriter.putLong(data, Word.objectToUntrackedPointer(obj).rawValue());
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorInflateEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorInflateEvent.java
@@ -57,7 +57,7 @@ public static void emit0(Object obj, long startTicks, MonitorInflationCause caus
             JfrNativeEventWriter.putLong(data, startTicks);
             JfrNativeEventWriter.putLong(data, duration);
             JfrNativeEventWriter.putEventThread(data);
-            JfrNativeEventWriter.putLong(data, SubstrateJVM.get().getStackTraceId(JfrEvent.JavaMonitorInflate, 0));
+            JfrNativeEventWriter.putLong(data, SubstrateJVM.get().getStackTraceId(JfrEvent.JavaMonitorInflate));
             JfrNativeEventWriter.putClass(data, obj.getClass());
             JfrNativeEventWriter.putLong(data, Word.objectToUntrackedPointer(obj).rawValue());
             JfrNativeEventWriter.putLong(data, getId(cause));
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorWaitEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorWaitEvent.java
@@ -58,7 +58,7 @@ private static void emit0(long startTicks, Object obj, long notifier, long timeo
             JfrNativeEventWriter.putLong(data, startTicks);
             JfrNativeEventWriter.putLong(data, duration);
             JfrNativeEventWriter.putEventThread(data);
-            JfrNativeEventWriter.putLong(data, SubstrateJVM.get().getStackTraceId(JfrEvent.JavaMonitorWait, 0));
+            JfrNativeEventWriter.putLong(data, SubstrateJVM.get().getStackTraceId(JfrEvent.JavaMonitorWait));
             JfrNativeEventWriter.putClass(data, obj.getClass());
             JfrNativeEventWriter.putLong(data, notifier);
             JfrNativeEventWriter.putLong(data, timeout);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JfrAllocationEvents.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JfrAllocationEvents.java
@@ -68,7 +68,7 @@ private static void emitObjectAllocationInNewTLAB(long startTicks, DynamicHub hu
             JfrNativeEventWriter.beginSmallEvent(data, JfrEvent.ObjectAllocationInNewTLAB);
             JfrNativeEventWriter.putLong(data, startTicks);
             JfrNativeEventWriter.putEventThread(data);
-            JfrNativeEventWriter.putLong(data, SubstrateJVM.get().getStackTraceId(JfrEvent.ObjectAllocationInNewTLAB, 0));
+            JfrNativeEventWriter.putLong(data, SubstrateJVM.get().getStackTraceId(JfrEvent.ObjectAllocationInNewTLAB));
             JfrNativeEventWriter.putClass(data, DynamicHub.toClass(hub));
             JfrNativeEventWriter.putLong(data, allocationSize.rawValue());
             JfrNativeEventWriter.putLong(data, tlabSize.rawValue());
@@ -88,7 +88,7 @@ private static void emitObjectAllocationSample(long startTicks, DynamicHub hub)
             JfrNativeEventWriter.beginSmallEvent(data, JfrEvent.ObjectAllocationSample);
             JfrNativeEventWriter.putLong(data, startTicks);
             JfrNativeEventWriter.putEventThread(data);
-            JfrNativeEventWriter.putLong(data, SubstrateJVM.get().getStackTraceId(JfrEvent.ObjectAllocationSample, 0));
+            JfrNativeEventWriter.putLong(data, SubstrateJVM.get().getStackTraceId(JfrEvent.ObjectAllocationSample));
             JfrNativeEventWriter.putClass(data, DynamicHub.toClass(hub));
             JfrNativeEventWriter.putLong(data, weight);
             JfrNativeEventWriter.endSmallEvent(data);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/SystemGCEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/SystemGCEvent.java
@@ -55,7 +55,7 @@ private static void emit0(long startTicks, boolean invokedConcurrent) {
             JfrNativeEventWriter.putLong(data, startTicks);
             JfrNativeEventWriter.putLong(data, duration);
             JfrNativeEventWriter.putEventThread(data);
-            JfrNativeEventWriter.putLong(data, SubstrateJVM.get().getStackTraceId(JfrEvent.SystemGC, 0));
+            JfrNativeEventWriter.putLong(data, SubstrateJVM.get().getStackTraceId(JfrEvent.SystemGC));
             JfrNativeEventWriter.putBoolean(data, invokedConcurrent);
             JfrNativeEventWriter.endSmallEvent(data);
         }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ThreadParkEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ThreadParkEvent.java
@@ -68,7 +68,7 @@ private static void emit0(long startTicks, Object obj, boolean isAbsolute, long
             JfrNativeEventWriter.putLong(data, startTicks);
             JfrNativeEventWriter.putLong(data, duration);
             JfrNativeEventWriter.putEventThread(data);
-            JfrNativeEventWriter.putLong(data, SubstrateJVM.get().getStackTraceId(JfrEvent.ThreadPark, 0));
+            JfrNativeEventWriter.putLong(data, SubstrateJVM.get().getStackTraceId(JfrEvent.ThreadPark));
             JfrNativeEventWriter.putClass(data, parkedClass);
             JfrNativeEventWriter.putLong(data, timeout);
             JfrNativeEventWriter.putLong(data, until);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ThreadStartEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ThreadStartEvent.java
@@ -45,7 +45,7 @@ public static void emit(Thread thread) {
             JfrNativeEventWriter.beginSmallEvent(data, JfrEvent.ThreadStart);
             JfrNativeEventWriter.putLong(data, JfrTicks.elapsedTicks());
             JfrNativeEventWriter.putEventThread(data);
-            JfrNativeEventWriter.putLong(data, SubstrateJVM.get().getStackTraceId(JfrEvent.ThreadStart, 0));
+            JfrNativeEventWriter.putLong(data, SubstrateJVM.get().getStackTraceId(JfrEvent.ThreadStart));
             JfrNativeEventWriter.putThread(data, thread);
             JfrNativeEventWriter.putLong(data, JavaThreads.getParentThreadId(thread));
             JfrNativeEventWriter.endSmallEvent(data);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/oldobject/JfrOldObjectSampler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/oldobject/JfrOldObjectSampler.java
@@ -148,7 +148,7 @@ private void release(JfrOldObject sample) {
     private void store(Object obj, UnsignedWord span, UnsignedWord allocatedSize, int arrayLength) {
         Thread thread = JavaThreads.getCurrentThreadOrNull();
         long threadId = thread == null ? 0L : JavaThreads.getThreadId(thread);
-        long stackTraceId = thread == null ? 0L : SubstrateJVM.get().getStackTraceId(JfrEvent.OldObjectSample, 0);
+        long stackTraceId = thread == null ? 0L : SubstrateJVM.get().getStackTraceId(JfrEvent.OldObjectSample);
         UnsignedWord heapUsedAfterLastGC = Heap.getHeap().getUsedMemoryAfterLastGC();
 
         JfrOldObject sample = (JfrOldObject) freeList.pop();
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerJfrStackTraceSerializer.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerJfrStackTraceSerializer.java
@@ -38,7 +38,6 @@
 import com.oracle.svm.core.code.CodeInfoTable;
 import com.oracle.svm.core.code.FrameInfoQueryResult;
 import com.oracle.svm.core.code.UntetheredCodeInfo;
-import com.oracle.svm.core.jdk.UninterruptibleUtils;
 import com.oracle.svm.core.jfr.JfrBuffer;
 import com.oracle.svm.core.jfr.JfrFrameType;
 import com.oracle.svm.core.jfr.JfrNativeEventWriter;
@@ -49,7 +48,6 @@
 import com.oracle.svm.core.jfr.SubstrateJVM;
 import com.oracle.svm.core.jfr.events.ExecutionSampleEvent;
 import com.oracle.svm.core.util.VMError;
-import com.oracle.svm.core.VMInspectionOptions;
 
 /**
  * A concrete implementation of {@link SamplerStackTraceSerializer} designed for JFR stack trace
@@ -58,7 +56,6 @@
 public final class SamplerJfrStackTraceSerializer implements SamplerStackTraceSerializer {
     /** This value is used by multiple threads but only by a single thread at a time. */
     private static final CodeInfoDecoder.FrameInfoCursor FRAME_INFO_CURSOR = new CodeInfoDecoder.FrameInfoCursor();
-    private static final String SUBSTRATEVM_PREFIX = "com.oracle.svm";
 
     @Override
     @Uninterruptible(reason = "Prevent JFR recording and epoch change.")
@@ -170,12 +167,8 @@ private static int visitFrame(JfrNativeEventWriterData data, CodeInfo codeInfo,
         int numStackTraceElements = 0;
         FRAME_INFO_CURSOR.initialize(codeInfo, ip, false);
         while (FRAME_INFO_CURSOR.advance()) {
-            FrameInfoQueryResult frame = FRAME_INFO_CURSOR.get();
-            if (VMInspectionOptions.JfrTrimInternalStackTraces.getValue() &&
-                            UninterruptibleUtils.String.startsWith(frame.getSourceClassName(), SUBSTRATEVM_PREFIX)) {
-                continue;
-            }
             if (data.isNonNull()) {
+                FrameInfoQueryResult frame = FRAME_INFO_CURSOR.get();
                 serializeStackTraceElement(data, frame);
             }
             numStackTraceElements++;
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/JfrRecordingTest.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/JfrRecordingTest.java
@@ -31,14 +31,19 @@
 import java.time.Duration;
 import java.util.Collections;
 import java.util.IdentityHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedFrame;
 import org.junit.After;
 
 import jdk.jfr.Configuration;
 import jdk.jfr.Recording;
 
+import static org.junit.Assert.assertTrue;
+
 /** Base class for JFR unit tests. */
 public abstract class JfrRecordingTest extends AbstractJfrTest {
     private final Map<Recording, JfrRecordingState> recordingStates = Collections.synchronizedMap(new IdentityHashMap<>());
@@ -83,6 +88,12 @@ protected Recording prepareRecording(String[] events, Configuration config, Map<
         return recording;
     }
 
+    protected static void checkStackTraceTrimming(RecordedEvent event, String methodName) {
+        List<RecordedFrame> frames = event.getStackTrace().getFrames();
+        assertTrue(frames.size() > 0);
+        assertTrue(frames.getFirst().getMethod().getName().equals(methodName));
+    }
+
     private static Recording createRecording(Configuration config) {
         if (config == null) {
             return new Recording();
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestAllocationRequiringGCEvent.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestAllocationRequiringGCEvent.java
@@ -54,6 +54,9 @@ public void test() throws Throwable {
 
     private static void validateEvents(List<RecordedEvent> events) {
         assertTrue(events.size() > 0);
+        for (RecordedEvent event : events) {
+            checkStackTraceTrimming(event, "emit");
+        }
     }
 
     @NeverInline("Prevent escape analysis.")
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestJavaMonitorEnterEvent.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestJavaMonitorEnterEvent.java
@@ -90,6 +90,8 @@ private void validateEvents(List<RecordedEvent> events) {
                 found = true;
                 break;
             }
+
+            checkStackTraceTrimming(event, "emit");
         }
         assertTrue("Expected monitor blocked event not found", found);
     }
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestJavaMonitorInflateEvent.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestJavaMonitorInflateEvent.java
@@ -90,6 +90,8 @@ private void validateEvents(List<RecordedEvent> events) {
                             (eventThread.equals(firstThread.getName()) || eventThread.equals(secondThread.getName()))) {
                 foundCauseEnter = true;
             }
+
+            checkStackTraceTrimming(event, "emit");
         }
         assertTrue("Expected monitor inflate event not found.", foundCauseEnter);
     }
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestJavaMonitorWaitEvent.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestJavaMonitorWaitEvent.java
@@ -113,6 +113,8 @@ private void validateEvents(List<RecordedEvent> events) {
                 assertEquals("Wrong notifier", notifThread, producerName);
             }
             lastEventThreadName = eventThread;
+
+            checkStackTraceTrimming(event, "emit");
         }
         assertFalse("Wrong number of events: " + prodCount + " " + consCount,
                         abs(prodCount - consCount) > 1 || abs(consCount - COUNT) > 1);
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestJavaMonitorWaitInterruptEvent.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestJavaMonitorWaitInterruptEvent.java
@@ -139,6 +139,8 @@ private void validateEvents(List<RecordedEvent> events) {
                 assertEquals("Notifier of simple wait is incorrect: " + notifThread + " " + simpleNotifyThread.getName(), notifThread, simpleNotifyThread.getName());
                 simpleWaitFound = true;
             }
+
+            checkStackTraceTrimming(event, "emit");
         }
         assertTrue("Couldn't find expected wait events. SimpleWaiter: " + simpleWaitFound + " interrupted: " + interruptedFound,
                         simpleWaitFound && interruptedFound);
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestJavaMonitorWaitNotifyAllEvent.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestJavaMonitorWaitNotifyAllEvent.java
@@ -108,6 +108,7 @@ private void validateEvents(List<RecordedEvent> events) {
                 waitersFound++;
             }
 
+            checkStackTraceTrimming(event, "emit");
         }
         assertTrue("Couldn't find expected wait events. NotifierFound: " + notifierFound + " waitersFound: " + waitersFound,
                         notifierFound && waitersFound == 2);
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestJavaMonitorWaitTimeoutEvent.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestJavaMonitorWaitTimeoutEvent.java
@@ -134,6 +134,7 @@ private void validateEvents(List<RecordedEvent> events) {
                 simpleWaitFound = true;
             }
 
+            checkStackTraceTrimming(event, "emit");
         }
         assertTrue("Couldn't find expected wait events. SimpleWaiter: " + simpleWaitFound + " timeout: " + timeoutFound,
                         simpleWaitFound && timeoutFound);
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestObjectAllocationInNewTLABEvent.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestObjectAllocationInNewTLABEvent.java
@@ -100,6 +100,8 @@ private static void validateEvents(List<RecordedEvent> events) {
             } else if (tlabSize == alignedHeapChunkSize && className.equals(Helper.class.getName())) {
                 foundInstance = true;
             }
+
+            checkStackTraceTrimming(event, "emit");
         }
 
         assertTrue(foundBigCharArray);
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestObjectAllocationSampleEvent.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestObjectAllocationSampleEvent.java
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestSystemGCEvent.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestSystemGCEvent.java
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestThreadParkEvents.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestThreadParkEvents.java
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestThreadStartEvents.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestThreadStartEvents.java
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/oldobject/JfrOldObjectTest.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/oldobject/JfrOldObjectTest.java

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ public Class<?> getSourceClass() {`
`68`	`68`	`return sourceClass;`
`69`	`69`	`}`
`70`	`70`
`71`		`- @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)`
`72`	`71`	`public String getSourceClassName() {`
`73`	`72`	`Class<?> clazz = getSourceClass();`
`74`	`73`	`return (clazz != null) ? clazz.getName() : "";`
Original file line number	Diff line number	Diff line change
`@@ -293,8 +293,8 @@ public long getStackTraceId(int skipCount) {`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`@Uninterruptible(reason = "Result is only valid until epoch changes.", callerMustBe = true)`
`296`		`- public long getStackTraceId(JfrEvent eventType, int skipCount) {`
`297`		`- return getStackTraceId(eventType.getId(), skipCount);`
	`296`	`+ public long getStackTraceId(JfrEvent eventType) {`
	`297`	`+ return getStackTraceId(eventType.getId(), eventType.getSkipCount());`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`/**`