Skip to content

Commit 01c42de

Browse files
committed
update: use context instead of trace_id, span_id, trace_flags at eventAPI
Signed-off-by: Faakhir30 <[email protected]>
1 parent 415c94f commit 01c42de

File tree

2 files changed

+14
-19
lines changed

2 files changed

+14
-19
lines changed

Diff for: opentelemetry-api/src/opentelemetry/_events/__init__.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from opentelemetry.environment_variables import (
2323
_OTEL_PYTHON_EVENT_LOGGER_PROVIDER,
2424
)
25-
from opentelemetry.trace.span import TraceFlags
25+
from opentelemetry.trace.span import SpanContext
2626
from opentelemetry.util._once import Once
2727
from opentelemetry.util._providers import _load_provider
2828
from opentelemetry.util.types import Attributes
@@ -35,15 +35,18 @@ def __init__(
3535
self,
3636
name: str,
3737
timestamp: Optional[int] = None,
38-
trace_id: Optional[int] = None,
39-
span_id: Optional[int] = None,
40-
trace_flags: Optional["TraceFlags"] = None,
38+
span_context: Optional[SpanContext] = None,
4139
body: Optional[Any] = None,
4240
severity_number: Optional[SeverityNumber] = None,
4341
attributes: Optional[Attributes] = None,
4442
):
4543
attributes = attributes or {}
4644
event_attributes = {**attributes, "event.name": name}
45+
trace_id = span_id = trace_flags = None
46+
if span_context:
47+
trace_id = span_context.trace_id
48+
span_id = span_context.span_id
49+
trace_flags = span_context.trace_flags
4750
super().__init__(
4851
timestamp=timestamp,
4952
trace_id=trace_id,

Diff for: opentelemetry-sdk/tests/events/test_events.py

+7-15
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,11 @@ def test_event_logger_emit(self, logger_mock, log_record_mock):
123123
"name", "version", "schema_url", {"key": "value"}
124124
)
125125
now = Mock()
126-
trace_id = Mock()
127-
span_id = Mock()
128-
trace_flags = Mock()
126+
span_context = Mock()
129127
event = Event(
130128
name="test_event",
131129
timestamp=now,
132-
trace_id=trace_id,
133-
span_id=span_id,
134-
trace_flags=trace_flags,
130+
span_context=span_context,
135131
body="test body",
136132
severity_number=SeverityNumber.ERROR,
137133
attributes={
@@ -146,9 +142,9 @@ def test_event_logger_emit(self, logger_mock, log_record_mock):
146142
log_record_mock.assert_called_once_with(
147143
timestamp=now,
148144
observed_timestamp=None,
149-
trace_id=trace_id,
150-
span_id=span_id,
151-
trace_flags=trace_flags,
145+
trace_id=span_context.trace_id,
146+
span_id=span_context.span_id,
147+
trace_flags=span_context.trace_flags,
152148
severity_text=None,
153149
severity_number=SeverityNumber.ERROR,
154150
body="test body",
@@ -179,15 +175,11 @@ def test_event_logger_emit_sdk_disabled(
179175
"name", "version", "schema_url", {"key": "value"}
180176
)
181177
now = Mock()
182-
trace_id = Mock()
183-
span_id = Mock()
184-
trace_flags = Mock()
178+
span_context = Mock()
185179
event = Event(
186180
name="test_event",
187181
timestamp=now,
188-
trace_id=trace_id,
189-
span_id=span_id,
190-
trace_flags=trace_flags,
182+
span_context=span_context,
191183
body="test body",
192184
severity_number=SeverityNumber.ERROR,
193185
attributes={

0 commit comments

Comments
 (0)