Skip to content

Commit e802708

Browse files
SylvainJugekcsurapaneni
authored andcommitted
fix semconv naming for 'jvm.buffer.memory.used' metric (open-telemetry#13374)
1 parent bf3fe1f commit e802708

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ default, and the telemetry each produces:
3737

3838
| JfrFeature | Default Enabled | Metrics |
3939
|---------------------------|-----------------|-------------------------------------------------------------------------------------------------------------------|
40-
| BUFFER_METRICS | `false` | `jvm.buffer.count`, `jvm.buffer.memory.limit`, `jvm.buffer.memory.usage` |
40+
| BUFFER_METRICS | `false` | `jvm.buffer.count`, `jvm.buffer.memory.limit`, `jvm.buffer.memory.used` |
4141
| CLASS_LOAD_METRICS | `false` | `jvm.class.count`, `jvm.class.loaded`, `jvm.class.unloaded` |
4242
| CONTEXT_SWITCH_METRICS | `true` | `jvm.cpu.context_switch` |
4343
| CPU_COUNT_METRICS | `true` | `jvm.cpu.limit` |

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* any time.
2323
*/
2424
public final class DirectBufferStatisticsHandler implements RecordedEventHandler {
25-
private static final String METRIC_NAME_USAGE = "jvm.buffer.memory.usage";
25+
private static final String METRIC_NAME_USAGE = "jvm.buffer.memory.used";
2626
private static final String METRIC_NAME_LIMIT = "jvm.buffer.memory.limit";
2727
private static final String METRIC_NAME_COUNT = "jvm.buffer.count";
2828
private static final String METRIC_DESCRIPTION_USAGE = "Measure of memory used by buffers.";

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void shouldHaveJfrLoadedClassesCountEvents() {
7272
}))),
7373
metric ->
7474
metric
75-
.hasName("jvm.buffer.memory.usage")
75+
.hasName("jvm.buffer.memory.used")
7676
.hasDescription("Measure of memory used by buffers.")
7777
.hasUnit(BYTES)
7878
.hasLongSumSatisfying(

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static List<AutoCloseable> registerObservers(
4545
Meter meter = JmxRuntimeMetricsUtil.getMeter(openTelemetry);
4646
observables.add(
4747
meter
48-
.upDownCounterBuilder("jvm.buffer.memory.usage")
48+
.upDownCounterBuilder("jvm.buffer.memory.used")
4949
.setDescription("Measure of memory used by buffers.")
5050
.setUnit("By")
5151
.buildWithCallback(callback(bufferBeans, BufferPoolMXBean::getMemoryUsed)));

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void registerObservers() {
5656

5757
testing.waitAndAssertMetrics(
5858
"io.opentelemetry.runtime-telemetry-java8",
59-
"jvm.buffer.memory.usage",
59+
"jvm.buffer.memory.used",
6060
metrics ->
6161
metrics.anySatisfy(
6262
metricData ->

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ void shouldSendTelemetry() {
224224
boolean noNative = System.getProperty("org.graalvm.nativeimage.imagecode") == null;
225225
if (noNative) {
226226
// GraalVM native image does not support buffer pools - have to investigate why
227-
jmxMetrics.add("jvm.buffer.memory.usage");
227+
jmxMetrics.add("jvm.buffer.memory.used");
228228
}
229229
jmxMetrics.forEach(
230230
metricName ->

0 commit comments

Comments
 (0)