Skip to content

Commit

Permalink
ci(tracer): do not shutdown the global tracer
Browse files Browse the repository at this point in the history
  • Loading branch information
mabdinur committed Feb 6, 2025
1 parent 1247ac2 commit 21eddfb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 0 additions & 2 deletions tests/tracer/test_propagation.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
from tests.contrib.fastapi.conftest import test_spans as fastapi_test_spans # noqa:F401
from tests.contrib.fastapi.conftest import tracer # noqa:F401

from ..utils import flaky
from ..utils import override_env
from ..utils import override_global_config

Expand Down Expand Up @@ -837,7 +836,6 @@ def test_extract_128bit_trace_ids_tracecontext():
assert child_span.trace_id == trace_id


@flaky(1735812000, reason="FIXME: Failing due to the global tracer being used in all tests")
def test_last_dd_span_id():
non_dd_remote_context = HTTPPropagator.extract(
{
Expand Down
3 changes: 2 additions & 1 deletion tests/tracer/test_tracer.py
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,7 @@ def test_tracer_shutdown_timeout():
mock_stop.assert_called_once_with(2)


@pytest.mark.subprocess
def test_tracer_shutdown():
import mock

Expand All @@ -690,7 +691,7 @@ def test_tracer_shutdown():

mock_write.assert_not_called()


@pytest.mark.subprocess
def test_tracer_shutdown_warning():
import logging

Expand Down

0 comments on commit 21eddfb

Please sign in to comment.