Skip to content

Commit b4b202f

Browse files
committed
circ imps in sphinx.......
1 parent e6d5808 commit b4b202f

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
from opentelemetry.version import __version__ as OTEL_VERSION
2-
31
from sentry_sdk.opentelemetry.propagator import SentryPropagator
42
from sentry_sdk.opentelemetry.sampler import SentrySampler
53
from sentry_sdk.opentelemetry.span_processor import SentrySpanProcessor
6-
from sentry_sdk.utils import parse_version
74

85
__all__ = [
96
"SentryPropagator",
107
"SentrySampler",
118
"SentrySpanProcessor",
129
]
13-
14-
OTEL_VERSION = parse_version(OTEL_VERSION)

sentry_sdk/tracing.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
)
1414
from opentelemetry.trace.status import Status, StatusCode
1515
from opentelemetry.sdk.trace import ReadableSpan
16+
from opentelemetry.version import __version__ as _OTEL_VERSION
1617

1718
import sentry_sdk
1819
from sentry_sdk.consts import (
@@ -24,7 +25,6 @@
2425
SPANDATA,
2526
TransactionSource,
2627
)
27-
from sentry_sdk.opentelemetry import OTEL_VERSION
2828
from sentry_sdk.opentelemetry.consts import (
2929
TRACESTATE_SAMPLE_RATE_KEY,
3030
SentrySpanAttribute,
@@ -42,6 +42,7 @@
4242
from sentry_sdk.utils import (
4343
_serialize_span_attribute,
4444
get_current_thread_meta,
45+
parse_version,
4546
should_be_treated_as_error,
4647
)
4748

@@ -71,6 +72,8 @@
7172
from sentry_sdk.tracing_utils import Baggage
7273

7374

75+
_OTEL_VERSION = parse_version(_OTEL_VERSION)
76+
7477
tracer = otel_trace.get_tracer(__name__)
7578

7679

@@ -532,7 +535,7 @@ def set_status(self, status):
532535
otel_status = StatusCode.ERROR
533536
otel_description = status
534537

535-
if OTEL_VERSION >= (1, 12, 0):
538+
if _OTEL_VERSION >= (1, 12, 0):
536539
self._otel_span.set_status(otel_status, otel_description)
537540
else:
538541
self._otel_span.set_status(Status(otel_status, otel_description))

0 commit comments

Comments
 (0)