[GR-61151] Trim internal JFR stacktraces to match OpenJDK

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java

@@ -1145,6 +1145,9 @@ public Boolean getValue(OptionValues values) {
     @Option(help = "file:doc-files/StartFlightRecordingHelp.txt")//
     public static final RuntimeOptionKey<String> StartFlightRecording = new RuntimeOptionKey<>("", Immutable);
 
+    @Option(help = "Determine whether to trim internal frames from JFR stacktraces (defaults to true).")//
+    public static final RuntimeOptionKey<Boolean> JfrTrimInternalStackTraces = new RuntimeOptionKey<>(true);
+
     @Option(help = "file:doc-files/FlightRecorderLoggingHelp.txt")//
     public static final RuntimeOptionKey<String> FlightRecorderLogging = new RuntimeOptionKey<>("all=warning", Immutable);
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameSourceInfo.java

@@ -68,6 +68,7 @@ public Class<?> getSourceClass() {
         return sourceClass;
     }
 
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     public String getSourceClassName() {
         Class<?> clazz = getSourceClass();
         return (clazz != null) ? clazz.getName() : "";

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrManager.java

@@ -84,7 +84,7 @@ public static RuntimeSupport.Hook initializationHook() {
     public static RuntimeSupport.Hook startupHook() {
         return isFirstIsolate -> {
             periodicEventSetup();
-
+            SubstrateJVM.getStackTraceRepo().setTrimInternalStackTraces(SubstrateOptions.JfrTrimInternalStackTraces.getValue());
             boolean startRecording = SubstrateOptions.FlightRecorder.getValue() || !SubstrateOptions.StartFlightRecording.getValue().isEmpty();
             if (startRecording) {
                 initRecording();

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrStackTraceRepository.java

@@ -71,6 +71,7 @@ public class JfrStackTraceRepository implements JfrRepository {
     private final JfrStackTraceEpochData epochData1;
 
     private int stackTraceDepth;
+    private boolean trimInternalStackTraces;
 
     @Platforms(Platform.HOSTED_ONLY.class)
     JfrStackTraceRepository() {
@@ -89,6 +90,15 @@ public int getStackTraceDepth() {
         return stackTraceDepth;
     }
 
+    public void setTrimInternalStackTraces(boolean value) {
+        trimInternalStackTraces = value;
+    }
+
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    public boolean getTrimInternalStackTraces() {
+        return trimInternalStackTraces;
+    }
+
     public void teardown() {
         epochData0.teardown();
         epochData1.teardown();

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerJfrStackTraceSerializer.java

@@ -38,6 +38,7 @@
 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;
@@ -56,6 +57,7 @@
 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.")
@@ -167,8 +169,12 @@ 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 (SubstrateJVM.getStackTraceRepo().getTrimInternalStackTraces() &&
+                            UninterruptibleUtils.String.startsWith(frame.getSourceClassName(), SUBSTRATEVM_PREFIX)) {
+                continue;
+            }
             if (data.isNonNull()) {
-                FrameInfoQueryResult frame = FRAME_INFO_CURSOR.get();
                 serializeStackTraceElement(data, frame);
             }
             numStackTraceElements++;

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/AbstractJfrTest.java

@@ -44,6 +44,7 @@
 import org.graalvm.nativeimage.hosted.RuntimeProxyCreation;
 import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.BeforeClass;
 
 import com.oracle.svm.core.jfr.HasJfrSupport;
@@ -65,6 +66,11 @@ public static void checkForJFR() {
         assumeTrue("skipping JFR tests", !ImageInfo.inImageCode() || HasJfrSupport.get());
     }
 
+    @Before
+    public void disableTrimStacktraces() {
+        SubstrateJVM.getStackTraceRepo().setTrimInternalStackTraces(false);
+    }
+
     @After
     public void deleteTemporaryFiles() throws Throwable {
         if (!isDebuggingEnabled()) {

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestTrimStackTraces.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2025, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2025, Red Hat Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.svm.test.jfr;
+
+import com.oracle.svm.test.jfr.events.StackTraceEvent;
+import com.oracle.svm.core.jfr.SubstrateJVM;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedFrame;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class TestTrimStackTraces extends JfrRecordingTest {
+    @Rule public TestName testName = new TestName();
+
+    @Test
+    public void test() throws Throwable {
+        String[] events = new String[]{StackTraceEvent.class.getName()};
+        SubstrateJVM.getStackTraceRepo().setTrimInternalStackTraces(true);
+        Recording recording = startRecording(events);
+
+        StackTraceEvent event = new StackTraceEvent();
+        event.commit();
+
+        stopRecording(recording, this::validateEvents);
+    }
+
+    private void validateEvents(List<RecordedEvent> events) {
+        assertEquals(1, events.size());
+        RecordedEvent event = events.getFirst();
+        List<RecordedFrame> frames = event.getStackTrace().getFrames();
+        assertTrue(frames.size() > 0);
+        assertFalse(frames.stream().anyMatch(e -> testName.getMethodName().equals(e.getMethod().getName())));
+    }
+}