open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix semconv naming for 'jvm.buffer.memory.used' metric (#13374)

This commit is contained in:
SylvainJuge 2025-02-25 09:23:04 +01:00 committed by GitHub
parent 4c7a2fab9f
commit d13058a2af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instrumentation/runtime-telemetry/runtime-telemetry-java17/library/README.md
View File

@ -37,7 +37,7 @@ default, and the telemetry each produces:
| JfrFeature | Default Enabled | Metrics | | 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` | | CLASS_LOAD_METRICS | `false` | `jvm.class.count`, `jvm.class.loaded`, `jvm.class.unloaded` |
| CONTEXT_SWITCH_METRICS | `true` | `jvm.cpu.context_switch` | | CONTEXT_SWITCH_METRICS | `true` | `jvm.cpu.context_switch` |
| CPU_COUNT_METRICS | `true` | `jvm.cpu.limit` | | CPU_COUNT_METRICS | `true` | `jvm.cpu.limit` |

2
instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/buffer/DirectBufferStatisticsHandler.java
View File

@ -22,7 +22,7 @@ import jdk.jfr.consumer.RecordedEvent;
* any time. * any time.
*/ */
public final class DirectBufferStatisticsHandler implements RecordedEventHandler { 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_LIMIT = "jvm.buffer.memory.limit";
private static final String METRIC_NAME_COUNT = "jvm.buffer.count"; private static final String METRIC_NAME_COUNT = "jvm.buffer.count";
private static final String METRIC_DESCRIPTION_USAGE = "Measure of memory used by buffers."; private static final String METRIC_DESCRIPTION_USAGE = "Measure of memory used by buffers.";

2
instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java17/BufferMetricTest.java
View File

@ -72,7 +72,7 @@ class BufferMetricTest {
}))), }))),
metric -> metric ->
metric metric
.hasName("jvm.buffer.memory.usage") .hasName("jvm.buffer.memory.used")
.hasDescription("Measure of memory used by buffers.") .hasDescription("Measure of memory used by buffers.")
.hasUnit(BYTES) .hasUnit(BYTES)
.hasLongSumSatisfying( .hasLongSumSatisfying(

2
instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/internal/ExperimentalBufferPools.java
View File

@ -45,7 +45,7 @@ public final class ExperimentalBufferPools {
Meter meter = JmxRuntimeMetricsUtil.getMeter(openTelemetry); Meter meter = JmxRuntimeMetricsUtil.getMeter(openTelemetry);
observables.add( observables.add(
meter meter
.upDownCounterBuilder("jvm.buffer.memory.usage") .upDownCounterBuilder("jvm.buffer.memory.used")
.setDescription("Measure of memory used by buffers.") .setDescription("Measure of memory used by buffers.")
.setUnit("By") .setUnit("By")
.buildWithCallback(callback(bufferBeans, BufferPoolMXBean::getMemoryUsed))); .buildWithCallback(callback(bufferBeans, BufferPoolMXBean::getMemoryUsed)));

2
instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java8/internal/ExperimentalBufferPoolsTest.java
View File

@ -56,7 +56,7 @@ class ExperimentalBufferPoolsTest {
testing.waitAndAssertMetrics( testing.waitAndAssertMetrics(
"io.opentelemetry.runtime-telemetry-java8", "io.opentelemetry.runtime-telemetry-java8",
"jvm.buffer.memory.usage", "jvm.buffer.memory.used",
metrics -> metrics ->
metrics.anySatisfy( metrics.anySatisfy(
metricData -> metricData ->

2
smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java
View File

@ -224,7 +224,7 @@ class AbstractOtelSpringStarterSmokeTest extends AbstractSpringStarterSmokeTest
boolean noNative = System.getProperty("org.graalvm.nativeimage.imagecode") == null; boolean noNative = System.getProperty("org.graalvm.nativeimage.imagecode") == null;
if (noNative) { if (noNative) {
// GraalVM native image does not support buffer pools - have to investigate why // 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( jmxMetrics.forEach(
metricName -> metricName ->