OTLP exporter is encoding invalid span/trace IDs in the logs fix

CHANGELOG.md

@@ -36,7 +36,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3991](https://github.com/open-telemetry/opentelemetry-python/pull/3991))
 
 ## Version 1.25.0/0.46b0 (2024-05-30)
-
+- OTLP exporter is encoding invalid span/trace IDs in the logs fix
+  ([#4006](https://github.com/open-telemetry/opentelemetry-python/pull/4006))
 - 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.

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

@@ -39,11 +39,21 @@ def encode_logs(batch: Sequence[LogData]) -> ExportLogsServiceRequest:
 
 
 def _encode_log(log_data: LogData) -> PB2LogRecord:
+    span_id = (
+        None
+        if log_data.log_record.span_id == 0
+        else _encode_span_id(log_data.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)
+    )
     return PB2LogRecord(
         time_unix_nano=log_data.log_record.timestamp,
         observed_time_unix_nano=log_data.log_record.observed_timestamp,
-        span_id=_encode_span_id(log_data.log_record.span_id),
-        trace_id=_encode_trace_id(log_data.log_record.trace_id),
+        span_id=span_id,
+        trace_id=trace_id,
         flags=int(log_data.log_record.trace_flags),
         body=_encode_value(log_data.log_record.body),
         severity_text=log_data.log_record.severity_text,

exporter/opentelemetry-exporter-otlp-proto-common/tests/test_log_encoder.py

@@ -239,8 +239,8 @@ def get_test_logs(
                                 PB2LogRecord(
                                     time_unix_nano=1644650249738562048,
                                     observed_time_unix_nano=1644650249738562049,
-                                    trace_id=_encode_trace_id(0),
-                                    span_id=_encode_span_id(0),
+                                    trace_id=None,
+                                    span_id=None,
                                     flags=int(TraceFlags.DEFAULT),
                                     severity_text="WARN",
                                     severity_number=SeverityNumber.WARN.value,