8257424: RecordingStream does not specify the recording name

Reviewed-by: egahlin
This commit is contained in:
Yasumasa Suenaga 2020-12-01 11:17:43 +00:00
parent 60f2ba9a24
commit e0de28c1d3
2 changed files with 61 additions and 0 deletions
src/jdk.jfr/share/classes/jdk/jfr/consumer
test/jdk/jdk/jfr/api/consumer/recordingstream

@ -69,6 +69,7 @@ import jdk.jfr.internal.consumer.JdkJfrConsumer;
public final class RecordingStream implements AutoCloseable, EventStream {
private final Recording recording;
private final Instant creationTime;
private final EventDirectoryStream directoryStream;
/**
@ -86,6 +87,8 @@ public final class RecordingStream implements AutoCloseable, EventStream {
Utils.checkAccessFlightRecorder();
AccessControlContext acc = AccessController.getContext();
this.recording = new Recording();
this.creationTime = Instant.now();
this.recording.setName("Recording Stream: " + creationTime);
try {
PlatformRecording pr = PrivateAccess.getInstance().getPlatformRecording(recording);
this.directoryStream = new EventDirectoryStream(acc, null, SecuritySupport.PRIVILEGED, pr, configurations());

@ -0,0 +1,58 @@
/*
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, NTT DATA.
* 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.api.consumer.recordingstream;
import jdk.jfr.consumer.RecordingStream;
import jdk.test.lib.jfr.EventNames;
/**
* @test
* @bug 8257424
* @summary Tests recording name for RecordingStrream
* @key jfr
* @requires vm.hasJFR
* @library /test/lib
* @run main/othervm jdk.jfr.api.consumer.recordingstream.TestRecordingName
*/
public class TestRecordingName {
public static void main(String... args) throws Exception {
try (RecordingStream r = new RecordingStream()) {
r.enable(EventNames.ActiveRecording);
r.onEvent(e -> {
System.out.println(e);
String name = e.getString("name");
if (name.startsWith("Recording Stream: ")) {
r.close();
return;
}
System.err.println("Recording name not set, was " + name + ", but expected \"Recording Stream: <Instant>\"");
});
r.start();
}
}
}