8239508: JFR: @RemoveFields

Reviewed-by: mgronlun

Author: egahlin

src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedEvent.java

@@ -31,8 +31,8 @@
 
 import jdk.jfr.EventType;
 import jdk.jfr.ValueDescriptor;
-import jdk.jfr.internal.util.Utils;
 import jdk.jfr.internal.consumer.ObjectContext;
+import jdk.jfr.internal.util.ImplicitFields;
 
 /**
  * A recorded event.
@@ -57,7 +57,7 @@ public final class RecordedEvent extends RecordedObject {
      * @return stack trace, or {@code null} if doesn't exist for the event
      */
     public RecordedStackTrace getStackTrace() {
-        return getTyped(Utils.FIELD_STACK_TRACE, RecordedStackTrace.class, null);
+        return getTyped(ImplicitFields.STACK_TRACE, RecordedStackTrace.class, null);
     }
 
     /**
@@ -67,7 +67,7 @@ public RecordedStackTrace getStackTrace() {
      * @return thread, or {@code null} if doesn't exist for the event
      */
     public RecordedThread getThread() {
-        return getTyped(Utils.FIELD_EVENT_THREAD, RecordedThread.class, null);
+        return getTyped(ImplicitFields.EVENT_THREAD, RecordedThread.class, null);
     }
 
     /**

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. 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
@@ -30,7 +30,7 @@
 import jdk.jfr.*;
 
 @Category({ "Java Application", "Statistics" })
-public abstract class AbstractBufferStatisticsEvent extends AbstractJDKEvent {
+public abstract class AbstractBufferStatisticsEvent extends AbstractPeriodicEvent {
 
     protected AbstractBufferStatisticsEvent(BufferPool bufferPool) {
         count = bufferPool.getCount();

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

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. 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 jdk.jfr.events;
+
+import jdk.jfr.internal.RemoveFields;
+
+@RemoveFields({"duration", "eventThread", "stackTrace"})
+abstract class AbstractPeriodicEvent extends AbstractJDKEvent {
+}

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

@@ -32,12 +32,14 @@
 import jdk.jfr.StackTrace;
 import jdk.jfr.Timespan;
 import jdk.jfr.Timestamp;
+import jdk.jfr.internal.RemoveFields;
 import jdk.jfr.internal.Type;
 
 @Name(Type.EVENT_NAME_PREFIX + "ActiveRecording")
 @Label("Flight Recording")
 @Category("Flight Recorder")
 @StackTrace(false)
+@RemoveFields({"duration", "eventThread", "stackTrace"})
 public final class ActiveRecordingEvent extends AbstractJDKEvent {
 
     // The order of these fields must be the same as the parameters in
@@ -79,7 +81,7 @@ public static boolean enabled() {
         return false; // Generated
     }
 
-    public static void commit(long timestamp, long duration, long id, String name,
+    public static void commit(long timestamp, long id, String name,
                               String destination, boolean disk, long maxAge, long flushInterval,
                               long maxSize, long recordingStart, long recordingDuration) {
         // Generated

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates. 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
@@ -29,12 +29,14 @@
 import jdk.jfr.Label;
 import jdk.jfr.Name;
 import jdk.jfr.StackTrace;
+import jdk.jfr.internal.RemoveFields;
 import jdk.jfr.internal.Type;
 
 @Name(Type.EVENT_NAME_PREFIX + "ActiveSetting")
 @Label("Recording Setting")
 @Category("Flight Recorder")
 @StackTrace(false)
+@RemoveFields({"duration", "eventThread", "stackTrace"})
 public final class ActiveSettingEvent extends AbstractJDKEvent {
 
     // The order of these fields must be the same as the parameters in
@@ -49,7 +51,7 @@ public final class ActiveSettingEvent extends AbstractJDKEvent {
     @Label("Setting Value")
     public String value;
 
-    public static void commit(long startTime, long duration, long id, String name, String value) {
+    public static void commit(long startTime, long id, String name, String value) {
         // Generated
     }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, DataDog. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -36,7 +36,7 @@
 @Label("CPU Throttling")
 @Category({"Operating System", "Processor"})
 @Description("Container CPU throttling related information")
-public class ContainerCPUThrottlingEvent extends AbstractJDKEvent {
+public class ContainerCPUThrottlingEvent extends AbstractPeriodicEvent {
   @Label("CPU Elapsed Slices")
   @Description("Number of time-slice periods that have elapsed if a CPU quota has been setup for the container")
   public long cpuElapsedSlices;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, DataDog. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -36,7 +36,7 @@
 @Label("CPU Usage")
 @Category({"Operating System", "Processor"})
 @Description("Container CPU usage related information")
-public class ContainerCPUUsageEvent extends AbstractJDKEvent {
+public class ContainerCPUUsageEvent extends AbstractPeriodicEvent {
   @Label("CPU Time")
   @Description("Aggregate time consumed by all tasks in the container")
   @Timespan

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, DataDog. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -37,7 +37,7 @@
 @Label("Container Configuration")
 @Category({"Operating System"})
 @Description("A set of container specific attributes")
-public final class ContainerConfigurationEvent extends AbstractJDKEvent {
+public final class ContainerConfigurationEvent extends AbstractPeriodicEvent {
     @Label("Container Type")
     @Description("Container type information")
     public String containerType;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, DataDog. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -37,7 +37,7 @@
 @Label("Container IO Usage")
 @Category({"Operating System", "File System"})
 @Description("Container IO usage related information")
-public class ContainerIOUsageEvent extends AbstractJDKEvent {
+public class ContainerIOUsageEvent extends AbstractPeriodicEvent {
 
   @Label("Block IO Request Count")
   @Description("Number of block IO requests to the disk that have been issued by the container")

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, DataDog. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -36,7 +36,7 @@
 @Label("Container Memory Usage")
 @Category({"Operating System", "Memory"})
 @Description("Container memory usage related information")
-public final class ContainerMemoryUsageEvent extends AbstractJDKEvent {
+public final class ContainerMemoryUsageEvent extends AbstractPeriodicEvent {
     @Label("Memory Fail Count")
     @Description("Number of times that user memory requests in the container have exceeded the memory limit")
     public long memoryFailCount;