Merge branch 'open-telemetry:main' into MSNev/EventData

open-telemetry · Mar 21, 2023 · 373d561 · 373d561
2 parents 5811a9c + e7a555a
commit 373d561
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,12 +22,16 @@ release.
 
 ### Semantic Conventions
 
+- Clarify that attribute requirement levels apply to the instrumentation library
+  ([#3289](https://github.com/open-telemetry/opentelemetry-specification/pull/3289))
 - Fix grammatical number of metric units.
   ([#3298](https://github.com/open-telemetry/opentelemetry-specification/pull/3298))
 - Rename `net.app.protocol.(name|version)` to `net.protocol.(name|version)`
   ([#3272](https://github.com/open-telemetry/opentelemetry-specification/pull/3272))
 - Replace `http.flavor` with `net.protocol.(name|version)`
   ([#3272](https://github.com/open-telemetry/opentelemetry-specification/pull/3272))
+- Metric requirement levels are now stable
+  ([#3271](https://github.com/open-telemetry/opentelemetry-specification/pull/3271))
 
 ### Compatibility
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "markdown-link-check": "^3.9.3",
+    "markdown-link-check": "3.10.3",
     "markdown-toc": "^1.2.0",
     "markdownlint-cli": "0.31.0"
   }

diff --git a/spec-compliance-matrix.md b/spec-compliance-matrix.md
@@ -76,7 +76,7 @@ formats is required. Implementing more than one format is optional.
 | RecordException                                                                                  |          | -   | +    | +   | +      | +    | +      | +   | +    | -   | +    | -     |
 | RecordException with extra parameters                                                            |          | -   | +    | +   | +      | +    | +      | +   | +    | -   | +    | -     |
 | [Sampling](specification/trace/sdk.md#sampling)                                                  | Optional | Go  | Java | JS  | Python | Ruby | Erlang | PHP | Rust | C++ | .NET | Swift |
-| Allow samplers to modify tracestate                                                              |          | +   | +    |     | +      | +    | +      | +   | +    | +   | -    | +     |
+| Allow samplers to modify tracestate                                                              |          | +   | +    |     | +      | +    | +      | +   | +    | +   | +    | +     |
 | ShouldSample gets full parent Context                                                            |          | +   | +    | +   | +      | +    | +      | +   | +    | +   | -    | +     |
 | Sampler: JaegerRemoteSampler                                                                     |          | +   | +    |     |        |      |        |     | +    |     |      |       |
 | [New Span ID created also for non-recording Spans](specification/trace/sdk.md#sdk-span-creation) |          | +   | +    |     | +      | +    | +      | +   | +    | +   | -    | +     |

diff --git a/specification/common/attribute-requirement-level.md b/specification/common/attribute-requirement-level.md
@@ -19,6 +19,8 @@
 
 _This section applies to Log, Metric, Resource, and Span, and describes requirement levels for attributes defined in semantic conventions._
 
+Attribute requirement levels apply to the [instrumentation library](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/glossary.md#instrumentation-library).
+
 The following attribute requirement levels are specified:
 
 - [Required](#required)

diff --git a/specification/metrics/metric-requirement-level.md b/specification/metrics/metric-requirement-level.md
@@ -1,6 +1,6 @@
 # Metric Requirement Levels for Semantic Conventions
 
-**Status**: [Experimental](../document-status.md)
+**Status**: [Stable](../document-status.md)
 
 <details>
 <summary>Table of Contents</summary>

diff --git a/specification/metrics/semantic_conventions/http-metrics.md b/specification/metrics/semantic_conventions/http-metrics.md
@@ -12,6 +12,20 @@ operations. By adding HTTP attributes to metric events it allows for finely tune
 
 **Disclaimer:** These are initial HTTP metric instruments and attributes but more may be added in the future.
 
+<!-- toc -->
+
+- [HTTP Server](#http-server)
+  * [Metric: `http.server.duration`](#metric-httpserverduration)
+  * [Metric: `http.server.active_requests`](#metric-httpserveractive_requests)
+  * [Metric: `http.server.request.size`](#metric-httpserverrequestsize)
+  * [Metric: `http.server.response.size`](#metric-httpserverresponsesize)
+- [HTTP Client](#http-client)
+  * [Metric: `http.client.duration`](#metric-httpclientduration)
+  * [Metric: `http.client.request.size`](#metric-httpclientrequestsize)
+  * [Metric: `http.client.response.size`](#metric-httpclientresponsesize)
+
+<!-- tocstop -->
+
 ## HTTP Server
 
 ### Metric: `http.server.duration`