Skip to content

Commit 61fe87f

Browse files
committed
review
1 parent dc49142 commit 61fe87f

File tree

5 files changed

+7
-11
lines changed

5 files changed

+7
-11
lines changed

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/RuntimeMetrics.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ private JfrRuntimeMetrics(OpenTelemetry openTelemetry, Predicate<JfrFeature> fea
101101
recordingStream.onEvent(handler.getEventName(), handler);
102102
});
103103
recordingStream.onMetadata(event -> startUpLatch.countDown());
104-
Thread daemonRunner = new Thread(recordingStream::start, "JFR-Metrics-Runner");
104+
Thread daemonRunner = new Thread(recordingStream::start, "OpenTelemetry JFR-Metrics-Runner");
105105
daemonRunner.setDaemon(true);
106106
daemonRunner.start();
107107
}

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/RuntimeMetricsBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public final class RuntimeMetricsBuilder {
2626
private boolean enableExperimentalJmxTelemetry = false;
2727
private Consumer<Runnable> shutdownHook =
2828
runnable -> {
29-
Runtime.getRuntime().addShutdownHook(new Thread(runnable, "RuntimeMetricsShutdownHook"));
29+
Runtime.getRuntime().addShutdownHook(new Thread(runnable, "OpenTelemetry RuntimeMetricsShutdownHook"));
3030
};
3131

3232
RuntimeMetricsBuilder(OpenTelemetry openTelemetry) {

instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/RuntimeMetrics.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.util.logging.Level;
1515
import java.util.logging.Logger;
1616

17-
/** The entry point class for runtime metrics support using JFR and JMX. */
17+
/** The entry point class for runtime metrics support using JMX. */
1818
public final class RuntimeMetrics implements Closeable {
1919

2020
private static final Logger logger = Logger.getLogger(RuntimeMetrics.class.getName());
@@ -29,7 +29,7 @@ public final class RuntimeMetrics implements Closeable {
2929
/**
3030
* Create and start {@link RuntimeMetrics}.
3131
*
32-
* <p>Listens for select JFR events, extracts data, and records to various metrics. Recording will
32+
* <p>Listens for select JMX beans, extracts data, and records to various metrics. Recording will
3333
* continue until {@link #close()} is called.
3434
*
3535
* @param openTelemetry the {@link OpenTelemetry} instance used to record telemetry
@@ -47,7 +47,7 @@ public static RuntimeMetricsBuilder builder(OpenTelemetry openTelemetry) {
4747
return new RuntimeMetricsBuilder(openTelemetry);
4848
}
4949

50-
/** Stop recording JFR events. */
50+
/** Stop recording JMX metrics. */
5151
@Override
5252
public void close() {
5353
if (!isClosed.compareAndSet(false, true)) {

instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/RuntimeMetricsBuilder.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public final class RuntimeMetricsBuilder {
2020
private boolean enableExperimentalJmxTelemetry = false;
2121
private Consumer<Runnable> shutdownHook =
2222
runnable -> {
23-
Runtime.getRuntime().addShutdownHook(new Thread(runnable, "RuntimeMetricsShutdownHook"));
23+
Runtime.getRuntime().addShutdownHook(new Thread(runnable, "OpenTelemetry RuntimeMetricsShutdownHook"));
2424
};
2525

2626
RuntimeMetricsBuilder(OpenTelemetry openTelemetry) {
@@ -49,10 +49,6 @@ public RuntimeMetricsBuilder setShutdownHook(Consumer<Runnable> shutdownHook) {
4949
}
5050

5151
public void startFromInstrumentationConfig(InstrumentationConfig config) {
52-
/*
53-
By default, don't use any JFR metrics. May change this once semantic conventions are updated.
54-
If enabled, default to only the metrics not already covered by runtime-telemetry-java8
55-
*/
5652
boolean defaultEnabled = config.getBoolean("otel.instrumentation.common.default-enabled", true);
5753
if (!config.getBoolean("otel.instrumentation.runtime-telemetry.enabled", defaultEnabled)) {
5854
// nothing is enabled

smoke-tests-otel-starter/spring-boot-3/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ graalvmNative {
6767
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherConfig")
6868
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.config.InstantiatingConfigurationParameterConverter")
6969

70-
// enable JFR - see https://www.graalvm.org/22.0/reference-manual/native-image/JFR/
70+
// enable JFR - see https://www.graalvm.org/latest/reference-manual/native-image/debugging-and-diagnostics/JFR/
7171
buildArgs.add("--enable-monitoring=jfr")
7272
}
7373

0 commit comments

Comments
 (0)