Logs API/SDK accepts additional otel context

Author: tammy-baylis-swi

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

@@ -40,6 +40,7 @@
 from typing import Optional, cast
 
 from opentelemetry._logs.severity import SeverityNumber
+from opentelemetry.context.context import Context
 from opentelemetry.environment_variables import _OTEL_PYTHON_LOGGER_PROVIDER
 from opentelemetry.trace.span import TraceFlags
 from opentelemetry.util._once import Once
@@ -61,6 +62,7 @@ def __init__(
         self,
         timestamp: Optional[int] = None,
         observed_timestamp: Optional[int] = None,
+        context: Optional[Context] = None,
         trace_id: Optional[int] = None,
         span_id: Optional[int] = None,
         trace_flags: Optional["TraceFlags"] = None,
@@ -73,6 +75,7 @@ def __init__(
         if observed_timestamp is None:
             observed_timestamp = time_ns()
         self.observed_timestamp = observed_timestamp
+        self.context = context
         self.trace_id = trace_id
         self.span_id = span_id
         self.trace_flags = trace_flags

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

@@ -37,6 +37,7 @@
     std_to_otel,
 )
 from opentelemetry.attributes import _VALID_ANY_VALUE_TYPES, BoundedAttributes
+from opentelemetry.context.context import Context
 from opentelemetry.sdk.environment_variables import (
     OTEL_ATTRIBUTE_COUNT_LIMIT,
     OTEL_ATTRIBUTE_VALUE_LENGTH_LIMIT,
@@ -176,6 +177,7 @@ def __init__(
         self,
         timestamp: int | None = None,
         observed_timestamp: int | None = None,
+        context: Context | None = None,
         trace_id: int | None = None,
         span_id: int | None = None,
         trace_flags: TraceFlags | None = None,
@@ -190,6 +192,7 @@ def __init__(
             **{
                 "timestamp": timestamp,
                 "observed_timestamp": observed_timestamp,
+                "context": context,
                 "trace_id": trace_id,
                 "span_id": span_id,
                 "trace_flags": trace_flags,
@@ -234,6 +237,9 @@ def to_json(self, indent: int | None = 4) -> str:
                 "dropped_attributes": self.dropped_attributes,
                 "timestamp": ns_to_iso_str(self.timestamp),
                 "observed_timestamp": ns_to_iso_str(self.observed_timestamp),
+                "context": (
+                    dict(self.context) if self.context is not None else ""
+                ),
                 "trace_id": (
                     f"0x{format_trace_id(self.trace_id)}"
                     if self.trace_id is not None

opentelemetry-sdk/tests/logs/test_log_record.py

@@ -42,6 +42,7 @@ def test_log_record_to_json(self):
                 "dropped_attributes": 0,
                 "timestamp": "1970-01-01T00:00:00.000000Z",
                 "observed_timestamp": "1970-01-01T00:00:00.000000Z",
+                "context": "",
                 "trace_id": "",
                 "span_id": "",
                 "trace_flags": None,
@@ -68,7 +69,7 @@ def test_log_record_to_json(self):
         self.assertEqual(expected, actual.to_json(indent=4))
         self.assertEqual(
             actual.to_json(indent=None),
-            '{"body": "a log line", "severity_number": null, "severity_text": null, "attributes": {"mapping": {"key": "value"}, "none": null, "sequence": [1, 2], "str": "string"}, "dropped_attributes": 0, "timestamp": "1970-01-01T00:00:00.000000Z", "observed_timestamp": "1970-01-01T00:00:00.000000Z", "trace_id": "", "span_id": "", "trace_flags": null, "resource": {"attributes": {"service.name": "foo"}, "schema_url": ""}}',
+            '{"body": "a log line", "severity_number": null, "severity_text": null, "attributes": {"mapping": {"key": "value"}, "none": null, "sequence": [1, 2], "str": "string"}, "dropped_attributes": 0, "timestamp": "1970-01-01T00:00:00.000000Z", "observed_timestamp": "1970-01-01T00:00:00.000000Z", "context": "", "trace_id": "", "span_id": "", "trace_flags": null, "resource": {"attributes": {"service.name": "foo"}, "schema_url": ""}}',
         )
 
     def test_log_record_to_json_serializes_severity_number_as_int(self):