Merge branch 'main' into all-spec-requirement-levels

open-telemetry · Jun 10, 2022 · 706542a · 706542a
2 parents c681a3b + ae87c81
commit 706542a
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,16 +13,46 @@ release.
 
 ### Metrics
 
+### Logs
+
+### Resource
+
+### Semantic Conventions
+
+### Compatibility
+
+### OpenTelemetry Protocol
+
+### SDK Configuration
+
+### Telemetry Schemas
+
+### Common
+
+## v1.12.0 (2022-06-10)
+
+### Context
+
+- No changes.
+
+### Traces
+
+- No changes.
+
+### Metrics
+
 - Clarify that API support for multi-instrument callbacks is permitted.
   ([#2263](https://github.com/open-telemetry/opentelemetry-specification/pull/2263)).
 - Clarify SDK behavior when view conflicts are present
   ([#2462](https://github.com/open-telemetry/opentelemetry-specification/pull/2462)).
 - Clarify MetricReader.Collect result
   ([#2495](https://github.com/open-telemetry/opentelemetry-specification/pull/2495)).
-- Add database connection pool metrics semantic conventions
-  ([#2273](https://github.com/open-telemetry/opentelemetry-specification/pull/2273)).
 - Specify optional support for an Exponential Histogram Aggregation.
   ([#2252](https://github.com/open-telemetry/opentelemetry-specification/pull/2252))
+- Update Prometheus Sums for handling delta counter case
+  ([#2570](https://github.com/open-telemetry/opentelemetry-specification/pull/2570)).
+- Supplementary guidance for metrics additive property
+  ([#2571](https://github.com/open-telemetry/opentelemetry-specification/pull/2571)).
 
 ### Logs
 
@@ -31,6 +61,8 @@ release.
 
 ### Resource
 
+- No changes.
+
 ### Semantic Conventions
 
 - Add semantic conventions for JVM CPU metrics
@@ -40,21 +72,45 @@ release.
   ([#2502](https://github.com/open-telemetry/opentelemetry-specification/pull/2502))
 - Define attribute requirement levels
   ([#2522](https://github.com/open-telemetry/opentelemetry-specification/pull/2522))
+- Initial addition of Kafka metrics
+  ([#2485](https://github.com/open-telemetry/opentelemetry-specification/pull/2485)).
 - Add semantic conventions for Kafka consumer metrics
   ([#2536](https://github.com/open-telemetry/opentelemetry-specification/pull/2536))
+- Add database connection pool metrics semantic conventions
+  ([#2273](https://github.com/open-telemetry/opentelemetry-specification/pull/2273)).
+- Specify how to obtain a Ruby thread's id
+  ([#2508](https://github.com/open-telemetry/opentelemetry-specification/pull/2508)).
+- Refactor jvm classes semantic conventions
+  ([#2550](https://github.com/open-telemetry/opentelemetry-specification/pull/2550)).
+- Add browser.* attributes
+  ([#2353](https://github.com/open-telemetry/opentelemetry-specification/pull/2353)).
+- Change JVM runtime metric `process.runtime.jvm.memory.max`
+  to `process.runtime.jvm.memory.limit`
+  ([#2605](https://github.com/open-telemetry/opentelemetry-specification/pull/2605)).
 - Adopt attribute requirement levels in semantic conventions
   ([#2594](https://github.com/open-telemetry/opentelemetry-specification/pull/2594))
 
 ### Compatibility
 
+- No changes.
+
 ### OpenTelemetry Protocol
 
+- No changes.
+
 ### SDK Configuration
 
+- No changes.
+
 ### Telemetry Schemas
 
+- No changes.
+
 ### Common
 
+- Move non-otlp.md to common directory
+  ([#2587](https://github.com/open-telemetry/opentelemetry-specification/pull/2587)).
+
 ## v1.11.0 (2022-05-04)
 
 ### Context
@@ -87,7 +143,7 @@ release.
 
 ### Resource
 
-- Add browser.* attributes ([#2353](https://github.com/open-telemetry/opentelemetry-specification/pull/2353)).
+- No changes.
 
 ### Semantic Conventions
 

diff --git a/schemas/1.12.0 b/schemas/1.12.0
@@ -0,0 +1,18 @@
+file_format: 1.0.0
+schema_url: https://opentelemetry.io/schemas/1.12.0
+versions:
+  1.12.0:
+  1.11.0:
+  1.10.0:
+  1.9.0:
+  1.8.0:
+    spans:
+      changes:
+        - rename_attributes:
+            attribute_map:
+              db.cassandra.keyspace: db.name
+              db.hbase.namespace: db.name
+  1.7.0:
+  1.6.1:
+  1.5.0:
+  1.4.0:
diff --git a/specification/metrics/semantic_conventions/runtime-environment-metrics.md b/specification/metrics/semantic_conventions/runtime-environment-metrics.md
@@ -65,7 +65,7 @@ All JVM metric attributes are required unless otherwise indicated.
 |                                            |                                                          |         |                                           |                                                   |            | pool          | Name of pool [1]      |
 | process.runtime.jvm.memory.committed       | Measure of memory committed                              | Bytes   | `By`                                      | UpDownCounter                                     | Int64      | type          | `"heap"`, `"nonheap"` |
 |                                            |                                                          |         |                                           |                                                   |            | pool          | Name of pool [1]      |
-| process.runtime.jvm.memory.max             | Measure of max obtainable memory                         | Bytes   | `By`                                      | UpDownCounter                                     | Int64      | type          | `"heap"`, `"nonheap"` |
+| process.runtime.jvm.memory.limit           | Measure of max obtainable memory                         | Bytes   | `By`                                      | UpDownCounter                                     | Int64      | type          | `"heap"`, `"nonheap"` |
 |                                            |                                                          |         |                                           |                                                   |            | pool          | Name of pool [1]      |
 | process.runtime.jvm.threads.count          | Number of executing threads                              | threads | `{threads}`                               | UpDownCounter                                     | Int64      |               |                       |
 | process.runtime.jvm.classes.loaded         | Number of classes loaded since JVM start                 | classes | `{classes}`                               | Counter                                           | Int64      |               |                       |