Skip to content

Commit 2ac36a5

Browse files
lenin-jaganathantraskjoaopgrassi
authored
Rename metric jvm.buffer.memory.usage to jvm.buffer.memory.used (#1265)
Signed-off-by: Lenin Jaganathan<lenin.jaganathan@gmail.com> Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com> Co-authored-by: Joao Grassi <5938087+joaopgrassi@users.noreply.github.com>
1 parent de25ecb commit 2ac36a5

File tree

5 files changed

+42
-7
lines changed

5 files changed

+42
-7
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Use this changelog template to create an entry for release notes.
2+
#
3+
# If your change doesn't affect end users you should instead start
4+
# your pull request title with [chore] or use the "Skip Changelog" label.
5+
6+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
7+
change_type: breaking
8+
9+
# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
10+
component: jvm
11+
12+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
13+
note: "Rename JVM metric `jvm.buffer.memory.usage` to `jvm.buffer.memory.used`"
14+
15+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
16+
# The values here must be integers.
17+
issues: [288]
18+
19+
# (Optional) One or more lines of additional information to render under the primary note.
20+
# These lines will be padded with 2 spaces and then inserted directly into the document.
21+
# Use pipe (|) for multiline entries.
22+
subtext:

docs/runtime/jvm-metrics.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ This document describes semantic conventions for JVM metrics in OpenTelemetry.
3333
- [Metric: `jvm.memory.init`](#metric-jvmmemoryinit)
3434
- [Metric: `jvm.system.cpu.utilization`](#metric-jvmsystemcpuutilization)
3535
- [Metric: `jvm.system.cpu.load_1m`](#metric-jvmsystemcpuload_1m)
36-
- [Metric: `jvm.buffer.memory.usage`](#metric-jvmbuffermemoryusage)
36+
- [Metric: `jvm.buffer.memory.used`](#metric-jvmbuffermemoryused)
3737
- [Metric: `jvm.buffer.memory.limit`](#metric-jvmbuffermemorylimit)
3838
- [Metric: `jvm.buffer.count`](#metric-jvmbuffercount)
3939

@@ -743,12 +743,12 @@ This metric is obtained from [`OperatingSystemMXBean#getSystemLoadAverage()`](ht
743743
<!-- END AUTOGENERATED TEXT -->
744744
<!-- endsemconv -->
745745

746-
### Metric: `jvm.buffer.memory.usage`
746+
### Metric: `jvm.buffer.memory.used`
747747

748748
This metric is [recommended][MetricRecommended].
749749
This metric is obtained from [`BufferPoolMXBean#getMemoryUsed()`](https://docs.oracle.com/javase/8/docs/api/java/lang/management/BufferPoolMXBean.html#getMemoryUsed--).
750750

751-
<!-- semconv metric.jvm.buffer.memory.usage(metric_table) -->
751+
<!-- semconv metric.jvm.buffer.memory.used(metric_table) -->
752752
<!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
753753
<!-- see templates/registry/markdown/snippet.md.j2 -->
754754
<!-- prettier-ignore-start -->
@@ -757,15 +757,15 @@ This metric is obtained from [`BufferPoolMXBean#getMemoryUsed()`](https://docs.o
757757

758758
| Name | Instrument Type | Unit (UCUM) | Description | Stability |
759759
| -------- | --------------- | ----------- | -------------- | --------- |
760-
| `jvm.buffer.memory.usage` | UpDownCounter | `By` | Measure of memory used by buffers. | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
760+
| `jvm.buffer.memory.used` | UpDownCounter | `By` | Measure of memory used by buffers. | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
761761

762762

763763
<!-- markdownlint-restore -->
764764
<!-- prettier-ignore-end -->
765765
<!-- END AUTOGENERATED TEXT -->
766766
<!-- endsemconv -->
767767

768-
<!-- semconv metric.jvm.buffer.memory.usage(full) -->
768+
<!-- semconv metric.jvm.buffer.memory.used(full) -->
769769
<!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
770770
<!-- see templates/registry/markdown/snippet.md.j2 -->
771771
<!-- prettier-ignore-start -->
+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
groups:
2+
- id: metric.jvm.buffer.memory.usage.deprecated
3+
type: metric
4+
metric_name: jvm.buffer.memory.usage
5+
stability: experimental
6+
deprecated: "Replaced by `jvm.buffer.memory.used`."
7+
brief: "Deprecated, use `jvm.buffer.memory.used` instead."
8+
extends: attributes.jvm.buffer
9+
instrument: updowncounter
10+
unit: "By"

model/metrics/jvm-metrics-experimental.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ groups:
4242
- ref: jvm.buffer.pool.name
4343
requirement_level: recommended
4444

45-
- id: metric.jvm.buffer.memory.usage
45+
- id: metric.jvm.buffer.memory.used
4646
type: metric
47-
metric_name: jvm.buffer.memory.usage
47+
metric_name: jvm.buffer.memory.used
4848
stability: experimental
4949
extends: attributes.jvm.buffer
5050
brief: "Measure of memory used by buffers."

schema-next.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ versions:
7070
- process.cpu.time
7171
- process.cpu.utilization
7272
- container.cpu.time
73+
# https://github.com/open-telemetry/semantic-conventions/pull/1265
74+
- rename_metrics:
75+
jvm.buffer.memory.usage: jvm.buffer.memory.used
7376
1.26.0:
7477
metrics:
7578
changes:

0 commit comments

Comments
 (0)