Merge branch 'main' into hectorhdzg/hidestd

Author: hectorhdzg

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Update OTLP proto to v1.7 [#4645](https://github.com/open-telemetry/opentelemetry-python/pull/4645).
+- Add `event_name` as a top level field in the `LogRecord`. Events are now simply logs with the
+`event_name` field set, the logs SDK should be used to emit events ([#4652](https://github.com/open-telemetry/opentelemetry-python/pull/4652)).
 - Update OTLP gRPC/HTTP exporters: the export timeout is now inclusive of all retries and backoffs.
   A +/-20% jitter was added to all backoffs. A pointless 32 second sleep that occurred after all retries
   had completed/failed was removed.

exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/_internal/_log_encoder/__init__.py

@@ -62,6 +62,7 @@ def _encode_log(log_data: LogData) -> PB2LogRecord:
         ),
         dropped_attributes_count=log_data.log_record.dropped_attributes,
         severity_number=log_data.log_record.severity_number.value,
+        event_name=log_data.log_record.event_name,
     )
 
 

opentelemetry-api/src/opentelemetry/_logs/_internal/__init__.py

@@ -69,6 +69,7 @@ def __init__(
         severity_number: Optional[SeverityNumber] = None,
         body: AnyValue = None,
         attributes: Optional[_ExtendedAttributes] = None,
+        event_name: Optional[str] = None,
     ) -> None: ...
 
     @overload
@@ -99,6 +100,7 @@ def __init__(
         severity_number: Optional[SeverityNumber] = None,
         body: AnyValue = None,
         attributes: Optional[_ExtendedAttributes] = None,
+        event_name: Optional[str] = None,
     ) -> None:
         self.timestamp = timestamp
         if observed_timestamp is None:
@@ -112,6 +114,7 @@ def __init__(
         self.severity_number = severity_number
         self.body = body
         self.attributes = attributes
+        self.event_name = event_name
 
 
 class Logger(ABC):

opentelemetry-proto/README.rst

@@ -7,9 +7,9 @@ OpenTelemetry Python Proto
    :target: https://pypi.org/project/opentelemetry-proto/
 
 This library contains the generated code for OpenTelemetry protobuf data model. The code in the current
-package was generated using the v1.2.0 release_ of opentelemetry-proto.
+package was generated using the v1.7.0 release_ of opentelemetry-proto.
 
-.. _release: https://github.com/open-telemetry/opentelemetry-proto/releases/tag/v1.2.0
+.. _release: https://github.com/open-telemetry/opentelemetry-proto/releases/tag/v1.7.0
 
 Installation
 ------------