Skip to content

Commit f74d3e1

Browse files
committed
compat
1 parent 16649eb commit f74d3e1

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

sentry_sdk/tracing.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import json
33
import warnings
44

5-
from opentelemetry import trace as otel_trace, context
5+
from opentelemetry import trace as otel_trace, context, __version__ as OTEL_VERSION
66
from opentelemetry.trace import (
77
format_trace_id,
88
format_span_id,
@@ -11,7 +11,7 @@
1111
get_current_span,
1212
INVALID_SPAN,
1313
)
14-
from opentelemetry.trace.status import StatusCode
14+
from opentelemetry.trace.status import Status, StatusCode
1515
from opentelemetry.sdk.trace import ReadableSpan
1616

1717
import sentry_sdk
@@ -41,6 +41,7 @@
4141
from sentry_sdk.utils import (
4242
_serialize_span_attribute,
4343
get_current_thread_meta,
44+
parse_version,
4445
should_be_treated_as_error,
4546
)
4647

@@ -70,6 +71,8 @@
7071
from sentry_sdk.tracing_utils import Baggage
7172

7273

74+
OTEL_VERSION = parse_version(OTEL_VERSION)
75+
7376
tracer = otel_trace.get_tracer(__name__)
7477

7578

@@ -531,7 +534,10 @@ def set_status(self, status):
531534
otel_status = StatusCode.ERROR
532535
otel_description = status
533536

534-
self._otel_span.set_status(otel_status, otel_description)
537+
if OTEL_VERSION >= (1, 12, 0):
538+
self._otel_span.set_status(otel_status, otel_description)
539+
else:
540+
self._otel_span.set_status(Status(otel_status, otel_description))
535541

536542
def set_measurement(self, name, value, unit=""):
537543
# type: (str, float, MeasurementUnit) -> None

0 commit comments

Comments
 (0)