Merge branch 'main' into otep-log-enabled

CHANGELOG.md

@@ -9,6 +9,36 @@ release.
 
 ### Context
 
+### Traces
+
+### Metrics
+
+### Logs
+
+### Events
+
+### Baggage
+
+### Resource
+
+### Profiles
+
+### OpenTelemetry Protocol
+
+### Compatibility
+
+### SDK Configuration
+
+### Common
+
+### Supplementary Guidelines
+
+### OTEPs
+
+## v1.40.0 (2024-12-12)
+
+### Context
+
 - Adds optional `GetAll` method to `Getter` in Propagation API, allowing for the retrieval of multiple values for the same key.
   [#4295](https://github.com/open-telemetry/opentelemetry-specification/pull/4295)
 
@@ -34,25 +64,13 @@ release.
   ([#4310](https://github.com/open-telemetry/opentelemetry-specification/pull/4310))
 - Remove the in-development isolating log record processor.
   ([#4301](https://github.com/open-telemetry/opentelemetry-specification/pull/4301))
-- Change `event.name` attribute into top-level event name field.
-  ([#4320](https://github.com/open-telemetry/opentelemetry-specification/pull/4320))
 
 ### Events
 
 - Deprecate Events API and SDK in favor of having Events support in the Logs API and SDK.
   ([#4319](https://github.com/open-telemetry/opentelemetry-specification/pull/4319))
-
-### Baggage
-
-### Resource
-
-### Profiles
-
-### OpenTelemetry Protocol
-
-### Compatibility
-
-### SDK Configuration
+- Change `event.name` attribute into top-level event name field.
+  ([#4320](https://github.com/open-telemetry/opentelemetry-specification/pull/4320))
 
 ### Common
 
@@ -64,6 +82,12 @@ release.
 - Add core principles for evaluating specification changes.
   ([#4286](https://github.com/open-telemetry/opentelemetry-specification/pull/4286))
 
+## OTEPs
+
+- The [open-telemetry/oteps](https://github.com/open-telemetry/oteps) repository was
+  merged into the specification repository.
+ ([#4288](https://github.com/open-telemetry/opentelemetry-specification/pull/4288))
+
 ## v1.39.0 (2024-11-06)
 
 ### Logs

specification/logs/api.md

@@ -137,7 +137,7 @@ The API MUST accept the following parameters:
 - [Severity Text](./data-model.md#field-severitytext) (optional)
 - [Body](./data-model.md#field-body) (optional)
 - [Attributes](./data-model.md#field-attributes) (optional)
-- **Status**: [Development](../document-status.md) - [Event Name](./data-model.md#event-name) (optional)
+- **Status**: [Development](../document-status.md) - [Event Name](./data-model.md#field-eventname) (optional)
 
 #### Enabled
 
@@ -174,7 +174,7 @@ formatted as an [event](./data-model.md#events).
 
 **Parameters:**
 
-* [Event Name](./data-model.md#event-name) (required)
+* [Event Name](./data-model.md#field-eventname) (required)
 * [Timestamp](./data-model.md#field-timestamp) (optional)
 * [Observed Timestamp](./data-model.md#field-observedtimestamp) (optional). If unspecified
   the implementation SHOULD set it equal to the current time.

specification/logs/sdk.md

@@ -232,7 +232,7 @@ the following information added to the [LogRecord](data-model.md#log-and-event-r
 * [`TraceId`](./data-model.md#field-traceid)
 * [`SpanId`](./data-model.md#field-spanid)
 * [`TraceFlags`](./data-model.md#field-traceflags)
-* **Status**: [Development](../document-status.md) - [`EventName`](./data-model.md#event-name)
+* **Status**: [Development](../document-status.md) - [`EventName`](./data-model.md#field-eventname)
 
 The SDK MAY provide an operation that makes a deep clone of a `ReadWriteLogRecord`.
 The operation can be used by asynchronous processors (e.g. [Batching processor](#batching-processor))