Skip to content

Commit b10834d

Browse files
committed
fix
1 parent bfd9562 commit b10834d

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

sentry_sdk/opentelemetry/tracing.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from opentelemetry import trace
22
from opentelemetry.propagate import set_global_textmap
33
from opentelemetry.sdk.trace import TracerProvider, Span, ReadableSpan
4-
from opentelemetry.trace import _TRACER_PROVIDER_SET_ONCE
54

65
from sentry_sdk.opentelemetry import (
76
SentryPropagator,
@@ -33,6 +32,8 @@ def setup_sentry_tracing():
3332

3433
# TracerProvider can only be set once. If we're the first ones setting it,
3534
# there's no issue. If it already exists, we need to patch it.
35+
from opentelemetry.trace import _TRACER_PROVIDER_SET_ONCE
36+
3637
if _TRACER_PROVIDER_SET_ONCE._done:
3738
logger.debug("[Tracing] Detected an existing TracerProvider, patching")
3839
tracer_provider = trace.get_tracer_provider()

tests/conftest.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ def clean_scopes():
8383
setup_initial_scopes()
8484

8585

86-
def clean_tracer(autouse=True):
86+
@pytest.fixture(autouse=True)
87+
def clean_tracer():
8788
"""Reset TracerProvider so that we can set it up from scratch."""
8889
otel_trace._TRACER_PROVIDER_SET_ONCE = Once()
8990
otel_trace._TRACER_PROVIDER = None

0 commit comments

Comments
 (0)