merge master

`
open-telemetry · Jun 16, 2023 · 5f033a9 · 5f033a9
1 parent 570f1d6
commit 5f033a9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/semantic_conventions/metrics/process-runtime-jvm-metrics.yaml b/semantic_conventions/metrics/process-runtime-jvm-metrics.yaml
@@ -205,9 +205,9 @@ groups:
     instrument: updowncounter
     unit: "{buffer}"
 
-  - id: metric.process.runtime.jvm.cpu.monitor.time
+  - id: metric.process.runtime.jvm.cpu.monitor.duration
     type: metric
-    metric_name: process.runtime.jvm.cpu.monitor.time
+    metric_name: process.runtime.jvm.cpu.monitor.duration
     brief: "Time monitor was used by a thread. Only available in JDK 17+."
     instrument: histogram
     unit: "s"
@@ -240,9 +240,9 @@ groups:
     instrument: histogram
     unit: "By"
 
-  - id: metric.process.runtime.jvm.network.time
+  - id: metric.process.runtime.jvm.network.duration
     type: metric
-    metric_name: process.runtime.jvm.network.time
+    metric_name: process.runtime.jvm.network.duration
     brief: "Duration of network IO operation by thread. Only available in JDK 17+."
     extends: attributes.process.runtime.jvm.network
     instrument: histogram

diff --git a/specification/metrics/semantic_conventions/runtime-environment-metrics.md b/specification/metrics/semantic_conventions/runtime-environment-metrics.md
@@ -36,10 +36,10 @@ semantic conventions when instrumenting runtime environments.
   * [Metric: `process.runtime.jvm.buffer.usage`](#metric-processruntimejvmbufferusage)
   * [Metric: `process.runtime.jvm.buffer.limit`](#metric-processruntimejvmbufferlimit)
   * [Metric: `process.runtime.jvm.buffer.count`](#metric-processruntimejvmbuffercount)
-  * [Metric: `process.runtime.jvm.cpu.monitor.time`](#metric-processruntimejvmcpumonitortime)
+  * [Metric: `process.runtime.jvm.cpu.monitor.duration`](#metric-processruntimejvmcpumonitorduration)
   * [Metric: `process.runtime.jvm.cpu.context_swtich`](#metric-processruntimejvmcpucontext_swtich)
   * [Metric: `process.runtime.jvm.network.io`](#metric-processruntimejvmnetworkio)
-  * [Metric: `process.runtime.jvm.network.time`](#metric-processruntimejvmnetworktime)
+  * [Metric: `process.runtime.jvm.network.duration`](#metric-processruntimejvmnetworkduration)
 
 <!-- tocstop -->
 
@@ -402,18 +402,22 @@ This metric is obtained from [`BufferPoolMXBean#getCount()`](https://docs.oracle
 **[1]:** Pool names are generally obtained via [BufferPoolMXBean#getName()](https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/BufferPoolMXBean.html#getName()).
 <!-- endsemconv -->
 
-### Metric: `process.runtime.jvm.cpu.monitor.time`
+### Metric: `process.runtime.jvm.cpu.monitor.duration`
 
 This metric is [recommended](../metric-requirement-level.md#recommended). Only available with JDK 17+.
 This metric is obtained from [`jdk.JavaMonitorWait`](https://sap.github.io/SapMachine/jfrevents/21.html#javamonitorwait) and [`jdk.JavaMonitorEnter`](https://sap.github.io/SapMachine/jfrevents/21.html#javamonitorenter) JFR events.
 
-<!-- semconv metric.process.runtime.jvm.cpu.monitor.time(metric_table) -->
+This metric SHOULD be specified with
+[`ExplicitBucketBoundaries`](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/api.md#instrument-advice)
+of `[]` (single bucket histogram capturing count, sum, min, max).
+
+<!-- semconv metric.process.runtime.jvm.cpu.monitor.duration(metric_table) -->
 | Name     | Instrument Type | Unit (UCUM) | Description    |
 | -------- | --------------- | ----------- | -------------- |
-| `process.runtime.jvm.cpu.monitor.duration` | Histogram | `s` | Time monitor was used bya  thread. Only available in JDK 17+. |
+| `process.runtime.jvm.cpu.monitor.duration` | Histogram | `s` | Time monitor was used by a thread. Only available in JDK 17+. |
 <!-- endsemconv -->
 
-<!-- semconv metric.process.runtime.jvm.cpu.monitor.time(full) -->
+<!-- semconv metric.process.runtime.jvm.cpu.monitor.duration(full) -->
 | Attribute  | Type | Description  | Examples  | Requirement Level |
 |---|---|---|---|---|
 | `class` | string | Class of the monitor. | `java.lang.Object` | Opt-In |
@@ -437,6 +441,10 @@ This metric is obtained from [`jdk.ThreadContextSwitchRate`](https://sap.github.
 This metric is [recommended](../metric-requirement-level.md#recommended). Only available with JDK 17+.
 This metric is obtained from [`jdk.SocketWrite`](https://sap.github.io/SapMachine/jfrevents/21.html#socketwrite) and [`jdk.SocketRead`](https://sap.github.io/SapMachine/jfrevents/21.html#socketread) JFR events.
 
+This metric SHOULD be specified with
+[`ExplicitBucketBoundaries`](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/api.md#instrument-advice)
+of `[]` (single bucket histogram capturing count, sum, min, max).
+
 <!-- semconv metric.process.runtime.jvm.network.io(metric_table) -->
 | Name     | Instrument Type | Unit (UCUM) | Description    |
 | -------- | --------------- | ----------- | -------------- |
@@ -450,7 +458,7 @@ This metric is obtained from [`jdk.SocketWrite`](https://sap.github.io/SapMachin
 | [`thread.id`](../../trace/semantic_conventions/span-general.md) | int | Current "managed" thread ID (as opposed to OS thread ID). | `42` | Opt-In |
 <!-- endsemconv -->
 
-### Metric: `process.runtime.jvm.network.time`
+### Metric: `process.runtime.jvm.network.duration`
 
 This metric is [recommended](../metric-requirement-level.md#recommended). Only available with JDK 17+.
 This metric is obtained from [`jdk.SocketWrite`](https://sap.github.io/SapMachine/jfrevents/21.html#socketwrite) and [`jdk.SocketRead`](https://sap.github.io/SapMachine/jfrevents/21.html#socketread) JFR events.
@@ -459,13 +467,13 @@ This metric SHOULD be specified with
 [`ExplicitBucketBoundaries`](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/api.md#instrument-advice)
 of `[]` (single bucket histogram capturing count, sum, min, max).
 
-<!-- semconv metric.process.runtime.jvm.network.time(metric_table) -->
+<!-- semconv metric.process.runtime.jvm.network.duration(metric_table) -->
 | Name     | Instrument Type | Unit (UCUM) | Description    |
 | -------- | --------------- | ----------- | -------------- |
-| `process.runtime.jvm.network.time` | Histogram | `s` | Duration of network IO operation by thread. Only available in JDK 17+. |
+| `process.runtime.jvm.network.duration` | Histogram | `s` | Duration of network IO operation by thread. Only available in JDK 17+. |
 <!-- endsemconv -->
 
-<!-- semconv metric.process.runtime.jvm.network.time(full) -->
+<!-- semconv metric.process.runtime.jvm.network.duration(full) -->
 | Attribute  | Type | Description  | Examples  | Requirement Level |
 |---|---|---|---|---|
 | `network.direction` | string | Read or write. | `read`; `write` | Recommended |