diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/README.md b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/README.md index 48e144d1209a..d77fe5b14b4f 100644 --- a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/README.md +++ b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/README.md @@ -37,7 +37,7 @@ default, and the telemetry each produces: | JfrFeature | Default Enabled | Metrics | |---------------------------|-----------------|-------------------------------------------------------------------------------------------------------------------| -| BUFFER_METRICS | `false` | `jvm.buffer.count`, `jvm.buffer.memory.limit`, `jvm.buffer.memory.usage` | +| BUFFER_METRICS | `false` | `jvm.buffer.count`, `jvm.buffer.memory.limit`, `jvm.buffer.memory.used` | | CLASS_LOAD_METRICS | `false` | `jvm.class.count`, `jvm.class.loaded`, `jvm.class.unloaded` | | CONTEXT_SWITCH_METRICS | `true` | `jvm.cpu.context_switch` | | CPU_COUNT_METRICS | `true` | `jvm.cpu.limit` | diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/buffer/DirectBufferStatisticsHandler.java b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/buffer/DirectBufferStatisticsHandler.java index fa2ad512cc46..2f9ed50b2c26 100644 --- a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/buffer/DirectBufferStatisticsHandler.java +++ b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/buffer/DirectBufferStatisticsHandler.java @@ -22,7 +22,7 @@ * any time. */ public final class DirectBufferStatisticsHandler implements RecordedEventHandler { - private static final String METRIC_NAME_USAGE = "jvm.buffer.memory.usage"; + private static final String METRIC_NAME_USAGE = "jvm.buffer.memory.used"; private static final String METRIC_NAME_LIMIT = "jvm.buffer.memory.limit"; private static final String METRIC_NAME_COUNT = "jvm.buffer.count"; private static final String METRIC_DESCRIPTION_USAGE = "Measure of memory used by buffers."; diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java17/BufferMetricTest.java b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java17/BufferMetricTest.java index c794891ecb06..8c525ca7ee16 100644 --- a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java17/BufferMetricTest.java +++ b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java17/BufferMetricTest.java @@ -72,7 +72,7 @@ void shouldHaveJfrLoadedClassesCountEvents() { }))), metric -> metric - .hasName("jvm.buffer.memory.usage") + .hasName("jvm.buffer.memory.used") .hasDescription("Measure of memory used by buffers.") .hasUnit(BYTES) .hasLongSumSatisfying( diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/internal/ExperimentalBufferPools.java b/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/internal/ExperimentalBufferPools.java index ccb5b001721b..94fb5a3546c7 100644 --- a/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/internal/ExperimentalBufferPools.java +++ b/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/internal/ExperimentalBufferPools.java @@ -45,7 +45,7 @@ static List registerObservers( Meter meter = JmxRuntimeMetricsUtil.getMeter(openTelemetry); observables.add( meter - .upDownCounterBuilder("jvm.buffer.memory.usage") + .upDownCounterBuilder("jvm.buffer.memory.used") .setDescription("Measure of memory used by buffers.") .setUnit("By") .buildWithCallback(callback(bufferBeans, BufferPoolMXBean::getMemoryUsed))); diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java8/internal/ExperimentalBufferPoolsTest.java b/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java8/internal/ExperimentalBufferPoolsTest.java index 346c784c6f8b..210992d60f4a 100644 --- a/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java8/internal/ExperimentalBufferPoolsTest.java +++ b/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java8/internal/ExperimentalBufferPoolsTest.java @@ -56,7 +56,7 @@ void registerObservers() { testing.waitAndAssertMetrics( "io.opentelemetry.runtime-telemetry-java8", - "jvm.buffer.memory.usage", + "jvm.buffer.memory.used", metrics -> metrics.anySatisfy( metricData -> diff --git a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java index e4a85eb343f0..c60ad29aeacb 100644 --- a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java +++ b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java @@ -224,7 +224,7 @@ void shouldSendTelemetry() { boolean noNative = System.getProperty("org.graalvm.nativeimage.imagecode") == null; if (noNative) { // GraalVM native image does not support buffer pools - have to investigate why - jmxMetrics.add("jvm.buffer.memory.usage"); + jmxMetrics.add("jvm.buffer.memory.used"); } jmxMetrics.forEach( metricName ->