Skip to content

jfr-connection: jfr-connection: wrong parameter sent to JFR DiagnosticCommand #1492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Oct 16, 2024
Merged

jfr-connection: jfr-connection: wrong parameter sent to JFR DiagnosticCommand #1492

Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f555024
Recording close should not throw exception
Aug 13, 2024
9ba3b74
Merge branch 'main' of github.com:dsgrieve/opentelemetry-java-contrib
Oct 10, 2024
bbd8832
Fix for #1491
Oct 10, 2024
421c00b
use JFR.check to determine recording id parameter
Oct 11, 2024
40c764f
fix formatting
Oct 11, 2024
cc9265f
use jfrCheck to find correct jfrDump parameter
Oct 14, 2024
dc92f02
address comments from PR 1492
Oct 15, 2024
1facf59
add end-to-end diagnostic command test
Oct 15, 2024
5df9c10
Merge branch 'open-telemetry:main' into main
dsgrieve Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions ...va/io/opentelemetry/contrib/jfr/connection/FlightRecorderDiagnosticCommandConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,21 +123,22 @@ public long startRecording(
Object[] params = formOptions(recordingOptions, recordingConfiguration);

// jfrStart returns "Started recording 2." and some more stuff, but all we care about is the
// name of the recording.
// id of the recording.
String jfrStart;
try {
String jfrStart =
(String) mBeanServerConnection.invoke(objectName, "jfrStart", params, signature);
String name;
jfrStart = (String) mBeanServerConnection.invoke(objectName, "jfrStart", params, signature);
Matcher matcher = JFR_START_PATTERN.matcher(jfrStart);
if (matcher.find()) {
name = matcher.group(1);
return Long.parseLong(name);
String id = matcher.group(1);
return Long.parseLong(id);
}
} catch (InstanceNotFoundException | ReflectionException | MBeanException e) {
throw JfrConnectionException.canonicalJfrConnectionException(getClass(), "startRecording", e);
}
throw JfrConnectionException.canonicalJfrConnectionException(
getClass(), "startRecording", new IllegalStateException("Failed to parse jfrStart output"));
getClass(),
"startRecording",
new IllegalStateException("Failed to parse: '" + jfrStart + "'"));
}

private static Object[] formOptions(
Expand All @@ -159,7 +160,7 @@ private static Object[] formOptions(
@Override
public void stopRecording(long id) throws JfrConnectionException {
try {
Object[] params = mkParams("name=" + id);
Object[] params = mkParams("recording=" + id);
mBeanServerConnection.invoke(objectName, "jfrStop", params, signature);
} catch (InstanceNotFoundException | MBeanException | ReflectionException | IOException e) {
throw JfrConnectionException.canonicalJfrConnectionException(getClass(), "stopRecording", e);
Expand All @@ -169,7 +170,7 @@ public void stopRecording(long id) throws JfrConnectionException {
@Override
public void dumpRecording(long id, String outputFile) throws IOException, JfrConnectionException {
try {
Object[] params = mkParams("filename=" + outputFile, "name=" + id);
Object[] params = mkParams("filename=" + outputFile, "recording=" + id);
mBeanServerConnection.invoke(objectName, "jfrDump", params, signature);
} catch (InstanceNotFoundException | MBeanException | ReflectionException e) {
throw JfrConnectionException.canonicalJfrConnectionException(getClass(), "dumpRecording", e);
Expand Down
Loading