8367948: JFR: MethodTrace threshold setting has no effect

Reviewed-by: shade

Author: egahlin

src/jdk.jfr/share/classes/jdk/jfr/events/MethodTraceEvent.java

@@ -49,7 +49,7 @@ public static long timestamp() {
         return 0;
     }
 
-    public static boolean enabled() {
+    public static boolean shouldCommit(long duration) {
         // Generated by JFR
         return false;
     }

src/jdk.jfr/share/classes/jdk/jfr/tracing/MethodTracer.java

@@ -50,7 +50,7 @@ public static long timestamp() {
     public static void traceObjectInit(long startTime, long methodId) {
         long endTime = JVM.counterTime();
         long duration = endTime - startTime;
-        if (MethodTraceEvent.enabled() && JVM.getEventWriter() != null) {
+        if (MethodTraceEvent.shouldCommit(duration) && JVM.getEventWriter() != null) {
             MethodTraceEvent.commit(startTime, duration, methodId);
         }
     }
@@ -66,7 +66,7 @@ public static void timingObjectInit(long startTime, long methodId) {
     public static void traceTimingObjectInit(long startTime, long methodId) {
         long endTime = JVM.counterTime();
         long duration = endTime - startTime;
-        if (MethodTraceEvent.enabled() && JVM.getEventWriter() != null) {
+        if (MethodTraceEvent.shouldCommit(duration) && JVM.getEventWriter() != null) {
             MethodTraceEvent.commit(startTime, duration, methodId);
         }
         if (MethodTimingEvent.enabled()) {
@@ -77,7 +77,7 @@ public static void traceTimingObjectInit(long startTime, long methodId) {
     public static void trace(long startTime, long methodId) {
         long endTime = JVM.counterTime();
         long duration = endTime - startTime;
-        if (MethodTraceEvent.enabled()) {
+        if (MethodTraceEvent.shouldCommit(duration)) {
             MethodTraceEvent.commit(startTime, duration, methodId);
         }
     }
@@ -96,7 +96,7 @@ public static void traceTiming(long startTime, long methodId) {
         if (MethodTimingEvent.enabled()) {
             PlatformTracer.addTiming(methodId, duration);
         }
-        if (MethodTraceEvent.enabled()) {
+        if (MethodTraceEvent.shouldCommit(duration)) {
             MethodTraceEvent.commit(startTime, duration, methodId);
         }
     }

test/jdk/jdk/jfr/event/tracing/TestMethodTrace.java

@@ -22,14 +22,18 @@
  */
 package jdk.jfr.event.tracing;
 
+import java.time.Duration;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
 import jdk.jfr.Event;
 import jdk.jfr.StackTrace;
 import jdk.jfr.consumer.RecordedEvent;
 import jdk.jfr.consumer.RecordedMethod;
 import jdk.jfr.consumer.RecordingStream;
+import jdk.jfr.Recording;
 
+import jdk.test.lib.jfr.Events;
 /**
  * @test
  * @summary Basic test of the MethodTrace event.
@@ -52,6 +56,31 @@ private static class InnerMeasurement extends Event {
     }
 
     public static void main(String... args) throws Exception {
+        testWithoutThreshold();
+        testWithThreshold();
+    }
+
+    private static void testWithThreshold() throws Exception {
+        try (Recording r = new Recording()) {
+            r.enable(EVENT_NAME)
+             .with("filter", CLASS_NAME + "::printHello")
+             .withThreshold(Duration.ofHours(1));
+            r.start();
+            printHello();
+            r.stop();
+            List<RecordedEvent> events = Events.fromRecording(r);
+            if (!events.isEmpty()) {
+                System.out.println(events);
+                throw new Exception("Unexpected MethodTrace event");
+            }
+        }
+    }
+
+    public static void printHello() {
+        System.out.println("Hello!");
+    }
+
+    private static void testWithoutThreshold() throws Exception {
         AtomicReference<RecordedEvent> o = new AtomicReference<>();
         AtomicReference<RecordedEvent> i = new AtomicReference<>();
         AtomicReference<RecordedEvent> e = new AtomicReference<>();