infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-23 00:35:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

8364667: JFR: Throttle doesn't work with dynamic events

Browse Source 
Reviewed-by: mgronlun
This commit is contained in:
Erik Gahlin 2025-08-05 14:33:30 +00:00
parent ba0ae4cb28
commit 8a571ee7f2
3 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/jdk.jfr/share/classes/jdk/jfr/internal/ClassInspector.java
View File

@ -140,7 +140,7 @@ final class ClassInspector {
return true;
}
boolean isThrottled() {
boolean isThrottled(MethodDesc staticThrottleMethod) {
String result = annotationValue(ANNOTATION_THROTTLE, String.class, "off");
if (result != null) {
return true;
@ -151,6 +151,9 @@ final class ClassInspector {
return true;
}
}
if (isJDK()) {
return hasStaticMethod(staticThrottleMethod);
}
return false;
}

6
src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java
View File

@ -124,11 +124,7 @@ public final class EventInstrumentation {
this.eventClassDesc = inspector.getClassDesc();
this.staticCommitMethod = inspector.findStaticCommitMethod();
this.untypedEventConfiguration = hasUntypedConfiguration();
if (inspector.isJDK()) {
this.throttled = inspector.hasStaticMethod(METHOD_EVENT_SHOULD_THROTTLE_COMMIT_LONG_LONG);
} else {
this.throttled = inspector.isThrottled();
}
this.throttled = inspector.isThrottled(METHOD_EVENT_SHOULD_THROTTLE_COMMIT_LONG_LONG);
}
byte[] buildInstrumented() {

43
test/jdk/jdk/jfr/api/metadata/annotations/TestThrottle.java
View File

@ -29,11 +29,17 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicInteger;
import jdk.jfr.AnnotationElement;
import jdk.jfr.Enabled;
import jdk.jfr.Event;
import jdk.jfr.EventFactory;
import jdk.jfr.Name;
import jdk.jfr.Recording;
import jdk.jfr.SettingControl;
import jdk.jfr.SettingDefinition;
@ -132,6 +138,7 @@ public class TestThrottle {
testThrottleThresholded();
testThrottleNormalRate();
testThrottleUserdefined();
testThrottleDynamic();
}
private static void testUnthrottled() throws Exception {
@ -232,6 +239,40 @@ public class TestThrottle {
}
}
private static void testThrottleDynamic() throws Exception {
List<AnnotationElement> offAnnotations = new ArrayList<>();
offAnnotations.add(new AnnotationElement(Name.class, "DynamicZero"));
offAnnotations.add(new AnnotationElement(Throttle.class, "0/s"));
EventFactory offFactory = EventFactory.create(offAnnotations, List.of());
List<AnnotationElement> highRateAnnotations = new ArrayList<>();
highRateAnnotations.add(new AnnotationElement(Name.class, "DynamicHighRate"));
highRateAnnotations.add(new AnnotationElement(Throttle.class, "1000/s"));
EventFactory highRateFactory = EventFactory.create(highRateAnnotations, List.of());
List<RecordedEvent> events = new CopyOnWriteArrayList<>();
try (RecordingStream r = new RecordingStream()) {
r.enable("DynamicZero");
r.enable("DynamicHighRate");
r.onEvent(events::add);
r.startAsync();
Event offEvent = offFactory.newEvent();
offEvent.commit();
Event highRateEvent = highRateFactory.newEvent();
highRateEvent.begin();
highRateEvent.commit();
r.stop();
if (events.size() != 1) {
System.out.println(events);
throw new Exception("Expected one dynamic event");
}
if (!events.get(0).getEventType().getName().equals("DynamicHighRate")) {
System.out.println(events);
throw new Exception("Expected DynamicHighRate");
}
}
}
@SuppressWarnings("unchecked")
private static void testEvent(Class<? extends Event> eventClass, boolean shouldCommit) throws Exception {
try (Recording r = new Recording()) {
@ -272,6 +313,8 @@ public class TestThrottle {
}
if (shouldCommit) {
assertEvents(r, eventClass.getName(), 17 + 50 + 11);
} else {
assertEvents(r, eventClass.getName(), 0);
}
}
}