Logs API accepts whole context

Author: tammy-baylis-swi

opentelemetry-api/src/opentelemetry/_events/__init__.py

@@ -22,7 +22,7 @@
 from opentelemetry.environment_variables import (
     _OTEL_PYTHON_EVENT_LOGGER_PROVIDER,
 )
-from opentelemetry.trace.span import TraceFlags
+from opentelemetry.trace.span import SpanContext
 from opentelemetry.util._once import Once
 from opentelemetry.util._providers import _load_provider
 from opentelemetry.util.types import AnyValue, _ExtendedAttributes
@@ -35,9 +35,7 @@ def __init__(
         self,
         name: str,
         timestamp: Optional[int] = None,
-        trace_id: Optional[int] = None,
-        span_id: Optional[int] = None,
-        trace_flags: Optional["TraceFlags"] = None,
+        span_context: Optional[SpanContext] = None,
         body: Optional[AnyValue] = None,
         severity_number: Optional[SeverityNumber] = None,
         attributes: Optional[_ExtendedAttributes] = None,
@@ -49,9 +47,7 @@ def __init__(
         }
         super().__init__(
             timestamp=timestamp,
-            trace_id=trace_id,
-            span_id=span_id,
-            trace_flags=trace_flags,
+            span_context=span_context,
             body=body,
             severity_number=severity_number,
             attributes=event_attributes,

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

@@ -41,7 +41,7 @@
 
 from opentelemetry._logs.severity import SeverityNumber
 from opentelemetry.environment_variables import _OTEL_PYTHON_LOGGER_PROVIDER
-from opentelemetry.trace.span import TraceFlags
+from opentelemetry.trace.span import SpanContext
 from opentelemetry.util._once import Once
 from opentelemetry.util._providers import _load_provider
 from opentelemetry.util.types import AnyValue, _ExtendedAttributes
@@ -61,9 +61,7 @@ def __init__(
         self,
         timestamp: Optional[int] = None,
         observed_timestamp: Optional[int] = None,
-        trace_id: Optional[int] = None,
-        span_id: Optional[int] = None,
-        trace_flags: Optional["TraceFlags"] = None,
+        span_context: Optional[SpanContext] = None,
         severity_text: Optional[str] = None,
         severity_number: Optional[SeverityNumber] = None,
         body: AnyValue = None,
@@ -73,9 +71,12 @@ def __init__(
         if observed_timestamp is None:
             observed_timestamp = time_ns()
         self.observed_timestamp = observed_timestamp
-        self.trace_id = trace_id
-        self.span_id = span_id
-        self.trace_flags = trace_flags
+        self.span_context = span_context
+        self.trace_id = self.span_id = self.trace_flags = None
+        if span_context:
+            self.trace_id = span_context.trace_id
+            self.span_id = span_context.span_id
+            self.trace_flags = span_context.trace_flags
         self.severity_text = severity_text
         self.severity_number = severity_number
         self.body = body

opentelemetry-sdk/src/opentelemetry/sdk/_events/__init__.py

@@ -53,9 +53,7 @@ def emit(self, event: Event) -> None:
         log_record = LogRecord(
             timestamp=event.timestamp or time_ns(),
             observed_timestamp=None,
-            trace_id=event.trace_id or span_context.trace_id,
-            span_id=event.span_id or span_context.span_id,
-            trace_flags=event.trace_flags or span_context.trace_flags,
+            span_context=event.span_context or span_context,
             severity_text=None,
             severity_number=event.severity_number or SeverityNumber.INFO,
             body=event.body,

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

@@ -24,7 +24,7 @@
 from os import environ
 from threading import Lock
 from time import time_ns
-from typing import Any, Callable, Tuple, Union, cast  # noqa
+from typing import Any, Callable, Optional, Tuple, Union, cast  # noqa
 
 from opentelemetry._logs import Logger as APILogger
 from opentelemetry._logs import LoggerProvider as APILoggerProvider
@@ -52,7 +52,7 @@
     format_trace_id,
     get_current_span,
 )
-from opentelemetry.trace.span import TraceFlags
+from opentelemetry.trace.span import SpanContext
 from opentelemetry.util.types import AnyValue, _ExtendedAttributes
 
 _logger = logging.getLogger(__name__)
@@ -176,9 +176,7 @@ def __init__(
         self,
         timestamp: int | None = None,
         observed_timestamp: int | None = None,
-        trace_id: int | None = None,
-        span_id: int | None = None,
-        trace_flags: TraceFlags | None = None,
+        span_context: Optional[SpanContext] = None,
         severity_text: str | None = None,
         severity_number: SeverityNumber | None = None,
         body: AnyValue | None = None,
@@ -190,9 +188,7 @@ def __init__(
             **{
                 "timestamp": timestamp,
                 "observed_timestamp": observed_timestamp,
-                "trace_id": trace_id,
-                "span_id": span_id,
-                "trace_flags": trace_flags,
+                "span_context": span_context,
                 "severity_text": severity_text,
                 "severity_number": severity_number,
                 "body": body,
@@ -548,9 +544,7 @@ def _translate(self, record: logging.LogRecord) -> LogRecord:
         return LogRecord(
             timestamp=timestamp,
             observed_timestamp=observered_timestamp,
-            trace_id=span_context.trace_id,
-            span_id=span_context.span_id,
-            trace_flags=span_context.trace_flags,
+            span_context=span_context,
             severity_text=level_name,
             severity_number=severity_number,
             body=body,

opentelemetry-sdk/tests/events/test_events.py

@@ -23,6 +23,8 @@
 from opentelemetry.sdk._logs import LoggerProvider
 from opentelemetry.sdk._logs._internal import Logger, NoOpLogger
 from opentelemetry.sdk.environment_variables import OTEL_SDK_DISABLED
+from opentelemetry.trace import TraceFlags
+from opentelemetry.trace.span import SpanContext
 
 
 class TestEventLoggerProvider(unittest.TestCase):
@@ -123,15 +125,17 @@ def test_event_logger_emit(self, logger_mock, log_record_mock):
             "name", "version", "schema_url", {"key": "value"}
         )
         now = Mock()
-        trace_id = Mock()
-        span_id = Mock()
-        trace_flags = Mock()
+        trace_flags = TraceFlags(0x01)
+        span_context = SpanContext(
+            2604504634922341076776623263868986797,
+            5213367945872657620,
+            True,
+            trace_flags,
+        )
         event = Event(
             name="test_event",
             timestamp=now,
-            trace_id=trace_id,
-            span_id=span_id,
-            trace_flags=trace_flags,
+            span_context=span_context,
             body="test body",
             severity_number=SeverityNumber.ERROR,
             attributes={
@@ -146,9 +150,7 @@ def test_event_logger_emit(self, logger_mock, log_record_mock):
         log_record_mock.assert_called_once_with(
             timestamp=now,
             observed_timestamp=None,
-            trace_id=trace_id,
-            span_id=span_id,
-            trace_flags=trace_flags,
+            span_context=span_context,
             severity_text=None,
             severity_number=SeverityNumber.ERROR,
             body="test body",
@@ -179,15 +181,16 @@ def test_event_logger_emit_sdk_disabled(
             "name", "version", "schema_url", {"key": "value"}
         )
         now = Mock()
-        trace_id = Mock()
-        span_id = Mock()
-        trace_flags = Mock()
+        span_context = SpanContext(
+            2604504634922341076776623263868986797,
+            5213367945872657620,
+            True,
+            Mock(),
+        )
         event = Event(
             name="test_event",
             timestamp=now,
-            trace_id=trace_id,
-            span_id=span_id,
-            trace_flags=trace_flags,
+            span_context=span_context,
             body="test body",
             severity_number=SeverityNumber.ERROR,
             attributes={

opentelemetry-sdk/tests/logs/test_export.py

@@ -43,7 +43,10 @@
 from opentelemetry.sdk.resources import Resource as SDKResource
 from opentelemetry.sdk.util.instrumentation import InstrumentationScope
 from opentelemetry.trace import TraceFlags
-from opentelemetry.trace.span import INVALID_SPAN_CONTEXT
+from opentelemetry.trace.span import (
+    INVALID_SPAN_CONTEXT,
+    SpanContext,
+)
 
 EMPTY_LOG = LogData(
     log_record=LogRecord(),
@@ -522,9 +525,12 @@ def test_export(self):  # pylint: disable=no-self-use
         log_data = LogData(
             log_record=LogRecord(
                 timestamp=int(time.time() * 1e9),
-                trace_id=2604504634922341076776623263868986797,
-                span_id=5213367945872657620,
-                trace_flags=TraceFlags(0x01),
+                span_context=SpanContext(
+                    2604504634922341076776623263868986797,
+                    5213367945872657620,
+                    True,
+                    TraceFlags(0x01),
+                ),
                 severity_text="WARN",
                 severity_number=SeverityNumber.WARN,
                 body="Zhengzhou, We have a heaviest rains in 1000 years",