From c019c0c3cb5441be6278cfd111a053ef37d3abbb Mon Sep 17 00:00:00 2001 From: Florian Schepers Date: Wed, 22 May 2024 12:05:42 +0200 Subject: [PATCH] Adapt File Tracer --- src/intelligence_layer/core/task.py | 2 +- .../core/tracer/composite_tracer.py | 19 +++++- .../core/tracer/file_tracer.py | 23 ++----- .../core/tracer/in_memory_tracer.py | 20 ++++-- .../core/tracer/open_telemetry_tracer.py | 11 +++- .../core/tracer/persistent_tracer.py | 38 ++++++------ src/intelligence_layer/core/tracer/tracer.py | 8 ++- .../fixtures/old_file_trace_format.jsonl | 11 ++++ tests/core/tracer/test_composite_tracer.py | 25 ++++++-- tests/core/tracer/test_file_tracer.py | 61 ++++++++++++------- tests/core/tracer/test_in_memory_tracer.py | 1 + tests/core/tracer/test_tracer.py | 17 ++---- 12 files changed, 146 insertions(+), 90 deletions(-) create mode 100644 tests/core/tracer/fixtures/old_file_trace_format.jsonl diff --git a/src/intelligence_layer/core/task.py b/src/intelligence_layer/core/task.py index a0f6636da..cc03d10e0 100644 --- a/src/intelligence_layer/core/task.py +++ b/src/intelligence_layer/core/task.py @@ -59,7 +59,7 @@ def do_run(self, input: Input, task_span: TaskSpan) -> Output: @final def run( - self, input: Input, tracer: Tracer, trace_id: Optional[str] = None + self, input: Input, tracer: Tracer ) -> Output: """Executes the implementation of `do_run` for this use case. diff --git a/src/intelligence_layer/core/tracer/composite_tracer.py b/src/intelligence_layer/core/tracer/composite_tracer.py index a8a255040..56c67053a 100644 --- a/src/intelligence_layer/core/tracer/composite_tracer.py +++ b/src/intelligence_layer/core/tracer/composite_tracer.py @@ -2,13 +2,13 @@ from typing import Generic, Optional, Sequence, TypeVar from intelligence_layer.core.tracer.tracer import ( + Context, ExportedSpan, PydanticSerializable, Span, TaskSpan, Tracer, utc_now, - Context ) TracerVar = TypeVar("TracerVar", bound=Tracer) @@ -73,7 +73,10 @@ class CompositeSpan(Generic[SpanVar], CompositeTracer[SpanVar], Span): Args: tracers: spans that will be forwarded all subsequent log and span calls. """ - def __init__(self, tracers: Sequence[SpanVar],context: Optional[Context] = None) -> None: + + def __init__( + self, tracers: Sequence[SpanVar], context: Optional[Context] = None + ) -> None: CompositeTracer.__init__(self, tracers) Span.__init__(self, context=context) @@ -92,6 +95,18 @@ def end(self, timestamp: Optional[datetime] = None) -> None: for tracer in self.tracers: tracer.end(timestamp) + @property + def status_code(self): + status_codes = {tracer.status_code for tracer in self.tracers} + if len(status_codes) > 1: + raise ValueError("Inconsistent status of traces in composite tracer. Status of all traces should be the same but they are different.") + return status_code[0] + + @status_code.setter + def status_code(self, value): + for tracer in self.tracers: + tracer.status_code = value + class CompositeTaskSpan(CompositeSpan[TaskSpan], TaskSpan): """A :class:`TaskSpan` that allows for recording to multiple TaskSpans simultaneously. diff --git a/src/intelligence_layer/core/tracer/file_tracer.py b/src/intelligence_layer/core/tracer/file_tracer.py index e2c9209cc..4615e9227 100644 --- a/src/intelligence_layer/core/tracer/file_tracer.py +++ b/src/intelligence_layer/core/tracer/file_tracer.py @@ -1,7 +1,7 @@ from datetime import datetime from json import loads from pathlib import Path -from typing import Optional, Sequence +from typing import Optional from pydantic import BaseModel @@ -11,22 +11,8 @@ PersistentTaskSpan, PersistentTracer, ) -from intelligence_layer.core.tracer.tracer import LogLine, PydanticSerializable -from intelligence_layer.core.tracer.tracer import ( - Context, - Event, - ExportedSpan, - ExportedSpanList, - LogEntry, - PydanticSerializable, - Span, - SpanAttributes, - TaskSpan, - TaskSpanAttributes, - Tracer, - _render_log_value, - utc_now, -) +from intelligence_layer.core.tracer.tracer import Context, LogLine, PydanticSerializable + class FileTracer(PersistentTracer): """A `Tracer` that logs to a file. @@ -91,16 +77,15 @@ def trace(self, trace_id: Optional[str] = None) -> InMemoryTracer: return self._parse_log(filtered_traces) - class FileSpan(PersistentSpan, FileTracer): """A `Span` created by `FileTracer.span`.""" def __init__(self, log_file_path: Path, context: Optional[Context] = None) -> None: PersistentSpan.__init__(self, context=context) FileTracer.__init__(self, log_file_path=log_file_path) - class FileTaskSpan(PersistentTaskSpan, FileSpan): """A `TaskSpan` created by `FileTracer.task_span`.""" + pass diff --git a/src/intelligence_layer/core/tracer/in_memory_tracer.py b/src/intelligence_layer/core/tracer/in_memory_tracer.py index 124cef20b..18780dd82 100644 --- a/src/intelligence_layer/core/tracer/in_memory_tracer.py +++ b/src/intelligence_layer/core/tracer/in_memory_tracer.py @@ -5,7 +5,7 @@ import requests import rich -from pydantic import BaseModel, Field, SerializeAsAny +from pydantic import SerializeAsAny from requests import HTTPError from rich.tree import Tree @@ -157,6 +157,7 @@ def log( def end(self, timestamp: Optional[datetime] = None) -> None: if not self.end_timestamp: self.end_timestamp = timestamp or utc_now() + super().end(timestamp) def _rich_render_(self) -> Tree: """Renders the trace via classes in the `rich` package""" @@ -171,6 +172,8 @@ def _span_attributes(self) -> SpanAttributes: return SpanAttributes() def export_for_viewing(self) -> Sequence[ExportedSpan]: + if not self._closed: + raise RuntimeError("Span is not closed. A Span must be closed befor it is exported for viewing.") logs: list[LogEntry] = [] exported_spans: list[ExportedSpan] = [] for entry in self.entries: @@ -246,9 +249,11 @@ def start_task(self, log_line: LogLine) -> None: name=start_task.name, input=start_task.input, start_timestamp=start_task.start, - context=Context( + context=Context( trace_id=start_task.trace_id, span_id=str(start_task.parent) - ) if start_task.trace_id != str(start_task.uuid) else None + ) + if start_task.trace_id != str(start_task.uuid) + else None, ) # if root, also change the trace id if converted_span.context.trace_id == converted_span.context.span_id: @@ -262,6 +267,7 @@ def end_task(self, log_line: LogLine) -> None: end_task = EndTask.model_validate(log_line.entry) task_span = self.tasks[end_task.uuid] task_span.record_output(end_task.output) + task_span.status_code = end_task.status_code task_span.end(end_task.end) def start_span(self, log_line: LogLine) -> None: @@ -271,13 +277,15 @@ def start_span(self, log_line: LogLine) -> None: start_timestamp=start_span.start, context=Context( trace_id=start_span.trace_id, span_id=str(start_span.parent) - ) if start_span.trace_id != str(start_span.uuid) else None + ) + if start_span.trace_id != str(start_span.uuid) + else None, ) # if root, also change the trace id if converted_span.context.trace_id == converted_span.context.span_id: converted_span.context.trace_id = str(start_span.uuid) converted_span.context.span_id = str(start_span.uuid) - + self.tracers.get(start_span.parent, self.root).entries.append(converted_span) self.tracers[start_span.uuid] = converted_span self.spans[start_span.uuid] = converted_span @@ -285,8 +293,10 @@ def start_span(self, log_line: LogLine) -> None: def end_span(self, log_line: LogLine) -> None: end_span = EndSpan.model_validate(log_line.entry) span = self.spans[end_span.uuid] + span.status_code = end_span.status_code span.end(end_span.end) + def plain_entry(self, log_line: LogLine) -> None: plain_entry = PlainEntry.model_validate(log_line.entry) entry = LogEntry( diff --git a/src/intelligence_layer/core/tracer/open_telemetry_tracer.py b/src/intelligence_layer/core/tracer/open_telemetry_tracer.py index 82da828c5..cc7b6149d 100644 --- a/src/intelligence_layer/core/tracer/open_telemetry_tracer.py +++ b/src/intelligence_layer/core/tracer/open_telemetry_tracer.py @@ -1,5 +1,5 @@ from datetime import datetime -from typing import Optional +from typing import Optional, Sequence from opentelemetry.context import attach, detach from opentelemetry.trace import Span as OpenTSpan @@ -7,6 +7,8 @@ from opentelemetry.trace import set_span_in_context from intelligence_layer.core.tracer.tracer import ( + ExportedSpan, + LogEntry, PydanticSerializable, Span, TaskSpan, @@ -19,7 +21,7 @@ class OpenTelemetryTracer(Tracer): """A `Tracer` that uses open telemetry.""" def __init__(self, tracer: OpenTTracer) -> None: - self._tracer = tracer + self.O_tracer = tracer def span( self, @@ -34,6 +36,7 @@ def span( start_time=None if not timestamp else _open_telemetry_timestamp(timestamp), ) token = attach(set_span_in_context(tracer_span)) + self._tracer return OpenTelemetrySpan(tracer_span, self._tracer, token, trace_id) def task_span( @@ -52,6 +55,9 @@ def task_span( ) token = attach(set_span_in_context(tracer_span)) return OpenTelemetryTaskSpan(tracer_span, self._tracer, token, trace_id) + + def export_for_viewing(self) -> Sequence[ExportedSpan]: + raise NotImplementedError("The OpenTelemetryTracer does not support export for viewing, as it can not acces its own traces.") class OpenTelemetrySpan(Span, OpenTelemetryTracer): @@ -87,6 +93,7 @@ def end(self, timestamp: Optional[datetime] = None) -> None: self.open_ts_span.end( _open_telemetry_timestamp(timestamp) if timestamp is not None else None ) + super().end(timestamp) class OpenTelemetryTaskSpan(TaskSpan, OpenTelemetrySpan): diff --git a/src/intelligence_layer/core/tracer/persistent_tracer.py b/src/intelligence_layer/core/tracer/persistent_tracer.py index 0cd5435f1..3030f2a66 100644 --- a/src/intelligence_layer/core/tracer/persistent_tracer.py +++ b/src/intelligence_layer/core/tracer/persistent_tracer.py @@ -9,6 +9,7 @@ from intelligence_layer.core.tracer.tracer import ( EndSpan, EndTask, + ExportedSpan, LogLine, PlainEntry, PydanticSerializable, @@ -20,26 +21,11 @@ utc_now, ) -from intelligence_layer.core.tracer.tracer import ( - Context, - Event, - ExportedSpan, - ExportedSpanList, - LogEntry, - PydanticSerializable, - Span, - SpanAttributes, - TaskSpan, - TaskSpanAttributes, - Tracer, - _render_log_value, - utc_now, -) class PersistentTracer(Tracer, ABC): def __init__(self) -> None: self.current_id = uuid4() - + @abstractmethod def _log_entry(self, id: str, entry: BaseModel) -> None: pass @@ -77,7 +63,9 @@ def _log_task( task_span.context.trace_id, StartTask( uuid=task_span.context.span_id, - parent=self.context.span_id if self.context else task_span.context.trace_id, + parent=self.context.span_id + if self.context + else task_span.context.trace_id, name=task_name, start=timestamp or utc_now(), input=input, @@ -89,7 +77,9 @@ def _log_task( task_span.context.trace_id, StartTask( uuid=task_span.context.span_id, - parent=self.context.span_id if self.context else task_span.context.trace_id, + parent=self.context.span_id + if self.context + else task_span.context.trace_id, name=task_name, start=timestamp or utc_now(), input=error.description, @@ -151,7 +141,10 @@ def log( def end(self, timestamp: Optional[datetime] = None) -> None: if not self.end_timestamp: self.end_timestamp = timestamp or utc_now() - self._log_entry(self.context.trace_id, EndSpan(uuid=self.context.span_id, end=self.end_timestamp)) + self._log_entry( + self.context.trace_id, + EndSpan(uuid=self.context.span_id, end=self.end_timestamp, status_code=self.status_code), + ) class PersistentTaskSpan(TaskSpan, PersistentSpan, ABC): @@ -165,7 +158,12 @@ def end(self, timestamp: Optional[datetime] = None) -> None: self.end_timestamp = timestamp or utc_now() self._log_entry( self.context.trace_id, - EndTask(uuid=self.context.span_id, end=self.end_timestamp, output=self.output), + EndTask( + uuid=self.context.span_id, + end=self.end_timestamp, + output=self.output, + status_code=self.status_code + ), ) diff --git a/src/intelligence_layer/core/tracer/tracer.py b/src/intelligence_layer/core/tracer/tracer.py index d726540c2..c5cb4a75f 100644 --- a/src/intelligence_layer/core/tracer/tracer.py +++ b/src/intelligence_layer/core/tracer/tracer.py @@ -204,7 +204,7 @@ class Span(Tracer, AbstractContextManager["Span"]): """ def __init__(self, context: Optional[Context] = None): - #super().__init__() + # super().__init__() span_id = str(uuid4()) if context is None: trace_id = span_id @@ -216,7 +216,7 @@ def __init__(self, context: Optional[Context] = None): def __enter__(self) -> Self: if self._closed: - raise ValueError("Spans cannot be opened once they have been close.") + raise ValueError("Spans cannot be opened once they have been closed.") return self @abstractmethod @@ -252,7 +252,7 @@ def end(self, timestamp: Optional[datetime] = None) -> None: Args: timestamp: Optional override of the timestamp, otherwise should be set to now. """ - ... + self._closed = True def ensure_id(self, id: str | None) -> str: """Returns a valid id for tracing. @@ -444,6 +444,7 @@ class EndTask(BaseModel): uuid: UUID end: datetime output: SerializeAsAny[PydanticSerializable] + status_code: SpanStatus = SpanStatus.OK class StartSpan(BaseModel): @@ -475,6 +476,7 @@ class EndSpan(BaseModel): uuid: UUID end: datetime + status_code: SpanStatus = SpanStatus.OK class PlainEntry(BaseModel): diff --git a/tests/core/tracer/fixtures/old_file_trace_format.jsonl b/tests/core/tracer/fixtures/old_file_trace_format.jsonl new file mode 100644 index 000000000..bf1fb390e --- /dev/null +++ b/tests/core/tracer/fixtures/old_file_trace_format.jsonl @@ -0,0 +1,11 @@ +{"trace_id":"00b96d92-d1d1-454a-b8e9-f67e8541759a","entry_type":"StartTask","entry":{"uuid":"41528209-1b78-4785-a00d-7f65af1bb09c","parent":"75e79a11-1a26-4731-8b49-ef8634c352ed","name":"TestTask","start":"2024-05-22T09:43:37.428758Z","input":"input","trace_id":"00b96d92-d1d1-454a-b8e9-f67e8541759a"}} +{"trace_id":"00b96d92-d1d1-454a-b8e9-f67e8541759a","entry_type":"StartSpan","entry":{"uuid":"ad1ed79b-6ad6-4ea5-8ee8-26be4055e228","parent":"41528209-1b78-4785-a00d-7f65af1bb09c","name":"span","start":"2024-05-22T09:43:37.429448Z","trace_id":"00b96d92-d1d1-454a-b8e9-f67e8541759a"}} +{"trace_id":"00b96d92-d1d1-454a-b8e9-f67e8541759a","entry_type":"PlainEntry","entry":{"message":"message","value":"a value","timestamp":"2024-05-22T09:43:37.429503Z","parent":"ad1ed79b-6ad6-4ea5-8ee8-26be4055e228","trace_id":"00b96d92-d1d1-454a-b8e9-f67e8541759a"}} +{"trace_id":"00b96d92-d1d1-454a-b8e9-f67e8541759a","entry_type":"StartTask","entry":{"uuid":"e8cca541-57a8-440a-b848-7c3b33a97f52","parent":"ad1ed79b-6ad6-4ea5-8ee8-26be4055e228","name":"TestSubTask","start":"2024-05-22T09:43:37.429561Z","input":null,"trace_id":"00b96d92-d1d1-454a-b8e9-f67e8541759a"}} +{"trace_id":"00b96d92-d1d1-454a-b8e9-f67e8541759a","entry_type":"PlainEntry","entry":{"message":"subtask","value":"value","timestamp":"2024-05-22T09:43:37.429605Z","parent":"e8cca541-57a8-440a-b848-7c3b33a97f52","trace_id":"00b96d92-d1d1-454a-b8e9-f67e8541759a"}} +{"trace_id":"00b96d92-d1d1-454a-b8e9-f67e8541759a","entry_type":"EndTask","entry":{"uuid":"e8cca541-57a8-440a-b848-7c3b33a97f52","end":"2024-05-22T09:43:37.429647Z","output":null}} +{"trace_id":"00b96d92-d1d1-454a-b8e9-f67e8541759a","entry_type":"EndSpan","entry":{"uuid":"ad1ed79b-6ad6-4ea5-8ee8-26be4055e228","end":"2024-05-22T09:43:37.429687Z"}} +{"trace_id":"00b96d92-d1d1-454a-b8e9-f67e8541759a","entry_type":"StartTask","entry":{"uuid":"8840185c-2019-4105-9178-1b0e20ab6388","parent":"41528209-1b78-4785-a00d-7f65af1bb09c","name":"TestSubTask","start":"2024-05-22T09:43:37.429728Z","input":null,"trace_id":"00b96d92-d1d1-454a-b8e9-f67e8541759a"}} +{"trace_id":"00b96d92-d1d1-454a-b8e9-f67e8541759a","entry_type":"PlainEntry","entry":{"message":"subtask","value":"value","timestamp":"2024-05-22T09:43:37.429768Z","parent":"8840185c-2019-4105-9178-1b0e20ab6388","trace_id":"00b96d92-d1d1-454a-b8e9-f67e8541759a"}} +{"trace_id":"00b96d92-d1d1-454a-b8e9-f67e8541759a","entry_type":"EndTask","entry":{"uuid":"8840185c-2019-4105-9178-1b0e20ab6388","end":"2024-05-22T09:43:37.429806Z","output":null}} +{"trace_id":"00b96d92-d1d1-454a-b8e9-f67e8541759a","entry_type":"EndTask","entry":{"uuid":"41528209-1b78-4785-a00d-7f65af1bb09c","end":"2024-05-22T09:43:37.429842Z","output":"output"}} diff --git a/tests/core/tracer/test_composite_tracer.py b/tests/core/tracer/test_composite_tracer.py index 06cc3bae2..9e123b5c2 100644 --- a/tests/core/tracer/test_composite_tracer.py +++ b/tests/core/tracer/test_composite_tracer.py @@ -1,8 +1,5 @@ -from intelligence_layer.core import ( - CompositeTracer, - InMemoryTracer, - Task, -) +import pytest +from intelligence_layer.core import CompositeTracer, InMemoryTracer, Task def test_composite_tracer(test_task: Task[str, str]) -> None: @@ -17,3 +14,21 @@ def test_composite_tracer(test_task: Task[str, str]) -> None: assert trace_1.status == trace_2.status assert trace_1.context.trace_id != trace_2.context.trace_id assert trace_1.context.span_id != trace_2.context.span_id + +def test_composite_tracer_raises_for_inconsistent_span_status(test_task: Task[str, str]) -> None: + tracer_1 = InMemoryTracer() + tracer_2 = InMemoryTracer() + + composite_tracer = CompositeTracer([tracer_1, tracer_2]) + + with composite_tracer.span("test_name") as composite_span: + spans = composite_span.tracers + single_span = spans[0] + try: + with single_span: + raise Exception + except Exception: + pass + + with pytest.raises(ValueError): + composite_span.status_code diff --git a/tests/core/tracer/test_file_tracer.py b/tests/core/tracer/test_file_tracer.py index afc55ef5b..b97b02276 100644 --- a/tests/core/tracer/test_file_tracer.py +++ b/tests/core/tracer/test_file_tracer.py @@ -5,35 +5,37 @@ from pytest import fixture from intelligence_layer.core import CompositeTracer, FileTracer, InMemoryTracer, Task +from intelligence_layer.core.tracer.in_memory_tracer import InMemoryTaskSpan from intelligence_layer.core.tracer.persistent_tracer import TracerLogEntryFailed - +from tests.core.tracer.conftest import TestException @fixture def file_tracer(tmp_path: Path) -> FileTracer: return FileTracer(tmp_path / "log.log") -def test_file_tracer(file_tracer: FileTracer, test_task: Task[str, str]) -> None: - input = "input" - expected = InMemoryTracer() - - test_task.run(input, file_tracer) - - log_tree = file_tracer.trace() - trace_1 = log_tree.export_for_viewing() - - - def test_file_tracer_retrieves_correct_trace( file_tracer: FileTracer, test_task: Task[str, str] ) -> None: input = "input" - expected = InMemoryTracer() - compositeTracer = CompositeTracer([expected, file_tracer]) - test_task.run(input, compositeTracer, "ID1") - test_task.run(input, file_tracer, "ID2") - log_tree = file_tracer.trace("ID1") - assert log_tree.export_for_viewing() == expected.export_for_viewing() + test_task.run(input, file_tracer) + expected_trace = file_tracer.trace() + test_task.run(input, file_tracer) + assert len(expected_trace.entries) == 1 + assert expected_trace.entries[0].context is not None + retrieved_trace = file_tracer.trace(expected_trace.entries[0].context.trace_id) + assert retrieved_trace.export_for_viewing() == expected_trace.export_for_viewing() + +def test_file_tracer_retrieves_all_file_traces( + file_tracer: FileTracer, test_task: Task[str, str] + ) -> None: + input = "input" + + test_task.run(input, file_tracer) + test_task.run(input, file_tracer) + traces = file_tracer.trace() + assert len(traces.entries) == 2 + assert traces.entries[0].context.trace_id != traces.entries[1].context.trace_id def test_file_tracer_handles_tracer_log_entry_failed_exception( @@ -45,7 +47,7 @@ def test_file_tracer_handles_tracer_log_entry_failed_exception( try: file_tracer.task_span( - task_name="mock_task_name", input="42", timestamp=None, trace_id="21" + task_name="mock_task_name", input="42", timestamp=None ) except Exception as exception: assert False, f"'Unexpected exception: {exception}" @@ -54,8 +56,23 @@ def test_file_tracer_handles_tracer_log_entry_failed_exception( def test_file_tracer_raises_non_log_entry_failed_exceptions( file_tracer: FileTracer, ) -> None: - file_tracer._log_entry = Mock(side_effect=[Exception("Hi I am an error", "21")]) # type: ignore[method-assign] - with pytest.raises(Exception): + file_tracer._log_entry = Mock(side_effect=[TestException("Hi I am an error", "21")]) # type: ignore[method-assign] + with pytest.raises(TestException): file_tracer.task_span( - task_name="mock_task_name", input="42", timestamp=None, trace_id="21" + task_name="mock_task_name", input="42", timestamp=None ) + + +def test_file_tracer_is_backwards_compatible() -> None: + current_file_location = Path(__file__) + file_tracer = FileTracer( + current_file_location.parent / "fixtures/old_file_trace_format.jsonl" + ) + tracer = file_tracer.trace() + + assert len(tracer.entries) == 1 + task_span = tracer.entries[0] + assert isinstance(task_span, InMemoryTaskSpan) + assert task_span.input == "input" + assert task_span.start_timestamp and task_span.end_timestamp + assert task_span.start_timestamp < task_span.end_timestamp diff --git a/tests/core/tracer/test_in_memory_tracer.py b/tests/core/tracer/test_in_memory_tracer.py index afebd2760..bc9c16695 100644 --- a/tests/core/tracer/test_in_memory_tracer.py +++ b/tests/core/tracer/test_in_memory_tracer.py @@ -106,6 +106,7 @@ def test_task_span_records_error_value() -> None: def test_task_automatically_logs_input_and_output( test_task: Task[str, str], ) -> None: + input = "input" tracer = InMemoryTracer() output = test_task.run(input=input, tracer=tracer) diff --git a/tests/core/tracer/test_tracer.py b/tests/core/tracer/test_tracer.py index 749857c08..25d5b091c 100644 --- a/tests/core/tracer/test_tracer.py +++ b/tests/core/tracer/test_tracer.py @@ -50,7 +50,9 @@ def test_tracer_exports_spans_to_unified_format( assert len(span.events) == 1 log = span.events[0] assert log.message == "test" - assert log.body == dummy_object or DummyObject.model_validate(log.body) == dummy_object + assert ( + log.body == dummy_object or DummyObject.model_validate(log.body) == dummy_object + ) assert span.start_time < log.timestamp < span.end_time @@ -168,7 +170,7 @@ def test_tracer_exports_unrelated_spans_correctly( "tracer_fixture", tracer_fixtures, ) -def test_tracer_exports_part_of_a_trace_correctly( +def test_tracer_raises_if_open_span_is_exported( tracer_fixture: str, request: pytest.FixtureRequest, ) -> None: @@ -178,15 +180,8 @@ def test_tracer_exports_part_of_a_trace_correctly( child_span = root_span.span("name-2") child_span.log("test_message", "test_body") - unified_format = child_span.export_for_viewing() - - assert len(unified_format) == 2 - span_1, span_2 = unified_format[0], unified_format[1] - - assert span_1.parent_id is None - assert span_2.parent_id is None - - assert span_1.context.trace_id != span_2.context.trace_id + with pytest.raises(RuntimeError): + child_span.export_for_viewing() @pytest.mark.skip("Not yet implemented")