Merge branch 'main' into container_image

open-telemetry · Aug 29, 2023 · ebd2737 · ebd2737
2 parents b3971f1 + 4bbb8c9
commit ebd2737
Show file tree

Hide file tree

Showing 8 changed files with 493 additions and 402 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -50,6 +50,17 @@ release.
 - Clarify that `http/dup` has higher precedence than `http` in case both values are present
   in `OTEL_SEMCONV_STABILITY_OPT_IN`
   ([#249](https://github.com/open-telemetry/semantic-conventions/pull/249))
+- Add `jvm.cpu.count` metric.
+  ([#52](https://github.com/open-telemetry/semantic-conventions/pull/52))
+- BREAKING: Rename metrics `jvm.buffer.usage` to `jvm.buffer.memory.usage`
+  and `jvm.buffer.limit` to `jvm.buffer.memory.limit`.
+  ([#253](https://github.com/open-telemetry/semantic-conventions/pull/253))
+- BREAKING: Rename `jvm.classes.current_loaded` metrics to `jvm.classes.count`
+  ([#60](https://github.com/open-telemetry/semantic-conventions/pull/60))
+- BREAKING: Remove pluralization from JVM metric namespaces.
+  ([#252](https://github.com/open-telemetry/semantic-conventions/pull/252))
+- Simplify HTTP metric briefs.
+  ([#276](https://github.com/open-telemetry/semantic-conventions/pull/276))
 
 ## v1.21.0 (2023-07-13)
 

diff --git a/docs/http/http-metrics.md b/docs/http/http-metrics.md
@@ -214,7 +214,9 @@ This metric is optional.
 <!-- semconv metric.http.server.request.size(metric_table) -->
 | Name     | Instrument Type | Unit (UCUM) | Description    |
 | -------- | --------------- | ----------- | -------------- |
-| `http.server.request.size` | Histogram | `By` | Measures the size of HTTP request messages (compressed). |
+| `http.server.request.size` | Histogram | `By` | Measures the size of HTTP request messages. [1] |
+
+**[1]:** Size as measured over the wire (compressed size if messages are compressed).
 <!-- endsemconv -->
 
 <!-- semconv metric.http.server.request.size(full) -->
@@ -291,7 +293,9 @@ This metric is optional.
 <!-- semconv metric.http.server.response.size(metric_table) -->
 | Name     | Instrument Type | Unit (UCUM) | Description    |
 | -------- | --------------- | ----------- | -------------- |
-| `http.server.response.size` | Histogram | `By` | Measures the size of HTTP response messages (compressed). |
+| `http.server.response.size` | Histogram | `By` | Measures the size of HTTP response messages. [1] |
+
+**[1]:** Size as measured over the wire (compressed size if messages are compressed).
 <!-- endsemconv -->
 
 <!-- semconv metric.http.server.response.size(full) -->
@@ -447,7 +451,9 @@ This metric is optional.
 <!-- semconv metric.http.client.request.size(metric_table) -->
 | Name     | Instrument Type | Unit (UCUM) | Description    |
 | -------- | --------------- | ----------- | -------------- |
-| `http.client.request.size` | Histogram | `By` | Measures the size of HTTP request messages (compressed). |
+| `http.client.request.size` | Histogram | `By` | Measures the size of HTTP request messages. [1] |
+
+**[1]:** Size as measured over the wire (compressed size if messages are compressed).
 <!-- endsemconv -->
 
 <!-- semconv metric.http.client.request.size(full) -->
@@ -518,7 +524,9 @@ This metric is optional.
 <!-- semconv metric.http.client.response.size(metric_table) -->
 | Name     | Instrument Type | Unit (UCUM) | Description    |
 | -------- | --------------- | ----------- | -------------- |
-| `http.client.response.size` | Histogram | `By` | Measures the size of HTTP response messages (compressed). |
+| `http.client.response.size` | Histogram | `By` | Measures the size of HTTP response messages. [1] |
+
+**[1]:** Size as measured over the wire (compressed size if messages are compressed).
 <!-- endsemconv -->
 
 <!-- semconv metric.http.client.response.size(full) -->

diff --git a/docs/jvm/jvm-metrics.md b/docs/jvm/jvm-metrics.md
diff --git a/docs/system/runtime-environment-metrics.md b/docs/system/runtime-environment-metrics.md
diff --git a/model/metrics/http.yaml b/model/metrics/http.yaml
@@ -97,17 +97,19 @@ groups:
   - id: metric.http.server.request.size
     type: metric
     metric_name: http.server.request.size
-    brief: "Measures the size of HTTP request messages (compressed)."
+    brief: "Measures the size of HTTP request messages."
     instrument: histogram
     unit: "By"
+    note: Size as measured over the wire (compressed size if messages are compressed).
     extends: metric_attributes.http.server
 
   - id: metric.http.server.response.size
     type: metric
     metric_name: http.server.response.size
-    brief: "Measures the size of HTTP response messages (compressed)."
+    brief: "Measures the size of HTTP response messages."
     instrument: histogram
     unit: "By"
+    note: Size as measured over the wire (compressed size if messages are compressed).
     extends: metric_attributes.http.server
 
   - id: metric.http.client.request.duration
@@ -121,15 +123,17 @@ groups:
   - id: metric.http.client.request.size
     type: metric
     metric_name: http.client.request.size
-    brief: "Measures the size of HTTP request messages (compressed)."
+    brief: "Measures the size of HTTP request messages."
     instrument: histogram
     unit: "By"
+    note: Size as measured over the wire (compressed size if messages are compressed).
     extends: metric_attributes.http.client
 
   - id: metric.http.client.response.size
     type: metric
     metric_name: http.client.response.size
-    brief: "Measures the size of HTTP response messages (compressed)."
+    brief: "Measures the size of HTTP response messages."
     instrument: histogram
     unit: "By"
+    note: Size as measured over the wire (compressed size if messages are compressed).
     extends: metric_attributes.http.client
diff --git a/...ess-runtime-jvm-metrics-experimental.yaml → model/metrics/jvm-metrics-experimental.yaml b/...ess-runtime-jvm-metrics-experimental.yaml → model/metrics/jvm-metrics-experimental.yaml
@@ -45,17 +45,17 @@ groups:
           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()).
 
-  - id: metric.jvm.buffer.usage
+  - id: metric.jvm.buffer.memory.usage
     type: metric
-    metric_name: jvm.buffer.usage
+    metric_name: jvm.buffer.memory.usage
     extends: attributes.jvm.buffer
     brief: "Measure of memory used by buffers."
     instrument: updowncounter
     unit: "By"
 
-  - id: metric.jvm.buffer.limit
+  - id: metric.jvm.buffer.memory.limit
     type: metric
-    metric_name: jvm.buffer.limit
+    metric_name: jvm.buffer.memory.limit
     extends: attributes.jvm.buffer
     brief: "Measure of total memory capacity of buffers."
     instrument: updowncounter

diff --git a/.../metrics/process-runtime-jvm-metrics.yaml → model/metrics/jvm-metrics.yaml b/.../metrics/process-runtime-jvm-metrics.yaml → model/metrics/jvm-metrics.yaml
@@ -83,37 +83,44 @@ groups:
           Garbage collector action is generally obtained via
           [GarbageCollectionNotificationInfo#getGcAction()](https://docs.oracle.com/en/java/javase/11/docs/api/jdk.management/com/sun/management/GarbageCollectionNotificationInfo.html#getGcAction()).
 
-  - id: metric.jvm.threads.count
+  - id: metric.jvm.thread.count
     type: metric
-    metric_name: jvm.threads.count
+    metric_name: jvm.thread.count
     brief: "Number of executing platform threads."
     instrument: updowncounter
     unit: "{thread}"
     attributes:
       - ref: thread.daemon
         requirement_level: recommended
 
-  - id: metric.jvm.classes.loaded
+  - id: metric.jvm.class.loaded
     type: metric
-    metric_name: jvm.classes.loaded
+    metric_name: jvm.class.loaded
     brief: "Number of classes loaded since JVM start."
     instrument: counter
     unit: "{class}"
 
-  - id: metric.jvm.classes.unloaded
+  - id: metric.jvm.class.unloaded
     type: metric
-    metric_name: jvm.classes.unloaded
+    metric_name: jvm.class.unloaded
     brief: "Number of classes unloaded since JVM start."
     instrument: counter
     unit: "{class}"
 
-  - id: metric.jvm.classes.current_loaded
+  - id: metric.jvm.class.count
     type: metric
-    metric_name: jvm.classes.current_loaded
+    metric_name: jvm.class.count
     brief: "Number of classes currently loaded."
     instrument: updowncounter
     unit: "{class}"
 
+  - id: metric.jvm.cpu.count
+    type: metric
+    metric_name: jvm.cpu.count
+    brief: "Number of processors available to the Java virtual machine."
+    instrument: updowncounter
+    unit: "{cpu}"
+
   - id: metric.jvm.cpu.time
     type: metric
     metric_name: jvm.cpu.time

diff --git a/schema-next.yaml b/schema-next.yaml
@@ -15,17 +15,24 @@ versions:
             process.runtime.jvm.memory.limit: jvm.memory.limit
             process.runtime.jvm.memory.usage_after_last_gc: jvm.memory.usage_after_last_gc
             process.runtime.jvm.gc.duration: jvm.gc.duration
-            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
+            # also https://github.com/open-telemetry/semantic-conventions/pull/252
+            process.runtime.jvm.threads.count: jvm.thread.count
+            # also https://github.com/open-telemetry/semantic-conventions/pull/252
+            process.runtime.jvm.classes.loaded: jvm.class.loaded
+            # also https://github.com/open-telemetry/semantic-conventions/pull/252
+            process.runtime.jvm.classes.unloaded: jvm.class.unloaded
+            # also https://github.com/open-telemetry/semantic-conventions/pull/252
+            # and https://github.com/open-telemetry/semantic-conventions/pull/60
+            process.runtime.jvm.classes.current_loaded: jvm.class.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
             process.runtime.jvm.system.cpu.utilization: jvm.system.cpu.utilization
             process.runtime.jvm.system.cpu.load_1m: jvm.system.cpu.load_1m
-            process.runtime.jvm.buffer.usage: jvm.buffer.usage
-            process.runtime.jvm.buffer.limit: jvm.buffer.limit
+            # https://github.com/open-telemetry/semantic-conventions/pull/253
+            process.runtime.jvm.buffer.usage: jvm.buffer.memory.usage
+            # https://github.com/open-telemetry/semantic-conventions/pull/253
+            process.runtime.jvm.buffer.limit: jvm.buffer.memory.limit
             process.runtime.jvm.buffer.count: jvm.buffer.count
         # https://github.com/open-telemetry/semantic-conventions/pull/20
         - rename_attributes: