Skip to content

Commit 2d51839

Browse files
authored
ref: Move otel scope out of integrations/opentelemetry/ (#4276)
Moving stuff out of `integrations/opentelemetry/` step by step since there is no OpenTelemetry integration anymore -- it's part of the core SDK. This moves `sentry_sdk/integrations/opentelemetry/scope.py` -> `sentry_sdk/opentelemetry/scope.py` Ref #3853
1 parent 759ded9 commit 2d51839

File tree

8 files changed

+9
-7
lines changed

8 files changed

+9
-7
lines changed

sentry_sdk/_init_implementation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import sentry_sdk
44
from sentry_sdk.consts import ClientConstructor
5-
from sentry_sdk.integrations.opentelemetry.scope import setup_scope_context_management
5+
from sentry_sdk.opentelemetry.scope import setup_scope_context_management
66

77
if TYPE_CHECKING:
88
from typing import Any, Optional

sentry_sdk/api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
# TODO-neel-potel make 2 scope strategies/impls and switch
1010
from sentry_sdk.scope import Scope as BaseScope
11-
from sentry_sdk.integrations.opentelemetry.scope import (
11+
from sentry_sdk.opentelemetry.scope import (
1212
PotelScope as Scope,
1313
new_scope,
1414
isolation_scope,

sentry_sdk/opentelemetry/contextvars_context.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
if TYPE_CHECKING:
1616
from typing import Optional
1717
from contextvars import Token
18-
import sentry_sdk.integrations.opentelemetry.scope as scope
18+
import sentry_sdk.opentelemetry.scope as scope
1919

2020

2121
class SentryContextVarsRuntimeContext(ContextVarsRuntimeContext):

sentry_sdk/opentelemetry/propagator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
if TYPE_CHECKING:
3838
from typing import Optional, Set
39-
import sentry_sdk.integrations.opentelemetry.scope as scope
39+
import sentry_sdk.opentelemetry.scope as scope
4040

4141

4242
class SentryPropagator(TextMapPropagator):

setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@ def get_file_text(file_name):
8585
"unleash": ["UnleashClient>=6.0.1"],
8686
},
8787
entry_points={
88-
"opentelemetry_propagator": ["sentry=sentry_sdk.opentelemetry:SentryPropagator"]
88+
"opentelemetry_propagator": [
89+
"sentry=sentry_sdk.opentelemetry:SentryPropagator"
90+
],
8991
},
9092
classifiers=[
9193
"Development Status :: 5 - Production/Stable",

tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def benchmark():
6363

6464

6565
from sentry_sdk import scope
66-
from sentry_sdk.integrations.opentelemetry.scope import (
66+
from sentry_sdk.opentelemetry.scope import (
6767
setup_scope_context_management,
6868
setup_initial_scopes,
6969
)

tests/test_scope.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
ScopeType,
1616
should_send_default_pii,
1717
)
18-
from sentry_sdk.integrations.opentelemetry.scope import (
18+
from sentry_sdk.opentelemetry.scope import (
1919
PotelScope as Scope,
2020
use_scope,
2121
use_isolation_scope,

0 commit comments

Comments
 (0)