8000 ref: Move propagator out of `integrations/opentelemetry/` by sentrivana · Pull Request #4260 · getsentry/sentry-python · GitHub
[go: up one dir, main page]

Skip to content

ref: Move propagator out of integrations/opentelemetry/ #4260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Apr 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions sentry_sdk/integrations/opentelemetry/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +0,0 @@
from sentry_sdk.integrations.opentelemetry.propagator import SentryPropagator

__all__ = [
"SentryPropagator",
]
7 changes: 5 additions & 2 deletions sentry_sdk/integrations/opentelemetry/integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
"""

from sentry_sdk.integrations import DidNotEnable, Integration
from sentry_sdk.integrations.opentelemetry.propagator import SentryPropagator
from sentry_sdk.opentelemetry import SentrySampler, SentrySpanProcessor
from sentry_sdk.opentelemetry import (
SentryPropagator,
SentrySampler,
SentrySpanProcessor,
)
from sentry_sdk.utils import logger

try:
Expand Down
2 changes: 2 additions & 0 deletions sentry_sdk/opentelemetry/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
from sentry_sdk.opentelemetry.propagator import SentryPropagator
from sentry_sdk.opentelemetry.sampler import SentrySampler
from sentry_sdk.opentelemetry.span_processor import SentrySpanProcessor

__all__ = [
"SentryPropagator",
"SentrySampler",
"SentrySpanProcessor",
]
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def get_file_text(file_name):
},
entry_points={
"opentelemetry_propagator": [
"sentry=sentry_sdk.integrations.opentelemetry:SentryPropagator"
"sentry=sentry_sdk.opentelemetry:SentryPropagator"
]
},
classifiers=[
Expand Down
2 changes: 1 addition & 1 deletion tests/integrations/opentelemetry/test_entry_points.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from unittest.mock import patch

from opentelemetry import propagate
from sentry_sdk.integrations.opentelemetry import SentryPropagator
from sentry_sdk.opentelemetry import SentryPropagator


def test_propagator_loaded_if_mentioned_in_environment_variable():
Expand Down
2 changes: 1 addition & 1 deletion tests/integrations/opentelemetry/test_propagator.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
SENTRY_BAGGAGE_KEY,
SENTRY_TRACE_KEY,
)
from sentry_sdk.integrations.opentelemetry.propagator import SentryPropagator
from sentry_sdk.opentelemetry import SentryPropagator
from tests.conftest import SortedBaggage


Expand Down
Loading
0