ref: Move utils, consts out of integrations/opentelemetry/

Author: sentrivana

sentry_sdk/integrations/opentelemetry/scope.py

@@ -17,17 +17,17 @@
     use_span,
 )
 
-from sentry_sdk.integrations.opentelemetry.consts import (
+from sentry_sdk.opentelemetry.consts import (
     SENTRY_SCOPES_KEY,
     SENTRY_FORK_ISOLATION_SCOPE_KEY,
     SENTRY_USE_CURRENT_SCOPE_KEY,
     SENTRY_USE_ISOLATION_SCOPE_KEY,
     TRACESTATE_SAMPLED_KEY,
 )
-from sentry_sdk.integrations.opentelemetry.utils import trace_state_from_baggage
 from sentry_sdk.opentelemetry.contextvars_context import (
     SentryContextVarsRuntimeContext,
 )
+from sentry_sdk.opentelemetry.utils import trace_state_from_baggage
 from sentry_sdk.scope import Scope, ScopeType
 from sentry_sdk.tracing import Span
 from sentry_sdk._types import TYPE_CHECKING

sentry_sdk/opentelemetry/contextvars_context.py

@@ -5,7 +5,7 @@
 from opentelemetry.context.contextvars_context import ContextVarsRuntimeContext
 
 import sentry_sdk
-from sentry_sdk.integrations.opentelemetry.consts import (
+from sentry_sdk.opentelemetry.consts import (
     SENTRY_SCOPES_KEY,
     SENTRY_FORK_ISOLATION_SCOPE_KEY,
     SENTRY_USE_CURRENT_SCOPE_KEY,

sentry_sdk/opentelemetry/propagator.py

@@ -21,7 +21,7 @@
     TraceFlags,
 )
 
-from sentry_sdk.integrations.opentelemetry.consts import (
+from sentry_sdk.opentelemetry.consts import (
     SENTRY_BAGGAGE_KEY,
     SENTRY_TRACE_KEY,
     SENTRY_SCOPES_KEY,

sentry_sdk/opentelemetry/sampler.py

@@ -6,17 +6,17 @@
 from opentelemetry.trace.span import TraceState
 
 import sentry_sdk
-from sentry_sdk.tracing_utils import (
-    _generate_sample_rand,
-    has_tracing_enabled,
-)
-from sentry_sdk.utils import is_valid_sample_rate, logger
-from sentry_sdk.integrations.opentelemetry.consts import (
+from sentry_sdk.opentelemetry.consts import (
     TRACESTATE_SAMPLED_KEY,
     TRACESTATE_SAMPLE_RAND_KEY,
     TRACESTATE_SAMPLE_RATE_KEY,
     SentrySpanAttribute,
 )
+from sentry_sdk.tracing_utils import (
+    _generate_sample_rand,
+    has_tracing_enabled,
+)
+from sentry_sdk.utils import is_valid_sample_rate, logger
 
 from typing import TYPE_CHECKING
 

sentry_sdk/opentelemetry/span_processor.py

@@ -15,14 +15,12 @@
 from sentry_sdk.consts import SPANDATA
 from sentry_sdk.tracing import DEFAULT_SPAN_ORIGIN
 from sentry_sdk.utils import get_current_thread_meta
-from sentry_sdk.opentelemetry.sampler import create_sampling_context
-from sentry_sdk.profiler.continuous_profiler import (
-    try_autostart_continuous_profiler,
-    get_profiler_id,
-    try_profile_lifecycle_trace_start,
+from sentry_sdk.opentelemetry.consts import (
+    OTEL_SENTRY_CONTEXT,
+    SentrySpanAttribute,
 )
-from sentry_sdk.profiler.transaction_profiler import Profile
-from sentry_sdk.integrations.opentelemetry.utils import (
+from sentry_sdk.opentelemetry.sampler import create_sampling_context
+from sentry_sdk.opentelemetry.utils import (
     is_sentry_span,
     convert_from_otel_timestamp,
     extract_span_attributes,
@@ -33,10 +31,12 @@
     get_sentry_meta,
     set_sentry_meta,
 )
-from sentry_sdk.integrations.opentelemetry.consts import (
-    OTEL_SENTRY_CONTEXT,
-    SentrySpanAttribute,
+from sentry_sdk.profiler.continuous_profiler import (
+    try_autostart_continuous_profiler,
+    get_profiler_id,
+    try_profile_lifecycle_trace_start,
 )
+from sentry_sdk.profiler.transaction_profiler import Profile
 from sentry_sdk._types import TYPE_CHECKING
 
 if TYPE_CHECKING:

sentry_sdk/integrations/opentelemetry/utils.py renamed to sentry_sdk/opentelemetry/utils.py

@@ -18,13 +18,13 @@
 import sentry_sdk
 from sentry_sdk.utils import Dsn
 from sentry_sdk.consts import SPANSTATUS, OP, SPANDATA
+from sentry_sdk.opentelemetry.consts import SentrySpanAttribute
 from sentry_sdk.tracing import (
     get_span_status_from_http_code,
     DEFAULT_SPAN_ORIGIN,
     LOW_QUALITY_TRANSACTION_SOURCES,
 )
 from sentry_sdk.tracing_utils import Baggage
-from sentry_sdk.integrations.opentelemetry.consts import SentrySpanAttribute
 
 from sentry_sdk._types import TYPE_CHECKING
 

sentry_sdk/tracing.py

@@ -17,6 +17,19 @@
 
 import sentry_sdk
 from sentry_sdk.consts import SPANSTATUS, SPANDATA
+from sentry_sdk.opentelemetry.consts import (
+    TRACESTATE_SAMPLE_RATE_KEY,
+    SentrySpanAttribute,
+)
+from sentry_sdk.opentelemetry.utils import (
+    baggage_from_trace_state,
+    convert_from_otel_timestamp,
+    convert_to_otel_timestamp,
+    get_trace_context,
+    get_trace_state,
+    get_sentry_meta,
+    serialize_trace_state,
+)
 from sentry_sdk.utils import (
     _serialize_span_attribute,
     get_current_thread_meta,
@@ -260,12 +273,6 @@ def __init__(
             if skip_span:
                 self._otel_span = INVALID_SPAN
             else:
-                from sentry_sdk.integrations.opentelemetry.consts import (
-                    SentrySpanAttribute,
-                )
-                from sentry_sdk.integrations.opentelemetry.utils import (
-                    convert_to_otel_timestamp,
-                )
 
                 if start_timestamp is not None:
                     # OTel timestamps have nanosecond precision
@@ -360,38 +367,26 @@ def __exit__(self, ty, value, tb):
     @property
     def description(self):
         # type: () -> Optional[str]
-        from sentry_sdk.integrations.opentelemetry.consts import SentrySpanAttribute
-
         return self.get_attribute(SentrySpanAttribute.DESCRIPTION)
 
     @description.setter
     def description(self, value):
         # type: (Optional[str]) -> None
-        from sentry_sdk.integrations.opentelemetry.consts import SentrySpanAttribute
-
         self.set_attribute(SentrySpanAttribute.DESCRIPTION, value)
 
     @property
     def origin(self):
         # type: () -> Optional[str]
-        from sentry_sdk.integrations.opentelemetry.consts import SentrySpanAttribute
-
         return self.get_attribute(SentrySpanAttribute.ORIGIN)
 
     @origin.setter
     def origin(self, value):
         # type: (Optional[str]) -> None
-        from sentry_sdk.integrations.opentelemetry.consts import SentrySpanAttribute
-
         self.set_attribute(SentrySpanAttribute.ORIGIN, value)
 
     @property
     def root_span(self):
         # type: () -> Optional[Span]
-        from sentry_sdk.integrations.opentelemetry.utils import (
-            get_sentry_meta,
-        )
-
         root_otel_span = cast(
             "Optional[OtelSpan]", get_sentry_meta(self._otel_span, "root_span")
         )
@@ -437,10 +432,6 @@ def sampled(self):
     @property
     def sample_rate(self):
         # type: () -> Optional[float]
-        from sentry_sdk.integrations.opentelemetry.consts import (
-            TRACESTATE_SAMPLE_RATE_KEY,
-        )
-
         sample_rate = self._otel_span.get_span_context().trace_state.get(
             TRACESTATE_SAMPLE_RATE_KEY
         )
@@ -449,45 +440,33 @@ def sample_rate(self):
     @property
     def op(self):
         # type: () -> Optional[str]
-        from sentry_sdk.integrations.opentelemetry.consts import SentrySpanAttribute
-
         return self.get_attribute(SentrySpanAttribute.OP)
 
     @op.setter
     def op(self, value):
         # type: (Optional[str]) -> None
-        from sentry_sdk.integrations.opentelemetry.consts import SentrySpanAttribute
-
         self.set_attribute(SentrySpanAttribute.OP, value)
 
     @property
     def name(self):
         # type: () -> Optional[str]
-        from sentry_sdk.integrations.opentelemetry.consts import SentrySpanAttribute
-
         return self.get_attribute(SentrySpanAttribute.NAME)
 
     @name.setter
     def name(self, value):
         # type: (Optional[str]) -> None
-        from sentry_sdk.integrations.opentelemetry.consts import SentrySpanAttribute
-
         self.set_attribute(SentrySpanAttribute.NAME, value)
 
     @property
     def source(self):
         # type: () -> str
-        from sentry_sdk.integrations.opentelemetry.consts import SentrySpanAttribute
-
         return (
             self.get_attribute(SentrySpanAttribute.SOURCE) or TransactionSource.CUSTOM
         )
 
     @source.setter
     def source(self, value):
         # type: (str) -> None
-        from sentry_sdk.integrations.opentelemetry.consts import SentrySpanAttribute
-
         self.set_attribute(SentrySpanAttribute.SOURCE, value)
 
     @property
@@ -500,10 +479,6 @@ def start_timestamp(self):
         if start_time is None:
             return None
 
-        from sentry_sdk.integrations.opentelemetry.utils import (
-            convert_from_otel_timestamp,
-        )
-
         return convert_from_otel_timestamp(start_time)
 
     @property
@@ -516,10 +491,6 @@ def timestamp(self):
         if end_time is None:
             return None
 
-        from sentry_sdk.integrations.opentelemetry.utils import (
-            convert_from_otel_timestamp,
-        )
-
         return convert_from_otel_timestamp(end_time)
 
     def start_child(self, **kwargs):
@@ -529,11 +500,6 @@ def start_child(self, **kwargs):
     def iter_headers(self):
         # type: () -> Iterator[Tuple[str, str]]
         yield SENTRY_TRACE_HEADER_NAME, self.to_traceparent()
-
-        from sentry_sdk.integrations.opentelemetry.utils import (
-            serialize_trace_state,
-        )
-
         yield BAGGAGE_HEADER_NAME, serialize_trace_state(self.trace_state)
 
     def to_traceparent(self):
@@ -554,10 +520,6 @@ def to_traceparent(self):
     @property
     def trace_state(self):
         # type: () -> TraceState
-        from sentry_sdk.integrations.opentelemetry.utils import (
-            get_trace_state,
-        )
-
         return get_trace_state(self._otel_span)
 
     def to_baggage(self):
@@ -566,16 +528,10 @@ def to_baggage(self):
 
     def get_baggage(self):
         # type: () -> Baggage
-        from sentry_sdk.integrations.opentelemetry.utils import (
-            baggage_from_trace_state,
-        )
-
         return baggage_from_trace_state(self.trace_state)
 
     def set_tag(self, key, value):
         # type: (str, Any) -> None
-        from sentry_sdk.integrations.opentelemetry.consts import SentrySpanAttribute
-
         self.set_attribute(f"{SentrySpanAttribute.TAG}.{key}", value)
 
     def set_data(self, key, value):
@@ -642,8 +598,6 @@ def set_status(self, status):
 
     def set_measurement(self, name, value, unit=""):
         # type: (str, float, MeasurementUnit) -> None
-        from sentry_sdk.integrations.opentelemetry.consts import SentrySpanAttribute
-
         # Stringify value here since OTel expects all seq items to be of one type
         self.set_attribute(
             f"{SentrySpanAttribute.MEASUREMENT}.{name}", (str(value), unit)
@@ -674,10 +628,6 @@ def is_success(self):
     def finish(self, end_timestamp=None):
         # type: (Optional[Union[float, datetime]]) -> None
         if end_timestamp is not None:
-            from sentry_sdk.integrations.opentelemetry.utils import (
-                convert_to_otel_timestamp,
-            )
-
             self._otel_span.end(convert_to_otel_timestamp(end_timestamp))
         else:
             self._otel_span.end()
@@ -696,16 +646,10 @@ def get_trace_context(self):
         if not isinstance(self._otel_span, ReadableSpan):
             return {}
 
-        from sentry_sdk.integrations.opentelemetry.utils import (
-            get_trace_context,
-        )
-
         return get_trace_context(self._otel_span)
 
     def set_context(self, key, value):
         # type: (str, Any) -> None
-        from sentry_sdk.integrations.opentelemetry.consts import SentrySpanAttribute
-
         # TODO-neel-potel we cannot add dicts here
 
         self.set_attribute(f"{SentrySpanAttribute.CONTEXT}.{key}", value)