Merge remote-tracking branch 'upstream/main' into rename-classes-curr…

…ent-loaded

docs/system/runtime-environment-metrics.md

@@ -20,17 +20,17 @@ semantic conventions when instrumenting runtime environments.
   * [Runtime Environment Specific Metrics - `process.runtime.{environment}.`](#runtime-environment-specific-metrics---processruntimeenvironment)
 - [Attributes](#attributes)
 - [JVM Metrics](#jvm-metrics)
-  * [Metric: `process.runtime.jvm.memory.usage`](#metric-processruntimejvmmemoryusage)
-  * [Metric: `process.runtime.jvm.memory.committed`](#metric-processruntimejvmmemorycommitted)
-  * [Metric: `process.runtime.jvm.memory.limit`](#metric-processruntimejvmmemorylimit)
-  * [Metric: `process.runtime.jvm.memory.usage_after_last_gc`](#metric-processruntimejvmmemoryusage_after_last_gc)
-  * [Metric: `process.runtime.jvm.gc.duration`](#metric-processruntimejvmgcduration)
-  * [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.count`](#metric-processruntimejvmclassescount)
-  * [Metric: `process.runtime.jvm.cpu.time`](#metric-processruntimejvmcputime)
-  * [Metric: `process.runtime.jvm.cpu.recent_utilization`](#metric-processruntimejvmcpurecent_utilization)
+  * [Metric: `jvm.memory.usage`](#metric-jvmmemoryusage)
+  * [Metric: `jvm.memory.committed`](#metric-jvmmemorycommitted)
+  * [Metric: `jvm.memory.limit`](#metric-jvmmemorylimit)
+  * [Metric: `jvm.memory.usage_after_last_gc`](#metric-jvmmemoryusage_after_last_gc)
+  * [Metric: `jvm.gc.duration`](#metric-jvmgcduration)
+  * [Metric: `jvm.threads.count`](#metric-jvmthreadscount)
+  * [Metric: `jvm.classes.loaded`](#metric-jvmclassesloaded)
+  * [Metric: `jvm.classes.unloaded`](#metric-jvmclassesunloaded)
+  * [Metric: `jvm.classes.count`](#metric-jvmclassescount)
+  * [Metric: `jvm.cpu.time`](#metric-jvmcputime)
+  * [Metric: `jvm.cpu.recent_utilization`](#metric-jvmcpurecent_utilization)
 - [JVM Metrics (Experimental)](#jvm-metrics-experimental)
   * [Metric: `jvm.memory.init`](#metric-jvmmemoryinit)
   * [Metric: `jvm.system.cpu.utilization`](#metric-jvmsystemcpuutilization)
@@ -259,18 +259,18 @@ This metric is obtained from [`ClassLoadingMXBean#getUnloadedClassCount()`](http
 <!-- semconv metric.jvm.classes.unloaded(full) -->
 <!-- endsemconv -->
 
-### Metric: `process.runtime.jvm.classes.count`
+### Metric: `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--).
 
-<!-- semconv metric.process.runtime.jvm.classes.count(metric_table) -->
-| Name     | Instrument Type | Unit (UCUM) | Description    |
-| -------- | --------------- | ----------- | -------------- |
-| `process.runtime.jvm.classes.count` | UpDownCounter | `{class}` | Number of classes currently loaded. |
+<!-- semconv metric.jvm.classes.count(metric_table) -->
+| Name                         | Instrument Type | Unit (UCUM) | Description    |
+|------------------------------| --------------- | ----------- | -------------- |
+| `jvm.classes.count`         | UpDownCounter | `{class}` | Number of classes currently loaded. |
 <!-- endsemconv -->
 
-<!-- semconv metric.process.runtime.jvm.classes.count(full) -->
+<!-- semconv metric.jvm.classes.count(full) -->
 <!-- endsemconv -->
 
 ### Metric: `jvm.cpu.time`

model/metrics/process-runtime-jvm-metrics.yaml

@@ -93,14 +93,7 @@ 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
+  - id: metric.jvm.classes.loaded
     type: metric
     metric_name: jvm.classes.loaded
     brief: "Number of classes loaded since JVM start."
@@ -114,7 +107,14 @@ groups:
     instrument: counter
     unit: "{class}"
 
-  - id: metric.process.runtime.jvm.cpu.time
+  - id: metric.jvm.classes.count
+    type: metric
+    metric_name: jvm.classes.count
+    brief: "Number of classes currently loaded."
+    instrument: updowncounter
+    unit: "{class}"
+
+  - id: metric.jvm.cpu.time
     type: metric
     metric_name: jvm.cpu.time
     brief: "CPU time used by the process as reported by the JVM."