Skip to content

ref: Move otel scope out of integrations/opentelemetry/ #4276

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 29 commits into from
Apr 14, 2025

Conversation

sentrivana
Copy link
Contributor

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

@sentrivana sentrivana marked this pull request as ready for review April 10, 2025 13:18
@sentrivana sentrivana requested a review from a team as a code owner April 10, 2025 13:18
Copy link

codecov bot commented Apr 10, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.59%. Comparing base (759ded9) to head (20f6263).
Report is 1 commits behind head on potel-base.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@              Coverage Diff               @@
##           potel-base    #4276      +/-   ##
==============================================
+ Coverage       83.55%   83.59%   +0.04%     
==============================================
  Files             144      144              
  Lines           14631    14631              
  Branches         2325     2325              
==============================================
+ Hits            12225    12231       +6     
+ Misses           1690     1683       -7     
- Partials          716      717       +1     
Files with missing lines Coverage Δ
sentry_sdk/_init_implementation.py 100.00% <100.00%> (ø)
sentry_sdk/api.py 94.25% <100.00%> (ø)
sentry_sdk/opentelemetry/contextvars_context.py 100.00% <ø> (ø)
sentry_sdk/opentelemetry/propagator.py 83.72% <ø> (ø)
sentry_sdk/opentelemetry/scope.py 95.69% <ø> (ø)

... and 3 files with indirect coverage changes

@@ -8,7 +8,7 @@

# TODO-neel-potel make 2 scope strategies/impls and switch
from sentry_sdk.scope import Scope as BaseScope
from sentry_sdk.integrations.opentelemetry.scope import (
from sentry_sdk.opentelemetry.scope import (
PotelScope as Scope,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[question] are we considering renaming PotelScope to Scope?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could, but I'd leave it like this for now so that there's a distinction between the non-otel Scope and PotelScope.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eventually we'll merge both -- unless we need to keep both around for errors-only.

Base automatically changed from ivana/potel/move-more-otel-stuff to potel-base April 14, 2025 08:51
@sentrivana sentrivana merged commit 2d51839 into potel-base Apr 14, 2025
127 checks passed
@sentrivana sentrivana deleted the ivana/potel/move-scope-out-of-integrations branch April 14, 2025 10:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants