Merge branch 'main' into feature/add_error_handling_for_otlp_exporters

Author: emdneto

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.6.9
+    rev: v0.14.1
     hooks:
       # Run the linter.
       - id: ruff

CHANGELOG.md

@@ -14,6 +14,58 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - docs: Added sqlcommenter example
   ([#4734](https://github.com/open-telemetry/opentelemetry-python/pull/4734))
+- build: bump ruff to 0.14.1
+  ([#4782](https://github.com/open-telemetry/opentelemetry-python/pull/4782))
+- Add `opentelemetry-exporter-credential-provider-gcp` as an optional dependency to `opentelemetry-exporter-otlp-proto-grpc` 
+  and `opentelemetry-exporter-otlp-proto-http` 
+  ([#4760](https://github.com/open-telemetry/opentelemetry-python/pull/4760))
+- semantic-conventions: Bump to 1.38.0
+  ([#4791](https://github.com/open-telemetry/opentelemetry-python/pull/4791))
+- [BREAKING] Remove LogData and extend SDK LogRecord to have instrumentation scope
+  ([#4676](https://github.com/open-telemetry/opentelemetry-python/pull/4676))
+  
+  **Migration Guide:**
+  
+  `LogData` has been removed. Users should update their code as follows:
+  
+  - **For Log Exporters:** Change from `Sequence[LogData]` to `Sequence[ReadableLogRecord]`
+    ```python
+    # Before
+    from opentelemetry.sdk._logs import LogData
+    def export(self, batch: Sequence[LogData]) -> LogExportResult:
+        ...
+    
+    # After
+    from opentelemetry.sdk._logs import ReadableLogRecord
+    def export(self, batch: Sequence[ReadableLogRecord]) -> LogExportResult:
+        ...
+    ```
+  
+  - **For Log Processors:** Use `ReadWriteLogRecord` for processing, `ReadableLogRecord` for exporting
+    ```python
+    # Before
+    from opentelemetry.sdk._logs import LogData
+    def on_emit(self, log_data: LogData):
+        ...
+    
+    # After
+    from opentelemetry.sdk._logs import ReadWriteLogRecord, ReadableLogRecord
+    def on_emit(self, log_record: ReadWriteLogRecord):
+        # Convert to ReadableLogRecord before exporting
+        readable = ReadableLogRecord(
+            log_record=log_record.log_record,
+            resource=log_record.resource or Resource.create({}),
+            instrumentation_scope=log_record.instrumentation_scope,
+            limits=log_record.limits,
+        )
+        ...
+    ```
+  
+  - **Accessing log data:** Use the same attributes on `ReadableLogRecord`/`ReadWriteLogRecord`
+    - `log_record.log_record` - The API LogRecord (contains body, severity, attributes, etc.)
+    - `log_record.resource` - The Resource
+    - `log_record.instrumentation_scope` - The InstrumentationScope (now included, was in LogData before)
+    - `log_record.limits` - The LogLimits
 
 ## Version 1.38.0/0.59b0 (2025-10-16)
 

README.md

@@ -125,7 +125,7 @@ For more information about the approver role, see the [community repository](htt
 
 - [Alex Boten](https://github.com/codeboten)
 - [Chris Kleinknecht](https://github.com/c24t)
-- [Diego Hurtado](https://github.com/ocelotl), Lightstep
+- [Diego Hurtado](https://github.com/ocelotl)
 - [Owais Lone](https://github.com/owais)
 - [Reiley Yang](https://github.com/reyang)
 - [Srikanth Chekuri](https://github.com/srikanthccv)

dev-requirements.txt

@@ -17,4 +17,4 @@ psutil==5.9.6
 GitPython==3.1.41
 pre-commit==3.7.0; python_version >= '3.9'
 pre-commit==3.5.0; python_version < '3.9'
-ruff==0.6.9
+ruff==0.14.1

docs/examples/django/manage.py

@@ -30,7 +30,9 @@ def main():
     DjangoInstrumentor().instrument()
 
     try:
-        from django.core.management import execute_from_command_line
+        from django.core.management import (  # noqa: PLC0415
+            execute_from_command_line,
+        )
     except ImportError as exc:
         raise ImportError(
             "Couldn't import Django. Are you sure it's installed and "

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

@@ -30,51 +30,55 @@
     ResourceLogs,
     ScopeLogs,
 )
-from opentelemetry.sdk._logs import LogData
+from opentelemetry.sdk._logs import ReadableLogRecord
 
 
-def encode_logs(batch: Sequence[LogData]) -> ExportLogsServiceRequest:
+def encode_logs(
+    batch: Sequence[ReadableLogRecord],
+) -> ExportLogsServiceRequest:
     return ExportLogsServiceRequest(resource_logs=_encode_resource_logs(batch))
 
 
-def _encode_log(log_data: LogData) -> PB2LogRecord:
+def _encode_log(readable_log_record: ReadableLogRecord) -> PB2LogRecord:
     span_id = (
         None
-        if log_data.log_record.span_id == 0
-        else _encode_span_id(log_data.log_record.span_id)
+        if readable_log_record.log_record.span_id == 0
+        else _encode_span_id(readable_log_record.log_record.span_id)
     )
     trace_id = (
         None
-        if log_data.log_record.trace_id == 0
-        else _encode_trace_id(log_data.log_record.trace_id)
+        if readable_log_record.log_record.trace_id == 0
+        else _encode_trace_id(readable_log_record.log_record.trace_id)
     )
-    body = log_data.log_record.body
+    body = readable_log_record.log_record.body
     return PB2LogRecord(
-        time_unix_nano=log_data.log_record.timestamp,
-        observed_time_unix_nano=log_data.log_record.observed_timestamp,
+        time_unix_nano=readable_log_record.log_record.timestamp,
+        observed_time_unix_nano=readable_log_record.log_record.observed_timestamp,
         span_id=span_id,
         trace_id=trace_id,
-        flags=int(log_data.log_record.trace_flags),
+        flags=int(readable_log_record.log_record.trace_flags),
         body=_encode_value(body, allow_null=True),
-        severity_text=log_data.log_record.severity_text,
+        severity_text=readable_log_record.log_record.severity_text,
         attributes=_encode_attributes(
-            log_data.log_record.attributes, allow_null=True
+            readable_log_record.log_record.attributes, allow_null=True
         ),
-        dropped_attributes_count=log_data.log_record.dropped_attributes,
+        dropped_attributes_count=readable_log_record.dropped_attributes,
         severity_number=getattr(
-            log_data.log_record.severity_number, "value", None
+            readable_log_record.log_record.severity_number, "value", None
         ),
-        event_name=log_data.log_record.event_name,
+        event_name=readable_log_record.log_record.event_name,
     )
 
 
-def _encode_resource_logs(batch: Sequence[LogData]) -> List[ResourceLogs]:
+def _encode_resource_logs(
+    batch: Sequence[ReadableLogRecord],
+) -> List[ResourceLogs]:
     sdk_resource_logs = defaultdict(lambda: defaultdict(list))
 
-    for sdk_log in batch:
-        sdk_resource = sdk_log.log_record.resource
-        sdk_instrumentation = sdk_log.instrumentation_scope or None
-        pb2_log = _encode_log(sdk_log)
+    for readable_log in batch:
+        sdk_resource = readable_log.resource
+        sdk_instrumentation = readable_log.instrumentation_scope or None
+        pb2_log = _encode_log(readable_log)
 
         sdk_resource_logs[sdk_resource][sdk_instrumentation].append(pb2_log)
 

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

@@ -115,7 +115,7 @@ def _get_temporality(
                 "CUMULATIVE"
             ):
                 _logger.warning(
-                    "Unrecognized OTEL_EXPORTER_METRICS_TEMPORALITY_PREFERENCE"
+                    "Unrecognized OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE"
                     " value found: "
                     "%s, "
                     "using CUMULATIVE",