Merge branch 'main' into reyang/exemplar-should-be-on-by-default

open-telemetry · Apr 13, 2024 · 4a4b980 · 4a4b980
2 parents e5c9ed8 + 700f513
commit 4a4b980
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,32 @@ release.
 
 ### Traces
 
+### Metrics
+
+### Logs
+
+### Events
+
+### Resource
+
+### OpenTelemetry Protocol
+
+### Compatibility
+
+### SDK Configuration
+
+### Common
+
+### Supplementary Guidelines
+
+## v1.32.0 (2024-04-11)
+
+### Context
+
+- No changes.
+
+### Traces
+
 - Remove the Jaeger Exporter.
   ([#3964](https://github.com/open-telemetry/opentelemetry-specification/pull/3964))
 
@@ -36,10 +62,16 @@ release.
 
 ### Events
 
+- No changes.
+
 ### Resource
 
+- No changes.
+
 ### OpenTelemetry Protocol
 
+- No changes.
+
 ### Compatibility
 
 - Prometheus compatibility: Clarify naming of the target info metric, and differences between various Prometheus formats.
@@ -53,15 +85,23 @@ release.
 
 ### SDK Configuration
 
+- Define OTEL_EXPERIMENTAL_CONFIG_FILE to ignore other env vars, add env var substitution default syntax.
+  ([#3948](https://github.com/open-telemetry/opentelemetry-specification/pull/3948))
 - Clarify environment variable substitution is not recursive
   ([#3913](https://github.com/open-telemetry/opentelemetry-specification/pull/3913))
 - Allow `env:` prefix in environment variable substitution syntax.
   ([#3974](https://github.com/open-telemetry/opentelemetry-specification/pull/3974))
+- Add simple scope configuration to Tracer, Meter, Logger (experimental).
+  ([#3877](https://github.com/open-telemetry/opentelemetry-specification/pull/3877))
 
 ### Common
 
+- No changes.
+
 ### Supplementary Guidelines
 
+- No changes.
+
 ## v1.31.0 (2024-03-13)
 
 ### Context

diff --git a/spec-compliance-matrix.md b/spec-compliance-matrix.md
@@ -256,7 +256,7 @@ Disclaimer: this list of features is still a work in progress, please refer to t
 | Global Propagator                                                                |          | +  | +    | +  | +      | +    | +      | +   | +    | +   | +    | +     |
 | TraceContext Propagator                                                          |          | +  | +    | +  | +      | +    | +      | +   | +    | +   | +    | +     |
 | B3 Propagator                                                                    |          | +  | +    | +  | +      | +    | +      | +   | +    | +   | +    | +     |
-| Jaeger Propagator                                                                |          | +  | +    | +  | +      | +    | +      |     | +    | +   | -    | +     |
+| Jaeger Propagator                                                                |          | +  | +    | +  | +      | +    | +      | +   | +    | +   | -    | +     |
 | OT Propagator                                                                    |          | +  | +    | +  | +      |      |        |     |      |     |      |       |
 | OpenCensus Binary Propagator                                                     |          | +  |      |    |        |      |        |     |      |     |      |       |
 | [TextMapPropagator](specification/context/api-propagators.md#textmap-propagator) |          | +  | +    |    |        | +    |        | +   |      |     |      |       |