Merge branch 'main' into log-unencodeable-key

Author: lzchen

CHANGELOG.md

@@ -28,13 +28,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3964](https://github.com/open-telemetry/opentelemetry-python/pull/3964))
 - Use semconv exception attributes for record exceptions in spans
   ([#3979](https://github.com/open-telemetry/opentelemetry-python/pull/3979))
+- Fix _encode_events assumes events.attributes.dropped exists
+  ([#3965](https://github.com/open-telemetry/opentelemetry-python/pull/3965))
 - Validate links at span creation
   ([#3991](https://github.com/open-telemetry/opentelemetry-python/pull/3991))
 
 ## Version 1.25.0/0.46b0 (2024-05-30)
 
-- Fix _encode_events assumes events.attributes.dropped exists
-  ([#3965](https://github.com/open-telemetry/opentelemetry-python/pull/3965))
 - Fix class BoundedAttributes to have RLock rather than Lock
   ([#3859](https://github.com/open-telemetry/opentelemetry-python/pull/3859))
 - Remove thread lock by loading RuntimeContext explicitly.
@@ -83,7 +83,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - units with slash are converted e.g. `m/s` -> `meters_per_second`.
   - The exporter's API is not changed
 - Add parameters for Distros and configurators to configure autoinstrumentation in addition to existing environment variables.
-  ([#3864] (https://github.com/open-telemetry/opentelemetry-python/pull/3864))
+  ([#3864](https://github.com/open-telemetry/opentelemetry-python/pull/3864))
 
 ## Version 1.24.0/0.45b0 (2024-03-28)