From 625d14d5dbd95830d7d07319b93e47ac1c33786e Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 26 May 2023 12:26:35 -0700 Subject: [PATCH 1/3] Rename process.runtime.jvm.classes.current_loaded to process.runtime.jvm.classes.count --- CHANGELOG.md | 2 ++ schemas/1.21.0 | 7 ++++++- .../metrics/process-runtime-jvm-metrics.yaml | 14 +++++++------- .../runtime-environment-metrics.md | 10 +++++----- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca6606f864..82a1f650e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -66,3 +66,5 @@ release. ([#3458](https://github.com/open-telemetry/opentelemetry-specification/pull/3458)) - Specify the value range for JVM CPU metrics. ([#13](https://github.com/open-telemetry/semantic-conventions/pull/13)) +- Rename `process.runtime.jvm.classes.current_loaded` to `process.runtime.jvm.classes.count`. + ([#60](https://github.com/open-telemetry/semantic-conventions/pull/60)) diff --git a/schemas/1.21.0 b/schemas/1.21.0 index 7831021ee0..1a5140ea40 100644 --- a/schemas/1.21.0 +++ b/schemas/1.21.0 @@ -44,7 +44,12 @@ versions: http.scheme: url.scheme http.url: url.full http.request_content_length: http.request.body.size - http.response_content_length: http.response.body.size + http.response_content_length: http.response.body.size + metrics: + changes: + # https://github.com/open-telemetry/semantic-conventions/pull/60 + - rename_metrics: + process.runtime.jvm.classes.current_loaded: process.runtime.jvm.classes.count 1.20.0: spans: changes: diff --git a/semantic_conventions/metrics/process-runtime-jvm-metrics.yaml b/semantic_conventions/metrics/process-runtime-jvm-metrics.yaml index fd2aa5d353..0b597da325 100644 --- a/semantic_conventions/metrics/process-runtime-jvm-metrics.yaml +++ b/semantic_conventions/metrics/process-runtime-jvm-metrics.yaml @@ -101,6 +101,13 @@ groups: type: boolean requirement_level: recommended + - id: metric.process.runtime.jvm.classes.count + type: metric + metric_name: process.runtime.jvm.classes.count + brief: "Number of classes currently loaded." + instrument: updowncounter + unit: "{class}" + - id: metric.process.runtime.jvm.classes.loaded type: metric metric_name: process.runtime.jvm.classes.loaded @@ -115,13 +122,6 @@ groups: instrument: counter unit: "{class}" - - id: metric.process.runtime.jvm.classes.current_loaded - type: metric - metric_name: process.runtime.jvm.classes.current_loaded - brief: "Number of classes currently loaded." - instrument: updowncounter - unit: "{class}" - - id: metric.process.runtime.jvm.cpu.utilization type: metric metric_name: process.runtime.jvm.cpu.utilization diff --git a/specification/metrics/semantic_conventions/runtime-environment-metrics.md b/specification/metrics/semantic_conventions/runtime-environment-metrics.md index bd5e2dc970..5e5b0a01c7 100644 --- a/specification/metrics/semantic_conventions/runtime-environment-metrics.md +++ b/specification/metrics/semantic_conventions/runtime-environment-metrics.md @@ -29,7 +29,7 @@ semantic conventions when instrumenting runtime environments. * [Metric: `process.runtime.jvm.threads.count`](#metric-processruntimejvmthreadscount) * [Metric: `process.runtime.jvm.classes.loaded`](#metric-processruntimejvmclassesloaded) * [Metric: `process.runtime.jvm.classes.unloaded`](#metric-processruntimejvmclassesunloaded) - * [Metric: `process.runtime.jvm.classes.current_loaded`](#metric-processruntimejvmclassescurrent_loaded) + * [Metric: `process.runtime.jvm.classes.count`](#metric-processruntimejvmclassescount) * [Metric: `process.runtime.jvm.cpu.utilization`](#metric-processruntimejvmcpuutilization) * [Metric: `process.runtime.jvm.system.cpu.utilization`](#metric-processruntimejvmsystemcpuutilization) * [Metric: `process.runtime.jvm.system.cpu.load_1m`](#metric-processruntimejvmsystemcpuload_1m) @@ -283,18 +283,18 @@ This metric is obtained from [`ClassLoadingMXBean#getUnloadedClassCount()`](http -### Metric: `process.runtime.jvm.classes.current_loaded` +### Metric: `process.runtime.jvm.classes.count` This metric is [recommended][MetricRecommended]. This metric is obtained from [`ClassLoadingMXBean#getLoadedClassCount()`](https://docs.oracle.com/javase/8/docs/api/java/lang/management/ClassLoadingMXBean.html#getLoadedClassCount--). - + | Name | Instrument Type | Unit (UCUM) | Description | | -------- | --------------- | ----------- | -------------- | -| `process.runtime.jvm.classes.current_loaded` | UpDownCounter | `{class}` | Number of classes currently loaded. | +| `process.runtime.jvm.classes.count` | UpDownCounter | `{class}` | Number of classes currently loaded. | - + ### Metric: `process.runtime.jvm.cpu.utilization` From a0663abde9023e25b17c9f29dde8f07ad0706fdd Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sun, 13 Aug 2023 16:46:48 -0700 Subject: [PATCH 2/3] fix --- schema-next.yaml | 3 ++- schemas/1.21.0 | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/schema-next.yaml b/schema-next.yaml index 612200a0bc..9c9b86a4e6 100644 --- a/schema-next.yaml +++ b/schema-next.yaml @@ -18,7 +18,8 @@ versions: process.runtime.jvm.threads.count: jvm.threads.count process.runtime.jvm.classes.loaded: jvm.classes.loaded process.runtime.jvm.classes.unloaded: jvm.classes.unloaded - process.runtime.jvm.classes.current_loaded: jvm.classes.current_loaded + # https://github.com/open-telemetry/semantic-conventions/pull/60 + process.runtime.jvm.classes.current_loaded: jvm.classes.count process.runtime.jvm.cpu.time: jvm.cpu.time process.runtime.jvm.cpu.recent_utilization: jvm.cpu.recent_utilization process.runtime.jvm.memory.init: jvm.memory.init diff --git a/schemas/1.21.0 b/schemas/1.21.0 index c2041ada06..f458225c5c 100644 --- a/schemas/1.21.0 +++ b/schemas/1.21.0 @@ -50,9 +50,6 @@ versions: # https://github.com/open-telemetry/semantic-conventions/pull/53 - rename_metrics: process.runtime.jvm.cpu.utilization: process.runtime.jvm.cpu.recent_utilization - # https://github.com/open-telemetry/semantic-conventions/pull/60 - - rename_metrics: - process.runtime.jvm.classes.current_loaded: process.runtime.jvm.classes.count 1.20.0: spans: changes: From cdc7206fd8ce83489496def53f37077fa9427de6 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sun, 13 Aug 2023 16:48:05 -0700 Subject: [PATCH 3/3] fix --- CHANGELOG.md | 2 ++ docs/system/runtime-environment-metrics.md | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9089400e69..6114ce8871 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,8 @@ release. clients invoking them. - BREAKING: Rename all JVM metrics from `process.runtime.jvm.*` to `jvm.*` ([#241](https://github.com/open-telemetry/semantic-conventions/pull/241)) +- BREAKING: Rename `jvm.classes.current_loaded` metrics to `jvm.classes.count` + ([#60](https://github.com/open-telemetry/semantic-conventions/pull/60)) ## v1.21.0 (2023-07-13) diff --git a/docs/system/runtime-environment-metrics.md b/docs/system/runtime-environment-metrics.md index ec615df0c7..294807818d 100644 --- a/docs/system/runtime-environment-metrics.md +++ b/docs/system/runtime-environment-metrics.md @@ -265,9 +265,9 @@ This metric is [recommended][MetricRecommended]. This metric is obtained from [`ClassLoadingMXBean#getLoadedClassCount()`](https://docs.oracle.com/javase/8/docs/api/java/lang/management/ClassLoadingMXBean.html#getLoadedClassCount--). -| Name | Instrument Type | Unit (UCUM) | Description | -|------------------------------| --------------- | ----------- | -------------- | -| `jvm.classes.count` | UpDownCounter | `{class}` | Number of classes currently loaded. | +| Name | Instrument Type | Unit (UCUM) | Description | +| -------- | --------------- | ----------- | -------------- | +| `jvm.classes.count` | UpDownCounter | `{class}` | Number of classes currently loaded. |