[Experiment] New scope step3#2606

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.

Sign up for GitHub

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

Closed
antonpirker wants to merge 21 commits into from
Closed

[Experiment] New scope step3 #2606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c6c51fd
Added new global APIs
antonpirker Dec 18, 2023
cb50afb
whitespace
antonpirker Dec 18, 2023
1ea1a7d
Some apidocs
antonpirker Dec 18, 2023
76da765
Added 'new in version' to apidocs
antonpirker Dec 18, 2023
8c5cc68
Merge branch 'new-scope-step1' into new-scope-step2
antonpirker Dec 18, 2023
af59f78
formatting
antonpirker Dec 18, 2023
96a22ef
formatting
antonpirker Dec 18, 2023
5f2ec29
First try to switch Scope with new scope mechanisms under the hood
antonpirker Dec 18, 2023
790b0bc
Fixed add_breadcrumb (to always use isolation scope for now
antonpirker Dec 18, 2023
bf94514
Sorted imports
antonpirker Dec 18, 2023
1386be7
Fixed import
antonpirker Dec 18, 2023
6cb1fad
Try to break recurson
antonpirker Dec 18, 2023
23e8b42
Moved api to prevent ciruclar imports
antonpirker Dec 19, 2023
b9df63f
Move get_client into scope to prevent circular imports
antonpirker Dec 19, 2023
099a94a
Named it get_client, its better
antonpirker Dec 19, 2023
905f29c
Named it get_client, its better
antonpirker Dec 19, 2023
85e4f0f
Merge branch 'new-scope-step1' into new-scope-step3
antonpirker Dec 19, 2023
77d8b88
Merge branch 'new-scope-step1' into new-scope-step3
antonpirker Dec 19, 2023
ee1ab65
Merge branch 'new-scope-step3' of github.com:getsentry/sentry-python …
antonpirker Dec 19, 2023
2534918
Merge branch 'new-scope-step1' into new-scope-step3
antonpirker Dec 19, 2023
8c5d3bb
Cleanup
antonpirker Dec 19, 2023
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
7 changes: 3 additions & 4 deletions sentry_sdk/debug.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
import logging

from sentry_sdk import utils
from sentry_sdk.api import get_client
from sentry_sdk.hub import Hub
from sentry_sdk.utils import logger
from sentry_sdk.client import _client_init_debug
Expand All@@ -13,10 +14,8 @@ def filter(self, record):
# type: (LogRecord) -> bool
if _client_init_debug.get(False):
return True
hub = Hub.current
if hub is not None and hub.client is not None:
return hub.client.options["debug"]
return False

return get_client().options["debug"]


def init_debug_support():
Expand Down
116 changes: 38 additions & 78 deletions sentry_sdk/hub.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
from sentry_sdk._compat import with_metaclass
from sentry_sdk.consts import INSTRUMENTER
from sentry_sdk.scope import Scope
from sentry_sdk.client import Client
from sentry_sdk.client import Client, NoopClient
from sentry_sdk.tracing import (
NoOpSpan,
Span,
Expand DownExpand Up@@ -266,21 +266,19 @@ def get_integration(
If the return value is not `None` the hub is guaranteed to have a
client attached.
"""
client = self.client
if client is not None:
return client.get_integration(name_or_class)
Scope.get_client().get_integration(name_or_class)

@property
def client(self):
# type: () -> Optional[Client]
# type: () -> Optional[NoopClient]
"""Returns the current client on the hub."""
return self._stack[-1][0]
return Scope.get_client()

@property
def scope(self):
# type: () -> Scope
"""Returns the current scope on the hub."""
return self._stack[-1][1]
return Scope.get_current_scope()

def last_event_id(self):
# type: () -> Optional[str]
Expand All@@ -292,8 +290,7 @@ def bind_client(
):
# type: (...) -> None
"""Binds a new client to the hub."""
top = self._stack[-1]
self._stack[-1] = (new, top[1])
Scope.get_global_scope().set_client(new)

def capture_event(self, event, hint=None, scope=None, **scope_kwargs):
# type: (Event, Optional[Hint], Optional[Scope], Any) -> Optional[str]
Expand All@@ -313,12 +310,8 @@ def capture_event(self, event, hint=None, scope=None, **scope_kwargs):
For supported `**scope_kwargs` see :py:meth:`sentry_sdk.Scope.update_from_kwargs`.
The `scope` and `scope_kwargs` parameters are mutually exclusive.
"""
client, top_scope = self._stack[-1]
if client is None:
return None

last_event_id = top_scope.capture_event(
event, hint, client=client, scope=scope, **scope_kwargs
last_event_id = Scope.get_current_scope().capture_event(
event, hint, scope=scope, **scope_kwargs
)

is_transaction = event.get("type") == "transaction"
Expand DownExpand Up@@ -347,12 +340,8 @@ def capture_message(self, message, level=None, scope=None, **scope_kwargs):

:returns: An `event_id` if the SDK decided to send the event (see :py:meth:`sentry_sdk.Client.capture_event`).
"""
client, top_scope = self._stack[-1]
if client is None:
return None

last_event_id = top_scope.capture_message(
message, level=level, client=client, scope=scope, **scope_kwargs
last_event_id = Scope.get_current_scope().capture_message(
message, level=level, scope=scope, **scope_kwargs
)

if last_event_id is not None:
Expand All@@ -377,12 +366,8 @@ def capture_exception(self, error=None, scope=None, **scope_kwargs):

:returns: An `event_id` if the SDK decided to send the event (see :py:meth:`sentry_sdk.Client.capture_event`).
"""
client, top_scope = self._stack[-1]
if client is None:
return None

last_event_id = top_scope.capture_exception(
error, client=client, scope=scope, **scope_kwargs
last_event_id = Scope.get_current_scope().capture_exception(
error, scope=scope, **scope_kwargs
)

if last_event_id is not None:
Expand DownExpand Up@@ -414,14 +399,7 @@ def add_breadcrumb(self, crumb=None, hint=None, **kwargs):
:param hint: An optional value that can be used by `before_breadcrumb`
to customize the breadcrumbs that are emitted.
"""
client, scope = self._stack[-1]
if client is None:
logger.info("Dropped breadcrumb because no client bound")
return

kwargs["client"] = client

scope.add_breadcrumb(crumb, hint, **kwargs)
Scope.get_isolation_scope().add_breadcrumb(crumb, hint, **kwargs)

def start_span(self, span=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs):
# type: (Optional[Span], str, Any) -> Span
Expand All@@ -440,12 +418,12 @@ def start_span(self, span=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs):

For supported `**kwargs` see :py:class:`sentry_sdk.tracing.Span`.
"""
client, scope = self._stack[-1]

# TODO: fix hub
kwargs["hub"] = self
kwargs["client"] = client

return scope.start_span(span=span, instrumenter=instrumenter, **kwargs)
return Scope.get_isolation_scope().start_span(
span=span, instrumenter=instrumenter, **kwargs
)

def start_transaction(
self, transaction=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs
Expand DownExpand Up@@ -475,12 +453,10 @@ def start_transaction(

For supported `**kwargs` see :py:class:`sentry_sdk.tracing.Transaction`.
"""
client, scope = self._stack[-1]

# TODO: fix hub
kwargs["hub"] = self
kwargs["client"] = client

return scope.start_transaction(
return Scope.get_isolation_scope().start_transaction(
transaction=transaction, instrumenter=instrumenter, **kwargs
)

Expand All@@ -489,9 +465,7 @@ def continue_trace(self, environ_or_headers, op=None, name=None, source=None):
"""
Sets the propagation context from environment or headers and returns a transaction.
"""
scope = self._stack[-1][1]

return scope.continue_trace(
return Scope.get_isolation_scope().continue_trace(
environ_or_headers=environ_or_headers, op=op, name=name, source=source
)

Expand DownExpand Up@@ -580,25 +554,19 @@ def configure_scope( # noqa

:returns: If no callback is provided, returns a context manager that returns the scope.
"""

client, scope = self._stack[-1]
scope = Scope.get_isolation_scope()

if continue_trace:
scope.generate_propagation_context()
Scope.get_isolation_scope().generate_propagation_context()

if callback is not None:
if client is not None:
callback(scope)

return None
# TODO: used to return None when client is None. Check if this changes behavior.
callback(scope)

@contextmanager
def inner():
# type: () -> Generator[Scope, None, None]
if client is not None:
yield scope
else:
yield Scope()
yield scope

return inner()

Expand All@@ -607,17 +575,14 @@ def start_session(
):
# type: (...) -> None
"""Starts a new session."""
client, scope = self._stack[-1]
scope.start_session(
client=client,
Scope.get_isolation_scope().start_session(
session_mode=session_mode,
)

def end_session(self):
# type: (...) -> None
"""Ends the current session if there is one."""
client, scope = self._stack[-1]
scope.end_session(client=client)
Scope.get_isolation_scope().end_session()

def stop_auto_session_tracking(self):
# type: (...) -> None
Expand All@@ -626,17 +591,15 @@ def stop_auto_session_tracking(self):
This temporarily session tracking for the current scope when called.
To resume session tracking call `resume_auto_session_tracking`.
"""
client, scope = self._stack[-1]
scope.stop_auto_session_tracking(client=client)
Scope.get_isolation_scope().stop_auto_session_tracking()

def resume_auto_session_tracking(self):
# type: (...) -> None
"""Resumes automatic session tracking for the current scope if
disabled earlier. This requires that generally automatic session
tracking is enabled.
"""
scope = self._stack[-1][1]
scope.resume_auto_session_tracking()
Scope.get_isolation_scope().resume_auto_session_tracking()

def flush(
self,
Expand All@@ -647,25 +610,21 @@ def flush(
"""
Alias for :py:meth:`sentry_sdk.Client.flush`
"""
client, scope = self._stack[-1]
if client is not None:
return client.flush(timeout=timeout, callback=callback)
return Scope.get_client().flush(timeout=timeout, callback=callback)

def get_traceparent(self):
# type: () -> Optional[str]
"""
Returns the traceparent either from the active span or from the scope.
"""
client, scope = self._stack[-1]
return scope.get_traceparent(client=client)
return Scope.get_current_scope().get_traceparent()

def get_baggage(self):
# type: () -> Optional[str]
"""
Returns Baggage either from the active span or from the scope.
"""
client, scope = self._stack[-1]
baggage = scope.get_baggage(client=client)
baggage = Scope.get_current_scope().get_baggage()

if baggage is not None:
return baggage.serialize()
Expand All@@ -679,9 +638,9 @@ def iter_trace_propagation_headers(self, span=None):
from the span representing the request, if available, or the current
span on the scope if not.
"""
client, scope = self._stack[-1]

return scope.iter_trace_propagation_headers(span=span, client=client)
return Scope.get_current_scope().iter_trace_propagation_headers(
span=span,
)

def trace_propagation_meta(self, span=None):
# type: (Optional[Span]) -> str
Expand All@@ -694,8 +653,9 @@ def trace_propagation_meta(self, span=None):
"The parameter `span` in trace_propagation_meta() is deprecated and will be removed in the future."
)

client, scope = self._stack[-1]
return scope.trace_propagation_meta(span=span, client=client)
return Scope.get_current_scope().trace_propagation_meta(
span=span,
)


GLOBAL_HUB = Hub()
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[Experiment] New scope step3#2606

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.

 Sign up for GitHub

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

 Closed

antonpirker
wants to merge
21
commits into

from

 Closed


[Experiment] New scope step3
#2606
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
c6c51fd

Added new global APIs


antonpirker Dec 18, 2023
cb50afb

whitespace


antonpirker Dec 18, 2023
1ea1a7d

Some apidocs


antonpirker Dec 18, 2023
76da765

Added 'new in version' to apidocs


antonpirker Dec 18, 2023
8c5cc68

Merge branch 'new-scope-step1' into new-scope-step2


antonpirker Dec 18, 2023
af59f78

formatting


antonpirker Dec 18, 2023
96a22ef

formatting


antonpirker Dec 18, 2023
5f2ec29

First try to switch Scope with new scope mechanisms under the hood


antonpirker Dec 18, 2023
790b0bc

Fixed add_breadcrumb (to always use isolation scope for now


antonpirker Dec 18, 2023
bf94514

Sorted imports


antonpirker Dec 18, 2023
1386be7

Fixed import


antonpirker Dec 18, 2023
6cb1fad

Try to break recurson


antonpirker Dec 18, 2023
23e8b42

Moved api to prevent ciruclar imports


antonpirker Dec 19, 2023
b9df63f

Move get_client into scope to prevent circular imports


antonpirker Dec 19, 2023
099a94a

Named it get_client, its better


antonpirker Dec 19, 2023
905f29c

Named it get_client, its better


antonpirker Dec 19, 2023
85e4f0f

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
77d8b88

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
ee1ab65

Merge branch 'new-scope-step3' of github.com:getsentry/sentry-python …


antonpirker Dec 19, 2023
2534918

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
8c5d3bb

Cleanup


antonpirker Dec 19, 2023

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


7 changes: 3 additions & 4 deletions
sentry_sdk/debug.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
import logging

from sentry_sdk import utils
from sentry_sdk.api import get_client
from sentry_sdk.hub import Hub
from sentry_sdk.utils import logger
from sentry_sdk.client import _client_init_debug
Expand All@@ -13,10 +14,8 @@ def filter(self, record):
 # type: (LogRecord) -> bool
 if _client_init_debug.get(False):
 return True
 hub = Hub.current
 if hub is not None and hub.client is not None:
 return hub.client.options["debug"]
 return False

 return get_client().options["debug"]


def init_debug_support():
Expand Down

116 changes: 38 additions & 78 deletions
sentry_sdk/hub.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
from sentry_sdk._compat import with_metaclass
from sentry_sdk.consts import INSTRUMENTER
from sentry_sdk.scope import Scope
from sentry_sdk.client import Client
from sentry_sdk.client import Client, NoopClient
from sentry_sdk.tracing import (
 NoOpSpan,
 Span,
Expand DownExpand Up@@ -266,21 +266,19 @@ def get_integration(
 If the return value is not `None` the hub is guaranteed to have a
 client attached.
 """
 client = self.client
 if client is not None:
 return client.get_integration(name_or_class)
 Scope.get_client().get_integration(name_or_class)

 @property
 def client(self):
 # type: () -> Optional[Client]
 # type: () -> Optional[NoopClient]
 """Returns the current client on the hub."""
 return self._stack[-1][0]
 return Scope.get_client()

 @property
 def scope(self):
 # type: () -> Scope
 """Returns the current scope on the hub."""
 return self._stack[-1][1]
 return Scope.get_current_scope()

 def last_event_id(self):
 # type: () -> Optional[str]
Expand All@@ -292,8 +290,7 @@ def bind_client(
 ):
 # type: (...) -> None
 """Binds a new client to the hub."""
 top = self._stack[-1]
 self._stack[-1] = (new, top[1])
 Scope.get_global_scope().set_client(new)

 def capture_event(self, event, hint=None, scope=None, **scope_kwargs):
 # type: (Event, Optional[Hint], Optional[Scope], Any) -> Optional[str]
Expand All@@ -313,12 +310,8 @@ def capture_event(self, event, hint=None, scope=None, **scope_kwargs):
 For supported `**scope_kwargs` see :py:meth:`sentry_sdk.Scope.update_from_kwargs`.
 The `scope` and `scope_kwargs` parameters are mutually exclusive.
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_event(
 event, hint, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_event(
 event, hint, scope=scope, **scope_kwargs
 )

 is_transaction = event.get("type") == "transaction"
Expand DownExpand Up@@ -347,12 +340,8 @@ def capture_message(self, message, level=None, scope=None, **scope_kwargs):

 :returns: An `event_id` if the SDK decided to send the event (see :py:meth:`sentry_sdk.Client.capture_event`).
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_message(
 message, level=level, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_message(
 message, level=level, scope=scope, **scope_kwargs
 )

 if last_event_id is not None:
Expand All@@ -377,12 +366,8 @@ def capture_exception(self, error=None, scope=None, **scope_kwargs):

 :returns: An `event_id` if the SDK decided to send the event (see :py:meth:`sentry_sdk.Client.capture_event`).
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_exception(
 error, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_exception(
 error, scope=scope, **scope_kwargs
 )

 if last_event_id is not None:
Expand DownExpand Up@@ -414,14 +399,7 @@ def add_breadcrumb(self, crumb=None, hint=None, **kwargs):
 :param hint: An optional value that can be used by `before_breadcrumb`
 to customize the breadcrumbs that are emitted.
 """
 client, scope = self._stack[-1]
 if client is None:
 logger.info("Dropped breadcrumb because no client bound")
 return

 kwargs["client"] = client

 scope.add_breadcrumb(crumb, hint, **kwargs)
 Scope.get_isolation_scope().add_breadcrumb(crumb, hint, **kwargs)

 def start_span(self, span=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs):
 # type: (Optional[Span], str, Any) -> Span
Expand All@@ -440,12 +418,12 @@ def start_span(self, span=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs):

 For supported `**kwargs` see :py:class:`sentry_sdk.tracing.Span`.
 """
 client, scope = self._stack[-1]

 # TODO: fix hub
 kwargs["hub"] = self
 kwargs["client"] = client

 return scope.start_span(span=span, instrumenter=instrumenter, **kwargs)
 return Scope.get_isolation_scope().start_span(
 span=span, instrumenter=instrumenter, **kwargs
 )

 def start_transaction(
 self, transaction=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs
Expand DownExpand Up@@ -475,12 +453,10 @@ def start_transaction(

 For supported `**kwargs` see :py:class:`sentry_sdk.tracing.Transaction`.
 """
 client, scope = self._stack[-1]

 # TODO: fix hub
 kwargs["hub"] = self
 kwargs["client"] = client

 return scope.start_transaction(
 return Scope.get_isolation_scope().start_transaction(
 transaction=transaction, instrumenter=instrumenter, **kwargs
 )

Expand All@@ -489,9 +465,7 @@ def continue_trace(self, environ_or_headers, op=None, name=None, source=None):
 """
 Sets the propagation context from environment or headers and returns a transaction.
 """
 scope = self._stack[-1][1]

 return scope.continue_trace(
 return Scope.get_isolation_scope().continue_trace(
 environ_or_headers=environ_or_headers, op=op, name=name, source=source
 )

Expand DownExpand Up@@ -580,25 +554,19 @@ def configure_scope( # noqa

 :returns: If no callback is provided, returns a context manager that returns the scope.
 """

 client, scope = self._stack[-1]
 scope = Scope.get_isolation_scope()

 if continue_trace:
scope.generate_propagation_context()
Scope.get_isolation_scope().generate_propagation_context()

 if callback is not None:
 if client is not None:
 callback(scope)

 return None
 # TODO: used to return None when client is None. Check if this changes behavior.
 callback(scope)

 @contextmanager
 def inner():
 # type: () -> Generator[Scope, None, None]
 if client is not None:
 yield scope
 else:
 yield Scope()
 yield scope

 return inner()

Expand All@@ -607,17 +575,14 @@ def start_session(
 ):
 # type: (...) -> None
 """Starts a new session."""
 client, scope = self._stack[-1]
 scope.start_session(
 client=client,
 Scope.get_isolation_scope().start_session(
 session_mode=session_mode,
 )

 def end_session(self):
 # type: (...) -> None
 """Ends the current session if there is one."""
 client, scope = self._stack[-1]
 scope.end_session(client=client)
 Scope.get_isolation_scope().end_session()

 def stop_auto_session_tracking(self):
 # type: (...) -> None
Expand All@@ -626,17 +591,15 @@ def stop_auto_session_tracking(self):
 This temporarily session tracking for the current scope when called.
 To resume session tracking call `resume_auto_session_tracking`.
 """
 client, scope = self._stack[-1]
 scope.stop_auto_session_tracking(client=client)
 Scope.get_isolation_scope().stop_auto_session_tracking()

 def resume_auto_session_tracking(self):
 # type: (...) -> None
 """Resumes automatic session tracking for the current scope if
 disabled earlier. This requires that generally automatic session
 tracking is enabled.
 """
 scope = self._stack[-1][1]
 scope.resume_auto_session_tracking()
 Scope.get_isolation_scope().resume_auto_session_tracking()

 def flush(
 self,
Expand All@@ -647,25 +610,21 @@ def flush(
 """
 Alias for :py:meth:`sentry_sdk.Client.flush`
 """
 client, scope = self._stack[-1]
 if client is not None:
 return client.flush(timeout=timeout, callback=callback)
 return Scope.get_client().flush(timeout=timeout, callback=callback)

 def get_traceparent(self):
 # type: () -> Optional[str]
 """
 Returns the traceparent either from the active span or from the scope.
 """
 client, scope = self._stack[-1]
 return scope.get_traceparent(client=client)
 return Scope.get_current_scope().get_traceparent()

 def get_baggage(self):
 # type: () -> Optional[str]
 """
 Returns Baggage either from the active span or from the scope.
 """
 client, scope = self._stack[-1]
 baggage = scope.get_baggage(client=client)
 baggage = Scope.get_current_scope().get_baggage()

 if baggage is not None:
 return baggage.serialize()
Expand All@@ -679,9 +638,9 @@ def iter_trace_propagation_headers(self, span=None):
 from the span representing the request, if available, or the current
 span on the scope if not.
 """
client, scope = self._stack[-1]

return scope.iter_trace_propagation_headers(span=span, client=client)
return Scope.get_current_scope().iter_trace_propagation_headers(
 span=span,
 )

 def trace_propagation_meta(self, span=None):
 # type: (Optional[Span]) -> str
Expand All@@ -694,8 +653,9 @@ def trace_propagation_meta(self, span=None):
 "The parameter `span` in trace_propagation_meta() is deprecated and will be removed in the future."
 )

 client, scope = self._stack[-1]
 return scope.trace_propagation_meta(span=span, client=client)
 return Scope.get_current_scope().trace_propagation_meta(
 span=span,
 )


GLOBAL_HUB = Hub()
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Experiment] New scope step3#2606

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.

 Sign up for GitHub

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

 Closed

antonpirker
wants to merge
21
commits into

from

 Closed


[Experiment] New scope step3
#2606
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
c6c51fd

Added new global APIs


antonpirker Dec 18, 2023
cb50afb

whitespace


antonpirker Dec 18, 2023
1ea1a7d

Some apidocs


antonpirker Dec 18, 2023
76da765

Added 'new in version' to apidocs


antonpirker Dec 18, 2023
8c5cc68

Merge branch 'new-scope-step1' into new-scope-step2


antonpirker Dec 18, 2023
af59f78

formatting


antonpirker Dec 18, 2023
96a22ef

formatting


antonpirker Dec 18, 2023
5f2ec29

First try to switch Scope with new scope mechanisms under the hood


antonpirker Dec 18, 2023
790b0bc

Fixed add_breadcrumb (to always use isolation scope for now


antonpirker Dec 18, 2023
bf94514

Sorted imports


antonpirker Dec 18, 2023
1386be7

Fixed import


antonpirker Dec 18, 2023
6cb1fad

Try to break recurson


antonpirker Dec 18, 2023
23e8b42

Moved api to prevent ciruclar imports


antonpirker Dec 19, 2023
b9df63f

Move get_client into scope to prevent circular imports


antonpirker Dec 19, 2023
099a94a

Named it get_client, its better


antonpirker Dec 19, 2023
905f29c

Named it get_client, its better


antonpirker Dec 19, 2023
85e4f0f

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
77d8b88

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
ee1ab65

Merge branch 'new-scope-step3' of github.com:getsentry/sentry-python …


antonpirker Dec 19, 2023
2534918

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
8c5d3bb

Cleanup


antonpirker Dec 19, 2023

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


7 changes: 3 additions & 4 deletions
sentry_sdk/debug.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
import logging

from sentry_sdk import utils
from sentry_sdk.api import get_client
from sentry_sdk.hub import Hub
from sentry_sdk.utils import logger
from sentry_sdk.client import _client_init_debug
Expand All@@ -13,10 +14,8 @@ def filter(self, record):
 # type: (LogRecord) -> bool
 if _client_init_debug.get(False):
 return True
 hub = Hub.current
 if hub is not None and hub.client is not None:
 return hub.client.options["debug"]
 return False

 return get_client().options["debug"]


def init_debug_support():
Expand Down

116 changes: 38 additions & 78 deletions
sentry_sdk/hub.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
from sentry_sdk._compat import with_metaclass
from sentry_sdk.consts import INSTRUMENTER
from sentry_sdk.scope import Scope
from sentry_sdk.client import Client
from sentry_sdk.client import Client, NoopClient
from sentry_sdk.tracing import (
 NoOpSpan,
 Span,
Expand DownExpand Up@@ -266,21 +266,19 @@ def get_integration(
 If the return value is not `None` the hub is guaranteed to have a
 client attached.
 """
 client = self.client
 if client is not None:
 return client.get_integration(name_or_class)
 Scope.get_client().get_integration(name_or_class)

 @property
 def client(self):
 # type: () -> Optional[Client]
 # type: () -> Optional[NoopClient]
 """Returns the current client on the hub."""
 return self._stack[-1][0]
 return Scope.get_client()

 @property
 def scope(self):
 # type: () -> Scope
 """Returns the current scope on the hub."""
 return self._stack[-1][1]
 return Scope.get_current_scope()

 def last_event_id(self):
 # type: () -> Optional[str]
Expand All@@ -292,8 +290,7 @@ def bind_client(
 ):
 # type: (...) -> None
 """Binds a new client to the hub."""
 top = self._stack[-1]
 self._stack[-1] = (new, top[1])
 Scope.get_global_scope().set_client(new)

 def capture_event(self, event, hint=None, scope=None, **scope_kwargs):
 # type: (Event, Optional[Hint], Optional[Scope], Any) -> Optional[str]
Expand All@@ -313,12 +310,8 @@ def capture_event(self, event, hint=None, scope=None, **scope_kwargs):
 For supported `**scope_kwargs` see :py:meth:`sentry_sdk.Scope.update_from_kwargs`.
 The `scope` and `scope_kwargs` parameters are mutually exclusive.
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_event(
 event, hint, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_event(
 event, hint, scope=scope, **scope_kwargs
 )

 is_transaction = event.get("type") == "transaction"
Expand DownExpand Up@@ -347,12 +340,8 @@ def capture_message(self, message, level=None, scope=None, **scope_kwargs):

 :returns: An `event_id` if the SDK decided to send the event (see :py:meth:`sentry_sdk.Client.capture_event`).
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_message(
 message, level=level, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_message(
 message, level=level, scope=scope, **scope_kwargs
 )

 if last_event_id is not None:
Expand All@@ -377,12 +366,8 @@ def capture_exception(self, error=None, scope=None, **scope_kwargs):

 :returns: An `event_id` if the SDK decided to send the event (see :py:meth:`sentry_sdk.Client.capture_event`).
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_exception(
 error, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_exception(
 error, scope=scope, **scope_kwargs
 )

 if last_event_id is not None:
Expand DownExpand Up@@ -414,14 +399,7 @@ def add_breadcrumb(self, crumb=None, hint=None, **kwargs):
 :param hint: An optional value that can be used by `before_breadcrumb`
 to customize the breadcrumbs that are emitted.
 """
 client, scope = self._stack[-1]
 if client is None:
 logger.info("Dropped breadcrumb because no client bound")
 return

 kwargs["client"] = client

 scope.add_breadcrumb(crumb, hint, **kwargs)
 Scope.get_isolation_scope().add_breadcrumb(crumb, hint, **kwargs)

 def start_span(self, span=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs):
 # type: (Optional[Span], str, Any) -> Span
Expand All@@ -440,12 +418,12 @@ def start_span(self, span=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs):

 For supported `**kwargs` see :py:class:`sentry_sdk.tracing.Span`.
 """
 client, scope = self._stack[-1]

 # TODO: fix hub
 kwargs["hub"] = self
 kwargs["client"] = client

 return scope.start_span(span=span, instrumenter=instrumenter, **kwargs)
 return Scope.get_isolation_scope().start_span(
 span=span, instrumenter=instrumenter, **kwargs
 )

 def start_transaction(
 self, transaction=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs
Expand DownExpand Up@@ -475,12 +453,10 @@ def start_transaction(

 For supported `**kwargs` see :py:class:`sentry_sdk.tracing.Transaction`.
 """
 client, scope = self._stack[-1]

 # TODO: fix hub
 kwargs["hub"] = self
 kwargs["client"] = client

 return scope.start_transaction(
 return Scope.get_isolation_scope().start_transaction(
 transaction=transaction, instrumenter=instrumenter, **kwargs
 )

Expand All@@ -489,9 +465,7 @@ def continue_trace(self, environ_or_headers, op=None, name=None, source=None):
 """
 Sets the propagation context from environment or headers and returns a transaction.
 """
 scope = self._stack[-1][1]

 return scope.continue_trace(
 return Scope.get_isolation_scope().continue_trace(
 environ_or_headers=environ_or_headers, op=op, name=name, source=source
 )

Expand DownExpand Up@@ -580,25 +554,19 @@ def configure_scope( # noqa

 :returns: If no callback is provided, returns a context manager that returns the scope.
 """

 client, scope = self._stack[-1]
 scope = Scope.get_isolation_scope()

 if continue_trace:
scope.generate_propagation_context()
Scope.get_isolation_scope().generate_propagation_context()

 if callback is not None:
 if client is not None:
 callback(scope)

 return None
 # TODO: used to return None when client is None. Check if this changes behavior.
 callback(scope)

 @contextmanager
 def inner():
 # type: () -> Generator[Scope, None, None]
 if client is not None:
 yield scope
 else:
 yield Scope()
 yield scope

 return inner()

Expand All@@ -607,17 +575,14 @@ def start_session(
 ):
 # type: (...) -> None
 """Starts a new session."""
 client, scope = self._stack[-1]
 scope.start_session(
 client=client,
 Scope.get_isolation_scope().start_session(
 session_mode=session_mode,
 )

 def end_session(self):
 # type: (...) -> None
 """Ends the current session if there is one."""
 client, scope = self._stack[-1]
 scope.end_session(client=client)
 Scope.get_isolation_scope().end_session()

 def stop_auto_session_tracking(self):
 # type: (...) -> None
Expand All@@ -626,17 +591,15 @@ def stop_auto_session_tracking(self):
 This temporarily session tracking for the current scope when called.
 To resume session tracking call `resume_auto_session_tracking`.
 """
 client, scope = self._stack[-1]
 scope.stop_auto_session_tracking(client=client)
 Scope.get_isolation_scope().stop_auto_session_tracking()

 def resume_auto_session_tracking(self):
 # type: (...) -> None
 """Resumes automatic session tracking for the current scope if
 disabled earlier. This requires that generally automatic session
 tracking is enabled.
 """
 scope = self._stack[-1][1]
 scope.resume_auto_session_tracking()
 Scope.get_isolation_scope().resume_auto_session_tracking()

 def flush(
 self,
Expand All@@ -647,25 +610,21 @@ def flush(
 """
 Alias for :py:meth:`sentry_sdk.Client.flush`
 """
 client, scope = self._stack[-1]
 if client is not None:
 return client.flush(timeout=timeout, callback=callback)
 return Scope.get_client().flush(timeout=timeout, callback=callback)

 def get_traceparent(self):
 # type: () -> Optional[str]
 """
 Returns the traceparent either from the active span or from the scope.
 """
 client, scope = self._stack[-1]
 return scope.get_traceparent(client=client)
 return Scope.get_current_scope().get_traceparent()

 def get_baggage(self):
 # type: () -> Optional[str]
 """
 Returns Baggage either from the active span or from the scope.
 """
 client, scope = self._stack[-1]
 baggage = scope.get_baggage(client=client)
 baggage = Scope.get_current_scope().get_baggage()

 if baggage is not None:
 return baggage.serialize()
Expand All@@ -679,9 +638,9 @@ def iter_trace_propagation_headers(self, span=None):
 from the span representing the request, if available, or the current
 span on the scope if not.
 """
client, scope = self._stack[-1]

return scope.iter_trace_propagation_headers(span=span, client=client)
return Scope.get_current_scope().iter_trace_propagation_headers(
 span=span,
 )

 def trace_propagation_meta(self, span=None):
 # type: (Optional[Span]) -> str
Expand All@@ -694,8 +653,9 @@ def trace_propagation_meta(self, span=None):
 "The parameter `span` in trace_propagation_meta() is deprecated and will be removed in the future."
 )

 client, scope = self._stack[-1]
 return scope.trace_propagation_meta(span=span, client=client)
 return Scope.get_current_scope().trace_propagation_meta(
 span=span,
 )


GLOBAL_HUB = Hub()
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Experiment] New scope step3#2606

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.

 Sign up for GitHub

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

 Closed

antonpirker
wants to merge
21
commits into

from

 Closed


[Experiment] New scope step3
#2606
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
c6c51fd

Added new global APIs


antonpirker Dec 18, 2023
cb50afb

whitespace


antonpirker Dec 18, 2023
1ea1a7d

Some apidocs


antonpirker Dec 18, 2023
76da765

Added 'new in version' to apidocs


antonpirker Dec 18, 2023
8c5cc68

Merge branch 'new-scope-step1' into new-scope-step2


antonpirker Dec 18, 2023
af59f78

formatting


antonpirker Dec 18, 2023
96a22ef

formatting


antonpirker Dec 18, 2023
5f2ec29

First try to switch Scope with new scope mechanisms under the hood


antonpirker Dec 18, 2023
790b0bc

Fixed add_breadcrumb (to always use isolation scope for now


antonpirker Dec 18, 2023
bf94514

Sorted imports


antonpirker Dec 18, 2023
1386be7

Fixed import


antonpirker Dec 18, 2023
6cb1fad

Try to break recurson


antonpirker Dec 18, 2023
23e8b42

Moved api to prevent ciruclar imports


antonpirker Dec 19, 2023
b9df63f

Move get_client into scope to prevent circular imports


antonpirker Dec 19, 2023
099a94a

Named it get_client, its better


antonpirker Dec 19, 2023
905f29c

Named it get_client, its better


antonpirker Dec 19, 2023
85e4f0f

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
77d8b88

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
ee1ab65

Merge branch 'new-scope-step3' of github.com:getsentry/sentry-python …


antonpirker Dec 19, 2023
2534918

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
8c5d3bb

Cleanup


antonpirker Dec 19, 2023

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


7 changes: 3 additions & 4 deletions
sentry_sdk/debug.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
import logging

from sentry_sdk import utils
from sentry_sdk.api import get_client
from sentry_sdk.hub import Hub
from sentry_sdk.utils import logger
from sentry_sdk.client import _client_init_debug
Expand All@@ -13,10 +14,8 @@ def filter(self, record):
 # type: (LogRecord) -> bool
 if _client_init_debug.get(False):
 return True
 hub = Hub.current
 if hub is not None and hub.client is not None:
 return hub.client.options["debug"]
 return False

 return get_client().options["debug"]


def init_debug_support():
Expand Down

116 changes: 38 additions & 78 deletions
sentry_sdk/hub.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
from sentry_sdk._compat import with_metaclass
from sentry_sdk.consts import INSTRUMENTER
from sentry_sdk.scope import Scope
from sentry_sdk.client import Client
from sentry_sdk.client import Client, NoopClient
from sentry_sdk.tracing import (
 NoOpSpan,
 Span,
Expand DownExpand Up@@ -266,21 +266,19 @@ def get_integration(
 If the return value is not `None` the hub is guaranteed to have a
 client attached.
 """
 client = self.client
 if client is not None:
 return client.get_integration(name_or_class)
 Scope.get_client().get_integration(name_or_class)

 @property
 def client(self):
 # type: () -> Optional[Client]
 # type: () -> Optional[NoopClient]
 """Returns the current client on the hub."""
 return self._stack[-1][0]
 return Scope.get_client()

 @property
 def scope(self):
 # type: () -> Scope
 """Returns the current scope on the hub."""
 return self._stack[-1][1]
 return Scope.get_current_scope()

 def last_event_id(self):
 # type: () -> Optional[str]
Expand All@@ -292,8 +290,7 @@ def bind_client(
 ):
 # type: (...) -> None
 """Binds a new client to the hub."""
 top = self._stack[-1]
 self._stack[-1] = (new, top[1])
 Scope.get_global_scope().set_client(new)

 def capture_event(self, event, hint=None, scope=None, **scope_kwargs):
 # type: (Event, Optional[Hint], Optional[Scope], Any) -> Optional[str]
Expand All@@ -313,12 +310,8 @@ def capture_event(self, event, hint=None, scope=None, **scope_kwargs):
 For supported `**scope_kwargs` see :py:meth:`sentry_sdk.Scope.update_from_kwargs`.
 The `scope` and `scope_kwargs` parameters are mutually exclusive.
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_event(
 event, hint, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_event(
 event, hint, scope=scope, **scope_kwargs
 )

 is_transaction = event.get("type") == "transaction"
Expand DownExpand Up@@ -347,12 +340,8 @@ def capture_message(self, message, level=None, scope=None, **scope_kwargs):

 :returns: An `event_id` if the SDK decided to send the event (see :py:meth:`sentry_sdk.Client.capture_event`).
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_message(
 message, level=level, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_message(
 message, level=level, scope=scope, **scope_kwargs
 )

 if last_event_id is not None:
Expand All@@ -377,12 +366,8 @@ def capture_exception(self, error=None, scope=None, **scope_kwargs):

 :returns: An `event_id` if the SDK decided to send the event (see :py:meth:`sentry_sdk.Client.capture_event`).
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_exception(
 error, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_exception(
 error, scope=scope, **scope_kwargs
 )

 if last_event_id is not None:
Expand DownExpand Up@@ -414,14 +399,7 @@ def add_breadcrumb(self, crumb=None, hint=None, **kwargs):
 :param hint: An optional value that can be used by `before_breadcrumb`
 to customize the breadcrumbs that are emitted.
 """
 client, scope = self._stack[-1]
 if client is None:
 logger.info("Dropped breadcrumb because no client bound")
 return

 kwargs["client"] = client

 scope.add_breadcrumb(crumb, hint, **kwargs)
 Scope.get_isolation_scope().add_breadcrumb(crumb, hint, **kwargs)

 def start_span(self, span=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs):
 # type: (Optional[Span], str, Any) -> Span
Expand All@@ -440,12 +418,12 @@ def start_span(self, span=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs):

 For supported `**kwargs` see :py:class:`sentry_sdk.tracing.Span`.
 """
 client, scope = self._stack[-1]

 # TODO: fix hub
 kwargs["hub"] = self
 kwargs["client"] = client

 return scope.start_span(span=span, instrumenter=instrumenter, **kwargs)
 return Scope.get_isolation_scope().start_span(
 span=span, instrumenter=instrumenter, **kwargs
 )

 def start_transaction(
 self, transaction=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs
Expand DownExpand Up@@ -475,12 +453,10 @@ def start_transaction(

 For supported `**kwargs` see :py:class:`sentry_sdk.tracing.Transaction`.
 """
 client, scope = self._stack[-1]

 # TODO: fix hub
 kwargs["hub"] = self
 kwargs["client"] = client

 return scope.start_transaction(
 return Scope.get_isolation_scope().start_transaction(
 transaction=transaction, instrumenter=instrumenter, **kwargs
 )

Expand All@@ -489,9 +465,7 @@ def continue_trace(self, environ_or_headers, op=None, name=None, source=None):
 """
 Sets the propagation context from environment or headers and returns a transaction.
 """
 scope = self._stack[-1][1]

 return scope.continue_trace(
 return Scope.get_isolation_scope().continue_trace(
 environ_or_headers=environ_or_headers, op=op, name=name, source=source
 )

Expand DownExpand Up@@ -580,25 +554,19 @@ def configure_scope( # noqa

 :returns: If no callback is provided, returns a context manager that returns the scope.
 """

 client, scope = self._stack[-1]
 scope = Scope.get_isolation_scope()

 if continue_trace:
scope.generate_propagation_context()
Scope.get_isolation_scope().generate_propagation_context()

 if callback is not None:
 if client is not None:
 callback(scope)

 return None
 # TODO: used to return None when client is None. Check if this changes behavior.
 callback(scope)

 @contextmanager
 def inner():
 # type: () -> Generator[Scope, None, None]
 if client is not None:
 yield scope
 else:
 yield Scope()
 yield scope

 return inner()

Expand All@@ -607,17 +575,14 @@ def start_session(
 ):
 # type: (...) -> None
 """Starts a new session."""
 client, scope = self._stack[-1]
 scope.start_session(
 client=client,
 Scope.get_isolation_scope().start_session(
 session_mode=session_mode,
 )

 def end_session(self):
 # type: (...) -> None
 """Ends the current session if there is one."""
 client, scope = self._stack[-1]
 scope.end_session(client=client)
 Scope.get_isolation_scope().end_session()

 def stop_auto_session_tracking(self):
 # type: (...) -> None
Expand All@@ -626,17 +591,15 @@ def stop_auto_session_tracking(self):
 This temporarily session tracking for the current scope when called.
 To resume session tracking call `resume_auto_session_tracking`.
 """
 client, scope = self._stack[-1]
 scope.stop_auto_session_tracking(client=client)
 Scope.get_isolation_scope().stop_auto_session_tracking()

 def resume_auto_session_tracking(self):
 # type: (...) -> None
 """Resumes automatic session tracking for the current scope if
 disabled earlier. This requires that generally automatic session
 tracking is enabled.
 """
 scope = self._stack[-1][1]
 scope.resume_auto_session_tracking()
 Scope.get_isolation_scope().resume_auto_session_tracking()

 def flush(
 self,
Expand All@@ -647,25 +610,21 @@ def flush(
 """
 Alias for :py:meth:`sentry_sdk.Client.flush`
 """
 client, scope = self._stack[-1]
 if client is not None:
 return client.flush(timeout=timeout, callback=callback)
 return Scope.get_client().flush(timeout=timeout, callback=callback)

 def get_traceparent(self):
 # type: () -> Optional[str]
 """
 Returns the traceparent either from the active span or from the scope.
 """
 client, scope = self._stack[-1]
 return scope.get_traceparent(client=client)
 return Scope.get_current_scope().get_traceparent()

 def get_baggage(self):
 # type: () -> Optional[str]
 """
 Returns Baggage either from the active span or from the scope.
 """
 client, scope = self._stack[-1]
 baggage = scope.get_baggage(client=client)
 baggage = Scope.get_current_scope().get_baggage()

 if baggage is not None:
 return baggage.serialize()
Expand All@@ -679,9 +638,9 @@ def iter_trace_propagation_headers(self, span=None):
 from the span representing the request, if available, or the current
 span on the scope if not.
 """
client, scope = self._stack[-1]

return scope.iter_trace_propagation_headers(span=span, client=client)
return Scope.get_current_scope().iter_trace_propagation_headers(
 span=span,
 )

 def trace_propagation_meta(self, span=None):
 # type: (Optional[Span]) -> str
Expand All@@ -694,8 +653,9 @@ def trace_propagation_meta(self, span=None):
 "The parameter `span` in trace_propagation_meta() is deprecated and will be removed in the future."
 )

 client, scope = self._stack[-1]
 return scope.trace_propagation_meta(span=span, client=client)
 return Scope.get_current_scope().trace_propagation_meta(
 span=span,
 )


GLOBAL_HUB = Hub()
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[Experiment] New scope step3#2606

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.

 Sign up for GitHub

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

 Closed

antonpirker
wants to merge
21
commits into

from

 Closed


[Experiment] New scope step3
#2606
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
c6c51fd

Added new global APIs


antonpirker Dec 18, 2023
cb50afb

whitespace


antonpirker Dec 18, 2023
1ea1a7d

Some apidocs


antonpirker Dec 18, 2023
76da765

Added 'new in version' to apidocs


antonpirker Dec 18, 2023
8c5cc68

Merge branch 'new-scope-step1' into new-scope-step2


antonpirker Dec 18, 2023
af59f78

formatting


antonpirker Dec 18, 2023
96a22ef

formatting


antonpirker Dec 18, 2023
5f2ec29

First try to switch Scope with new scope mechanisms under the hood


antonpirker Dec 18, 2023
790b0bc

Fixed add_breadcrumb (to always use isolation scope for now


antonpirker Dec 18, 2023
bf94514

Sorted imports


antonpirker Dec 18, 2023
1386be7

Fixed import


antonpirker Dec 18, 2023
6cb1fad

Try to break recurson


antonpirker Dec 18, 2023
23e8b42

Moved api to prevent ciruclar imports


antonpirker Dec 19, 2023
b9df63f

Move get_client into scope to prevent circular imports


antonpirker Dec 19, 2023
099a94a

Named it get_client, its better


antonpirker Dec 19, 2023
905f29c

Named it get_client, its better


antonpirker Dec 19, 2023
85e4f0f

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
77d8b88

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
ee1ab65

Merge branch 'new-scope-step3' of github.com:getsentry/sentry-python …


antonpirker Dec 19, 2023
2534918

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
8c5d3bb

Cleanup


antonpirker Dec 19, 2023

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


7 changes: 3 additions & 4 deletions
sentry_sdk/debug.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
import logging

from sentry_sdk import utils
from sentry_sdk.api import get_client
from sentry_sdk.hub import Hub
from sentry_sdk.utils import logger
from sentry_sdk.client import _client_init_debug
Expand All@@ -13,10 +14,8 @@ def filter(self, record):
 # type: (LogRecord) -> bool
 if _client_init_debug.get(False):
 return True
 hub = Hub.current
 if hub is not None and hub.client is not None:
 return hub.client.options["debug"]
 return False

 return get_client().options["debug"]


def init_debug_support():
Expand Down

116 changes: 38 additions & 78 deletions
sentry_sdk/hub.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
from sentry_sdk._compat import with_metaclass
from sentry_sdk.consts import INSTRUMENTER
from sentry_sdk.scope import Scope
from sentry_sdk.client import Client
from sentry_sdk.client import Client, NoopClient
from sentry_sdk.tracing import (
 NoOpSpan,
 Span,
Expand DownExpand Up@@ -266,21 +266,19 @@ def get_integration(
 If the return value is not `None` the hub is guaranteed to have a
 client attached.
 """
 client = self.client
 if client is not None:
 return client.get_integration(name_or_class)
 Scope.get_client().get_integration(name_or_class)

 @property
 def client(self):
 # type: () -> Optional[Client]
 # type: () -> Optional[NoopClient]
 """Returns the current client on the hub."""
 return self._stack[-1][0]
 return Scope.get_client()

 @property
 def scope(self):
 # type: () -> Scope
 """Returns the current scope on the hub."""
 return self._stack[-1][1]
 return Scope.get_current_scope()

 def last_event_id(self):
 # type: () -> Optional[str]
Expand All@@ -292,8 +290,7 @@ def bind_client(
 ):
 # type: (...) -> None
 """Binds a new client to the hub."""
 top = self._stack[-1]
 self._stack[-1] = (new, top[1])
 Scope.get_global_scope().set_client(new)

 def capture_event(self, event, hint=None, scope=None, **scope_kwargs):
 # type: (Event, Optional[Hint], Optional[Scope], Any) -> Optional[str]
Expand All@@ -313,12 +310,8 @@ def capture_event(self, event, hint=None, scope=None, **scope_kwargs):
 For supported `**scope_kwargs` see :py:meth:`sentry_sdk.Scope.update_from_kwargs`.
 The `scope` and `scope_kwargs` parameters are mutually exclusive.
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_event(
 event, hint, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_event(
 event, hint, scope=scope, **scope_kwargs
 )

 is_transaction = event.get("type") == "transaction"
Expand DownExpand Up@@ -347,12 +340,8 @@ def capture_message(self, message, level=None, scope=None, **scope_kwargs):

 :returns: An `event_id` if the SDK decided to send the event (see :py:meth:`sentry_sdk.Client.capture_event`).
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_message(
 message, level=level, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_message(
 message, level=level, scope=scope, **scope_kwargs
 )

 if last_event_id is not None:
Expand All@@ -377,12 +366,8 @@ def capture_exception(self, error=None, scope=None, **scope_kwargs):

 :returns: An `event_id` if the SDK decided to send the event (see :py:meth:`sentry_sdk.Client.capture_event`).
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_exception(
 error, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_exception(
 error, scope=scope, **scope_kwargs
 )

 if last_event_id is not None:
Expand DownExpand Up@@ -414,14 +399,7 @@ def add_breadcrumb(self, crumb=None, hint=None, **kwargs):
 :param hint: An optional value that can be used by `before_breadcrumb`
 to customize the breadcrumbs that are emitted.
 """
 client, scope = self._stack[-1]
 if client is None:
 logger.info("Dropped breadcrumb because no client bound")
 return

 kwargs["client"] = client

 scope.add_breadcrumb(crumb, hint, **kwargs)
 Scope.get_isolation_scope().add_breadcrumb(crumb, hint, **kwargs)

 def start_span(self, span=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs):
 # type: (Optional[Span], str, Any) -> Span
Expand All@@ -440,12 +418,12 @@ def start_span(self, span=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs):

 For supported `**kwargs` see :py:class:`sentry_sdk.tracing.Span`.
 """
 client, scope = self._stack[-1]

 # TODO: fix hub
 kwargs["hub"] = self
 kwargs["client"] = client

 return scope.start_span(span=span, instrumenter=instrumenter, **kwargs)
 return Scope.get_isolation_scope().start_span(
 span=span, instrumenter=instrumenter, **kwargs
 )

 def start_transaction(
 self, transaction=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs
Expand DownExpand Up@@ -475,12 +453,10 @@ def start_transaction(

 For supported `**kwargs` see :py:class:`sentry_sdk.tracing.Transaction`.
 """
 client, scope = self._stack[-1]

 # TODO: fix hub
 kwargs["hub"] = self
 kwargs["client"] = client

 return scope.start_transaction(
 return Scope.get_isolation_scope().start_transaction(
 transaction=transaction, instrumenter=instrumenter, **kwargs
 )

Expand All@@ -489,9 +465,7 @@ def continue_trace(self, environ_or_headers, op=None, name=None, source=None):
 """
 Sets the propagation context from environment or headers and returns a transaction.
 """
 scope = self._stack[-1][1]

 return scope.continue_trace(
 return Scope.get_isolation_scope().continue_trace(
 environ_or_headers=environ_or_headers, op=op, name=name, source=source
 )

Expand DownExpand Up@@ -580,25 +554,19 @@ def configure_scope( # noqa

 :returns: If no callback is provided, returns a context manager that returns the scope.
 """

 client, scope = self._stack[-1]
 scope = Scope.get_isolation_scope()

 if continue_trace:
scope.generate_propagation_context()
Scope.get_isolation_scope().generate_propagation_context()

 if callback is not None:
 if client is not None:
 callback(scope)

 return None
 # TODO: used to return None when client is None. Check if this changes behavior.
 callback(scope)

 @contextmanager
 def inner():
 # type: () -> Generator[Scope, None, None]
 if client is not None:
 yield scope
 else:
 yield Scope()
 yield scope

 return inner()

Expand All@@ -607,17 +575,14 @@ def start_session(
 ):
 # type: (...) -> None
 """Starts a new session."""
 client, scope = self._stack[-1]
 scope.start_session(
 client=client,
 Scope.get_isolation_scope().start_session(
 session_mode=session_mode,
 )

 def end_session(self):
 # type: (...) -> None
 """Ends the current session if there is one."""
 client, scope = self._stack[-1]
 scope.end_session(client=client)
 Scope.get_isolation_scope().end_session()

 def stop_auto_session_tracking(self):
 # type: (...) -> None
Expand All@@ -626,17 +591,15 @@ def stop_auto_session_tracking(self):
 This temporarily session tracking for the current scope when called.
 To resume session tracking call `resume_auto_session_tracking`.
 """
 client, scope = self._stack[-1]
 scope.stop_auto_session_tracking(client=client)
 Scope.get_isolation_scope().stop_auto_session_tracking()

 def resume_auto_session_tracking(self):
 # type: (...) -> None
 """Resumes automatic session tracking for the current scope if
 disabled earlier. This requires that generally automatic session
 tracking is enabled.
 """
 scope = self._stack[-1][1]
 scope.resume_auto_session_tracking()
 Scope.get_isolation_scope().resume_auto_session_tracking()

 def flush(
 self,
Expand All@@ -647,25 +610,21 @@ def flush(
 """
 Alias for :py:meth:`sentry_sdk.Client.flush`
 """
 client, scope = self._stack[-1]
 if client is not None:
 return client.flush(timeout=timeout, callback=callback)
 return Scope.get_client().flush(timeout=timeout, callback=callback)

 def get_traceparent(self):
 # type: () -> Optional[str]
 """
 Returns the traceparent either from the active span or from the scope.
 """
 client, scope = self._stack[-1]
 return scope.get_traceparent(client=client)
 return Scope.get_current_scope().get_traceparent()

 def get_baggage(self):
 # type: () -> Optional[str]
 """
 Returns Baggage either from the active span or from the scope.
 """
 client, scope = self._stack[-1]
 baggage = scope.get_baggage(client=client)
 baggage = Scope.get_current_scope().get_baggage()

 if baggage is not None:
 return baggage.serialize()
Expand All@@ -679,9 +638,9 @@ def iter_trace_propagation_headers(self, span=None):
 from the span representing the request, if available, or the current
 span on the scope if not.
 """
client, scope = self._stack[-1]

return scope.iter_trace_propagation_headers(span=span, client=client)
return Scope.get_current_scope().iter_trace_propagation_headers(
 span=span,
 )

 def trace_propagation_meta(self, span=None):
 # type: (Optional[Span]) -> str
Expand All@@ -694,8 +653,9 @@ def trace_propagation_meta(self, span=None):
 "The parameter `span` in trace_propagation_meta() is deprecated and will be removed in the future."
 )

 client, scope = self._stack[-1]
 return scope.trace_propagation_meta(span=span, client=client)
 return Scope.get_current_scope().trace_propagation_meta(
 span=span,
 )


GLOBAL_HUB = Hub()
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Experiment] New scope step3#2606

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.

 Sign up for GitHub

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

 Closed

antonpirker
wants to merge
21
commits into

from

 Closed


[Experiment] New scope step3
#2606
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
c6c51fd

Added new global APIs


antonpirker Dec 18, 2023
cb50afb

whitespace


antonpirker Dec 18, 2023
1ea1a7d

Some apidocs


antonpirker Dec 18, 2023
76da765

Added 'new in version' to apidocs


antonpirker Dec 18, 2023
8c5cc68

Merge branch 'new-scope-step1' into new-scope-step2


antonpirker Dec 18, 2023
af59f78

formatting


antonpirker Dec 18, 2023
96a22ef

formatting


antonpirker Dec 18, 2023
5f2ec29

First try to switch Scope with new scope mechanisms under the hood


antonpirker Dec 18, 2023
790b0bc

Fixed add_breadcrumb (to always use isolation scope for now


antonpirker Dec 18, 2023
bf94514

Sorted imports


antonpirker Dec 18, 2023
1386be7

Fixed import


antonpirker Dec 18, 2023
6cb1fad

Try to break recurson


antonpirker Dec 18, 2023
23e8b42

Moved api to prevent ciruclar imports


antonpirker Dec 19, 2023
b9df63f

Move get_client into scope to prevent circular imports


antonpirker Dec 19, 2023
099a94a

Named it get_client, its better


antonpirker Dec 19, 2023
905f29c

Named it get_client, its better


antonpirker Dec 19, 2023
85e4f0f

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
77d8b88

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
ee1ab65

Merge branch 'new-scope-step3' of github.com:getsentry/sentry-python …


antonpirker Dec 19, 2023
2534918

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
8c5d3bb

Cleanup


antonpirker Dec 19, 2023

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


7 changes: 3 additions & 4 deletions
sentry_sdk/debug.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
import logging

from sentry_sdk import utils
from sentry_sdk.api import get_client
from sentry_sdk.hub import Hub
from sentry_sdk.utils import logger
from sentry_sdk.client import _client_init_debug
Expand All@@ -13,10 +14,8 @@ def filter(self, record):
 # type: (LogRecord) -> bool
 if _client_init_debug.get(False):
 return True
 hub = Hub.current
 if hub is not None and hub.client is not None:
 return hub.client.options["debug"]
 return False

 return get_client().options["debug"]


def init_debug_support():
Expand Down

116 changes: 38 additions & 78 deletions
sentry_sdk/hub.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
from sentry_sdk._compat import with_metaclass
from sentry_sdk.consts import INSTRUMENTER
from sentry_sdk.scope import Scope
from sentry_sdk.client import Client
from sentry_sdk.client import Client, NoopClient
from sentry_sdk.tracing import (
 NoOpSpan,
 Span,
Expand DownExpand Up@@ -266,21 +266,19 @@ def get_integration(
 If the return value is not `None` the hub is guaranteed to have a
 client attached.
 """
 client = self.client
 if client is not None:
 return client.get_integration(name_or_class)
 Scope.get_client().get_integration(name_or_class)

 @property
 def client(self):
 # type: () -> Optional[Client]
 # type: () -> Optional[NoopClient]
 """Returns the current client on the hub."""
 return self._stack[-1][0]
 return Scope.get_client()

 @property
 def scope(self):
 # type: () -> Scope
 """Returns the current scope on the hub."""
 return self._stack[-1][1]
 return Scope.get_current_scope()

 def last_event_id(self):
 # type: () -> Optional[str]
Expand All@@ -292,8 +290,7 @@ def bind_client(
 ):
 # type: (...) -> None
 """Binds a new client to the hub."""
 top = self._stack[-1]
 self._stack[-1] = (new, top[1])
 Scope.get_global_scope().set_client(new)

 def capture_event(self, event, hint=None, scope=None, **scope_kwargs):
 # type: (Event, Optional[Hint], Optional[Scope], Any) -> Optional[str]
Expand All@@ -313,12 +310,8 @@ def capture_event(self, event, hint=None, scope=None, **scope_kwargs):
 For supported `**scope_kwargs` see :py:meth:`sentry_sdk.Scope.update_from_kwargs`.
 The `scope` and `scope_kwargs` parameters are mutually exclusive.
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_event(
 event, hint, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_event(
 event, hint, scope=scope, **scope_kwargs
 )

 is_transaction = event.get("type") == "transaction"
Expand DownExpand Up@@ -347,12 +340,8 @@ def capture_message(self, message, level=None, scope=None, **scope_kwargs):

 :returns: An `event_id` if the SDK decided to send the event (see :py:meth:`sentry_sdk.Client.capture_event`).
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_message(
 message, level=level, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_message(
 message, level=level, scope=scope, **scope_kwargs
 )

 if last_event_id is not None:
Expand All@@ -377,12 +366,8 @@ def capture_exception(self, error=None, scope=None, **scope_kwargs):

 :returns: An `event_id` if the SDK decided to send the event (see :py:meth:`sentry_sdk.Client.capture_event`).
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_exception(
 error, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_exception(
 error, scope=scope, **scope_kwargs
 )

 if last_event_id is not None:
Expand DownExpand Up@@ -414,14 +399,7 @@ def add_breadcrumb(self, crumb=None, hint=None, **kwargs):
 :param hint: An optional value that can be used by `before_breadcrumb`
 to customize the breadcrumbs that are emitted.
 """
 client, scope = self._stack[-1]
 if client is None:
 logger.info("Dropped breadcrumb because no client bound")
 return

 kwargs["client"] = client

 scope.add_breadcrumb(crumb, hint, **kwargs)
 Scope.get_isolation_scope().add_breadcrumb(crumb, hint, **kwargs)

 def start_span(self, span=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs):
 # type: (Optional[Span], str, Any) -> Span
Expand All@@ -440,12 +418,12 @@ def start_span(self, span=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs):

 For supported `**kwargs` see :py:class:`sentry_sdk.tracing.Span`.
 """
 client, scope = self._stack[-1]

 # TODO: fix hub
 kwargs["hub"] = self
 kwargs["client"] = client

 return scope.start_span(span=span, instrumenter=instrumenter, **kwargs)
 return Scope.get_isolation_scope().start_span(
 span=span, instrumenter=instrumenter, **kwargs
 )

 def start_transaction(
 self, transaction=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs
Expand DownExpand Up@@ -475,12 +453,10 @@ def start_transaction(

 For supported `**kwargs` see :py:class:`sentry_sdk.tracing.Transaction`.
 """
 client, scope = self._stack[-1]

 # TODO: fix hub
 kwargs["hub"] = self
 kwargs["client"] = client

 return scope.start_transaction(
 return Scope.get_isolation_scope().start_transaction(
 transaction=transaction, instrumenter=instrumenter, **kwargs
 )

Expand All@@ -489,9 +465,7 @@ def continue_trace(self, environ_or_headers, op=None, name=None, source=None):
 """
 Sets the propagation context from environment or headers and returns a transaction.
 """
 scope = self._stack[-1][1]

 return scope.continue_trace(
 return Scope.get_isolation_scope().continue_trace(
 environ_or_headers=environ_or_headers, op=op, name=name, source=source
 )

Expand DownExpand Up@@ -580,25 +554,19 @@ def configure_scope( # noqa

 :returns: If no callback is provided, returns a context manager that returns the scope.
 """

 client, scope = self._stack[-1]
 scope = Scope.get_isolation_scope()

 if continue_trace:
scope.generate_propagation_context()
Scope.get_isolation_scope().generate_propagation_context()

 if callback is not None:
 if client is not None:
 callback(scope)

 return None
 # TODO: used to return None when client is None. Check if this changes behavior.
 callback(scope)

 @contextmanager
 def inner():
 # type: () -> Generator[Scope, None, None]
 if client is not None:
 yield scope
 else:
 yield Scope()
 yield scope

 return inner()

Expand All@@ -607,17 +575,14 @@ def start_session(
 ):
 # type: (...) -> None
 """Starts a new session."""
 client, scope = self._stack[-1]
 scope.start_session(
 client=client,
 Scope.get_isolation_scope().start_session(
 session_mode=session_mode,
 )

 def end_session(self):
 # type: (...) -> None
 """Ends the current session if there is one."""
 client, scope = self._stack[-1]
 scope.end_session(client=client)
 Scope.get_isolation_scope().end_session()

 def stop_auto_session_tracking(self):
 # type: (...) -> None
Expand All@@ -626,17 +591,15 @@ def stop_auto_session_tracking(self):
 This temporarily session tracking for the current scope when called.
 To resume session tracking call `resume_auto_session_tracking`.
 """
 client, scope = self._stack[-1]
 scope.stop_auto_session_tracking(client=client)
 Scope.get_isolation_scope().stop_auto_session_tracking()

 def resume_auto_session_tracking(self):
 # type: (...) -> None
 """Resumes automatic session tracking for the current scope if
 disabled earlier. This requires that generally automatic session
 tracking is enabled.
 """
 scope = self._stack[-1][1]
 scope.resume_auto_session_tracking()
 Scope.get_isolation_scope().resume_auto_session_tracking()

 def flush(
 self,
Expand All@@ -647,25 +610,21 @@ def flush(
 """
 Alias for :py:meth:`sentry_sdk.Client.flush`
 """
 client, scope = self._stack[-1]
 if client is not None:
 return client.flush(timeout=timeout, callback=callback)
 return Scope.get_client().flush(timeout=timeout, callback=callback)

 def get_traceparent(self):
 # type: () -> Optional[str]
 """
 Returns the traceparent either from the active span or from the scope.
 """
 client, scope = self._stack[-1]
 return scope.get_traceparent(client=client)
 return Scope.get_current_scope().get_traceparent()

 def get_baggage(self):
 # type: () -> Optional[str]
 """
 Returns Baggage either from the active span or from the scope.
 """
 client, scope = self._stack[-1]
 baggage = scope.get_baggage(client=client)
 baggage = Scope.get_current_scope().get_baggage()

 if baggage is not None:
 return baggage.serialize()
Expand All@@ -679,9 +638,9 @@ def iter_trace_propagation_headers(self, span=None):
 from the span representing the request, if available, or the current
 span on the scope if not.
 """
client, scope = self._stack[-1]

return scope.iter_trace_propagation_headers(span=span, client=client)
return Scope.get_current_scope().iter_trace_propagation_headers(
 span=span,
 )

 def trace_propagation_meta(self, span=None):
 # type: (Optional[Span]) -> str
Expand All@@ -694,8 +653,9 @@ def trace_propagation_meta(self, span=None):
 "The parameter `span` in trace_propagation_meta() is deprecated and will be removed in the future."
 )

 client, scope = self._stack[-1]
 return scope.trace_propagation_meta(span=span, client=client)
 return Scope.get_current_scope().trace_propagation_meta(
 span=span,
 )


GLOBAL_HUB = Hub()
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Experiment] New scope step3#2606

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.

 Sign up for GitHub

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

 Closed

antonpirker
wants to merge
21
commits into

from

 Closed


[Experiment] New scope step3
#2606
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
c6c51fd

Added new global APIs


antonpirker Dec 18, 2023
cb50afb

whitespace


antonpirker Dec 18, 2023
1ea1a7d

Some apidocs


antonpirker Dec 18, 2023
76da765

Added 'new in version' to apidocs


antonpirker Dec 18, 2023
8c5cc68

Merge branch 'new-scope-step1' into new-scope-step2


antonpirker Dec 18, 2023
af59f78

formatting


antonpirker Dec 18, 2023
96a22ef

formatting


antonpirker Dec 18, 2023
5f2ec29

First try to switch Scope with new scope mechanisms under the hood


antonpirker Dec 18, 2023
790b0bc

Fixed add_breadcrumb (to always use isolation scope for now


antonpirker Dec 18, 2023
bf94514

Sorted imports


antonpirker Dec 18, 2023
1386be7

Fixed import


antonpirker Dec 18, 2023
6cb1fad

Try to break recurson


antonpirker Dec 18, 2023
23e8b42

Moved api to prevent ciruclar imports


antonpirker Dec 19, 2023
b9df63f

Move get_client into scope to prevent circular imports


antonpirker Dec 19, 2023
099a94a

Named it get_client, its better


antonpirker Dec 19, 2023
905f29c

Named it get_client, its better


antonpirker Dec 19, 2023
85e4f0f

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
77d8b88

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
ee1ab65

Merge branch 'new-scope-step3' of github.com:getsentry/sentry-python …


antonpirker Dec 19, 2023
2534918

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
8c5d3bb

Cleanup


antonpirker Dec 19, 2023

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


7 changes: 3 additions & 4 deletions
sentry_sdk/debug.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
import logging

from sentry_sdk import utils
from sentry_sdk.api import get_client
from sentry_sdk.hub import Hub
from sentry_sdk.utils import logger
from sentry_sdk.client import _client_init_debug
Expand All@@ -13,10 +14,8 @@ def filter(self, record):
 # type: (LogRecord) -> bool
 if _client_init_debug.get(False):
 return True
 hub = Hub.current
 if hub is not None and hub.client is not None:
 return hub.client.options["debug"]
 return False

 return get_client().options["debug"]


def init_debug_support():
Expand Down

116 changes: 38 additions & 78 deletions
sentry_sdk/hub.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
from sentry_sdk._compat import with_metaclass
from sentry_sdk.consts import INSTRUMENTER
from sentry_sdk.scope import Scope
from sentry_sdk.client import Client
from sentry_sdk.client import Client, NoopClient
from sentry_sdk.tracing import (
 NoOpSpan,
 Span,
Expand DownExpand Up@@ -266,21 +266,19 @@ def get_integration(
 If the return value is not `None` the hub is guaranteed to have a
 client attached.
 """
 client = self.client
 if client is not None:
 return client.get_integration(name_or_class)
 Scope.get_client().get_integration(name_or_class)

 @property
 def client(self):
 # type: () -> Optional[Client]
 # type: () -> Optional[NoopClient]
 """Returns the current client on the hub."""
 return self._stack[-1][0]
 return Scope.get_client()

 @property
 def scope(self):
 # type: () -> Scope
 """Returns the current scope on the hub."""
 return self._stack[-1][1]
 return Scope.get_current_scope()

 def last_event_id(self):
 # type: () -> Optional[str]
Expand All@@ -292,8 +290,7 @@ def bind_client(
 ):
 # type: (...) -> None
 """Binds a new client to the hub."""
 top = self._stack[-1]
 self._stack[-1] = (new, top[1])
 Scope.get_global_scope().set_client(new)

 def capture_event(self, event, hint=None, scope=None, **scope_kwargs):
 # type: (Event, Optional[Hint], Optional[Scope], Any) -> Optional[str]
Expand All@@ -313,12 +310,8 @@ def capture_event(self, event, hint=None, scope=None, **scope_kwargs):
 For supported `**scope_kwargs` see :py:meth:`sentry_sdk.Scope.update_from_kwargs`.
 The `scope` and `scope_kwargs` parameters are mutually exclusive.
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_event(
 event, hint, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_event(
 event, hint, scope=scope, **scope_kwargs
 )

 is_transaction = event.get("type") == "transaction"
Expand DownExpand Up@@ -347,12 +340,8 @@ def capture_message(self, message, level=None, scope=None, **scope_kwargs):

 :returns: An `event_id` if the SDK decided to send the event (see :py:meth:`sentry_sdk.Client.capture_event`).
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_message(
 message, level=level, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_message(
 message, level=level, scope=scope, **scope_kwargs
 )

 if last_event_id is not None:
Expand All@@ -377,12 +366,8 @@ def capture_exception(self, error=None, scope=None, **scope_kwargs):

 :returns: An `event_id` if the SDK decided to send the event (see :py:meth:`sentry_sdk.Client.capture_event`).
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_exception(
 error, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_exception(
 error, scope=scope, **scope_kwargs
 )

 if last_event_id is not None:
Expand DownExpand Up@@ -414,14 +399,7 @@ def add_breadcrumb(self, crumb=None, hint=None, **kwargs):
 :param hint: An optional value that can be used by `before_breadcrumb`
 to customize the breadcrumbs that are emitted.
 """
 client, scope = self._stack[-1]
 if client is None:
 logger.info("Dropped breadcrumb because no client bound")
 return

 kwargs["client"] = client

 scope.add_breadcrumb(crumb, hint, **kwargs)
 Scope.get_isolation_scope().add_breadcrumb(crumb, hint, **kwargs)

 def start_span(self, span=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs):
 # type: (Optional[Span], str, Any) -> Span
Expand All@@ -440,12 +418,12 @@ def start_span(self, span=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs):

 For supported `**kwargs` see :py:class:`sentry_sdk.tracing.Span`.
 """
 client, scope = self._stack[-1]

 # TODO: fix hub
 kwargs["hub"] = self
 kwargs["client"] = client

 return scope.start_span(span=span, instrumenter=instrumenter, **kwargs)
 return Scope.get_isolation_scope().start_span(
 span=span, instrumenter=instrumenter, **kwargs
 )

 def start_transaction(
 self, transaction=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs
Expand DownExpand Up@@ -475,12 +453,10 @@ def start_transaction(

 For supported `**kwargs` see :py:class:`sentry_sdk.tracing.Transaction`.
 """
 client, scope = self._stack[-1]

 # TODO: fix hub
 kwargs["hub"] = self
 kwargs["client"] = client

 return scope.start_transaction(
 return Scope.get_isolation_scope().start_transaction(
 transaction=transaction, instrumenter=instrumenter, **kwargs
 )

Expand All@@ -489,9 +465,7 @@ def continue_trace(self, environ_or_headers, op=None, name=None, source=None):
 """
 Sets the propagation context from environment or headers and returns a transaction.
 """
 scope = self._stack[-1][1]

 return scope.continue_trace(
 return Scope.get_isolation_scope().continue_trace(
 environ_or_headers=environ_or_headers, op=op, name=name, source=source
 )

Expand DownExpand Up@@ -580,25 +554,19 @@ def configure_scope( # noqa

 :returns: If no callback is provided, returns a context manager that returns the scope.
 """

 client, scope = self._stack[-1]
 scope = Scope.get_isolation_scope()

 if continue_trace:
scope.generate_propagation_context()
Scope.get_isolation_scope().generate_propagation_context()

 if callback is not None:
 if client is not None:
 callback(scope)

 return None
 # TODO: used to return None when client is None. Check if this changes behavior.
 callback(scope)

 @contextmanager
 def inner():
 # type: () -> Generator[Scope, None, None]
 if client is not None:
 yield scope
 else:
 yield Scope()
 yield scope

 return inner()

Expand All@@ -607,17 +575,14 @@ def start_session(
 ):
 # type: (...) -> None
 """Starts a new session."""
 client, scope = self._stack[-1]
 scope.start_session(
 client=client,
 Scope.get_isolation_scope().start_session(
 session_mode=session_mode,
 )

 def end_session(self):
 # type: (...) -> None
 """Ends the current session if there is one."""
 client, scope = self._stack[-1]
 scope.end_session(client=client)
 Scope.get_isolation_scope().end_session()

 def stop_auto_session_tracking(self):
 # type: (...) -> None
Expand All@@ -626,17 +591,15 @@ def stop_auto_session_tracking(self):
 This temporarily session tracking for the current scope when called.
 To resume session tracking call `resume_auto_session_tracking`.
 """
 client, scope = self._stack[-1]
 scope.stop_auto_session_tracking(client=client)
 Scope.get_isolation_scope().stop_auto_session_tracking()

 def resume_auto_session_tracking(self):
 # type: (...) -> None
 """Resumes automatic session tracking for the current scope if
 disabled earlier. This requires that generally automatic session
 tracking is enabled.
 """
 scope = self._stack[-1][1]
 scope.resume_auto_session_tracking()
 Scope.get_isolation_scope().resume_auto_session_tracking()

 def flush(
 self,
Expand All@@ -647,25 +610,21 @@ def flush(
 """
 Alias for :py:meth:`sentry_sdk.Client.flush`
 """
 client, scope = self._stack[-1]
 if client is not None:
 return client.flush(timeout=timeout, callback=callback)
 return Scope.get_client().flush(timeout=timeout, callback=callback)

 def get_traceparent(self):
 # type: () -> Optional[str]
 """
 Returns the traceparent either from the active span or from the scope.
 """
 client, scope = self._stack[-1]
 return scope.get_traceparent(client=client)
 return Scope.get_current_scope().get_traceparent()

 def get_baggage(self):
 # type: () -> Optional[str]
 """
 Returns Baggage either from the active span or from the scope.
 """
 client, scope = self._stack[-1]
 baggage = scope.get_baggage(client=client)
 baggage = Scope.get_current_scope().get_baggage()

 if baggage is not None:
 return baggage.serialize()
Expand All@@ -679,9 +638,9 @@ def iter_trace_propagation_headers(self, span=None):
 from the span representing the request, if available, or the current
 span on the scope if not.
 """
client, scope = self._stack[-1]

return scope.iter_trace_propagation_headers(span=span, client=client)
return Scope.get_current_scope().iter_trace_propagation_headers(
 span=span,
 )

 def trace_propagation_meta(self, span=None):
 # type: (Optional[Span]) -> str
Expand All@@ -694,8 +653,9 @@ def trace_propagation_meta(self, span=None):
 "The parameter `span` in trace_propagation_meta() is deprecated and will be removed in the future."
 )

 client, scope = self._stack[-1]
 return scope.trace_propagation_meta(span=span, client=client)
 return Scope.get_current_scope().trace_propagation_meta(
 span=span,
 )


GLOBAL_HUB = Hub()
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[Experiment] New scope step3#2606

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.

 Sign up for GitHub

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

 Closed

antonpirker
wants to merge
21
commits into

from

 Closed


[Experiment] New scope step3
#2606
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
c6c51fd

Added new global APIs


antonpirker Dec 18, 2023
cb50afb

whitespace


antonpirker Dec 18, 2023
1ea1a7d

Some apidocs


antonpirker Dec 18, 2023
76da765

Added 'new in version' to apidocs


antonpirker Dec 18, 2023
8c5cc68

Merge branch 'new-scope-step1' into new-scope-step2


antonpirker Dec 18, 2023
af59f78

formatting


antonpirker Dec 18, 2023
96a22ef

formatting


antonpirker Dec 18, 2023
5f2ec29

First try to switch Scope with new scope mechanisms under the hood


antonpirker Dec 18, 2023
790b0bc

Fixed add_breadcrumb (to always use isolation scope for now


antonpirker Dec 18, 2023
bf94514

Sorted imports


antonpirker Dec 18, 2023
1386be7

Fixed import


antonpirker Dec 18, 2023
6cb1fad

Try to break recurson


antonpirker Dec 18, 2023
23e8b42

Moved api to prevent ciruclar imports


antonpirker Dec 19, 2023
b9df63f

Move get_client into scope to prevent circular imports


antonpirker Dec 19, 2023
099a94a

Named it get_client, its better


antonpirker Dec 19, 2023
905f29c

Named it get_client, its better


antonpirker Dec 19, 2023
85e4f0f

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
77d8b88

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
ee1ab65

Merge branch 'new-scope-step3' of github.com:getsentry/sentry-python …


antonpirker Dec 19, 2023
2534918

Merge branch 'new-scope-step1' into new-scope-step3


antonpirker Dec 19, 2023
8c5d3bb

Cleanup


antonpirker Dec 19, 2023

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


7 changes: 3 additions & 4 deletions
sentry_sdk/debug.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
import logging

from sentry_sdk import utils
from sentry_sdk.api import get_client
from sentry_sdk.hub import Hub
from sentry_sdk.utils import logger
from sentry_sdk.client import _client_init_debug
Expand All@@ -13,10 +14,8 @@ def filter(self, record):
 # type: (LogRecord) -> bool
 if _client_init_debug.get(False):
 return True
 hub = Hub.current
 if hub is not None and hub.client is not None:
 return hub.client.options["debug"]
 return False

 return get_client().options["debug"]


def init_debug_support():
Expand Down

116 changes: 38 additions & 78 deletions
sentry_sdk/hub.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
from sentry_sdk._compat import with_metaclass
from sentry_sdk.consts import INSTRUMENTER
from sentry_sdk.scope import Scope
from sentry_sdk.client import Client
from sentry_sdk.client import Client, NoopClient
from sentry_sdk.tracing import (
 NoOpSpan,
 Span,
Expand DownExpand Up@@ -266,21 +266,19 @@ def get_integration(
 If the return value is not `None` the hub is guaranteed to have a
 client attached.
 """
 client = self.client
 if client is not None:
 return client.get_integration(name_or_class)
 Scope.get_client().get_integration(name_or_class)

 @property
 def client(self):
 # type: () -> Optional[Client]
 # type: () -> Optional[NoopClient]
 """Returns the current client on the hub."""
 return self._stack[-1][0]
 return Scope.get_client()

 @property
 def scope(self):
 # type: () -> Scope
 """Returns the current scope on the hub."""
 return self._stack[-1][1]
 return Scope.get_current_scope()

 def last_event_id(self):
 # type: () -> Optional[str]
Expand All@@ -292,8 +290,7 @@ def bind_client(
 ):
 # type: (...) -> None
 """Binds a new client to the hub."""
 top = self._stack[-1]
 self._stack[-1] = (new, top[1])
 Scope.get_global_scope().set_client(new)

 def capture_event(self, event, hint=None, scope=None, **scope_kwargs):
 # type: (Event, Optional[Hint], Optional[Scope], Any) -> Optional[str]
Expand All@@ -313,12 +310,8 @@ def capture_event(self, event, hint=None, scope=None, **scope_kwargs):
 For supported `**scope_kwargs` see :py:meth:`sentry_sdk.Scope.update_from_kwargs`.
 The `scope` and `scope_kwargs` parameters are mutually exclusive.
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_event(
 event, hint, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_event(
 event, hint, scope=scope, **scope_kwargs
 )

 is_transaction = event.get("type") == "transaction"
Expand DownExpand Up@@ -347,12 +340,8 @@ def capture_message(self, message, level=None, scope=None, **scope_kwargs):

 :returns: An `event_id` if the SDK decided to send the event (see :py:meth:`sentry_sdk.Client.capture_event`).
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_message(
 message, level=level, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_message(
 message, level=level, scope=scope, **scope_kwargs
 )

 if last_event_id is not None:
Expand All@@ -377,12 +366,8 @@ def capture_exception(self, error=None, scope=None, **scope_kwargs):

 :returns: An `event_id` if the SDK decided to send the event (see :py:meth:`sentry_sdk.Client.capture_event`).
 """
 client, top_scope = self._stack[-1]
 if client is None:
 return None

 last_event_id = top_scope.capture_exception(
 error, client=client, scope=scope, **scope_kwargs
 last_event_id = Scope.get_current_scope().capture_exception(
 error, scope=scope, **scope_kwargs
 )

 if last_event_id is not None:
Expand DownExpand Up@@ -414,14 +399,7 @@ def add_breadcrumb(self, crumb=None, hint=None, **kwargs):
 :param hint: An optional value that can be used by `before_breadcrumb`
 to customize the breadcrumbs that are emitted.
 """
 client, scope = self._stack[-1]
 if client is None:
 logger.info("Dropped breadcrumb because no client bound")
 return

 kwargs["client"] = client

 scope.add_breadcrumb(crumb, hint, **kwargs)
 Scope.get_isolation_scope().add_breadcrumb(crumb, hint, **kwargs)

 def start_span(self, span=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs):
 # type: (Optional[Span], str, Any) -> Span
Expand All@@ -440,12 +418,12 @@ def start_span(self, span=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs):

 For supported `**kwargs` see :py:class:`sentry_sdk.tracing.Span`.
 """
 client, scope = self._stack[-1]

 # TODO: fix hub
 kwargs["hub"] = self
 kwargs["client"] = client

 return scope.start_span(span=span, instrumenter=instrumenter, **kwargs)
 return Scope.get_isolation_scope().start_span(
 span=span, instrumenter=instrumenter, **kwargs
 )

 def start_transaction(
 self, transaction=None, instrumenter=INSTRUMENTER.SENTRY, **kwargs
Expand DownExpand Up@@ -475,12 +453,10 @@ def start_transaction(

 For supported `**kwargs` see :py:class:`sentry_sdk.tracing.Transaction`.
 """
 client, scope = self._stack[-1]

 # TODO: fix hub
 kwargs["hub"] = self
 kwargs["client"] = client

 return scope.start_transaction(
 return Scope.get_isolation_scope().start_transaction(
 transaction=transaction, instrumenter=instrumenter, **kwargs
 )

Expand All@@ -489,9 +465,7 @@ def continue_trace(self, environ_or_headers, op=None, name=None, source=None):
 """
 Sets the propagation context from environment or headers and returns a transaction.
 """
 scope = self._stack[-1][1]

 return scope.continue_trace(
 return Scope.get_isolation_scope().continue_trace(
 environ_or_headers=environ_or_headers, op=op, name=name, source=source
 )

Expand DownExpand Up@@ -580,25 +554,19 @@ def configure_scope( # noqa

 :returns: If no callback is provided, returns a context manager that returns the scope.
 """

 client, scope = self._stack[-1]
 scope = Scope.get_isolation_scope()

 if continue_trace:
scope.generate_propagation_context()
Scope.get_isolation_scope().generate_propagation_context()

 if callback is not None:
 if client is not None:
 callback(scope)

 return None
 # TODO: used to return None when client is None. Check if this changes behavior.
 callback(scope)

 @contextmanager
 def inner():
 # type: () -> Generator[Scope, None, None]
 if client is not None:
 yield scope
 else:
 yield Scope()
 yield scope

 return inner()

Expand All@@ -607,17 +575,14 @@ def start_session(
 ):
 # type: (...) -> None
 """Starts a new session."""
 client, scope = self._stack[-1]
 scope.start_session(
 client=client,
 Scope.get_isolation_scope().start_session(
 session_mode=session_mode,
 )

 def end_session(self):
 # type: (...) -> None
 """Ends the current session if there is one."""
 client, scope = self._stack[-1]
 scope.end_session(client=client)
 Scope.get_isolation_scope().end_session()

 def stop_auto_session_tracking(self):
 # type: (...) -> None
Expand All@@ -626,17 +591,15 @@ def stop_auto_session_tracking(self):
 This temporarily session tracking for the current scope when called.
 To resume session tracking call `resume_auto_session_tracking`.
 """
 client, scope = self._stack[-1]
 scope.stop_auto_session_tracking(client=client)
 Scope.get_isolation_scope().stop_auto_session_tracking()

 def resume_auto_session_tracking(self):
 # type: (...) -> None
 """Resumes automatic session tracking for the current scope if
 disabled earlier. This requires that generally automatic session
 tracking is enabled.
 """
 scope = self._stack[-1][1]
 scope.resume_auto_session_tracking()
 Scope.get_isolation_scope().resume_auto_session_tracking()

 def flush(
 self,
Expand All@@ -647,25 +610,21 @@ def flush(
 """
 Alias for :py:meth:`sentry_sdk.Client.flush`
 """
 client, scope = self._stack[-1]
 if client is not None:
 return client.flush(timeout=timeout, callback=callback)
 return Scope.get_client().flush(timeout=timeout, callback=callback)

 def get_traceparent(self):
 # type: () -> Optional[str]
 """
 Returns the traceparent either from the active span or from the scope.
 """
 client, scope = self._stack[-1]
 return scope.get_traceparent(client=client)
 return Scope.get_current_scope().get_traceparent()

 def get_baggage(self):
 # type: () -> Optional[str]
 """
 Returns Baggage either from the active span or from the scope.
 """
 client, scope = self._stack[-1]
 baggage = scope.get_baggage(client=client)
 baggage = Scope.get_current_scope().get_baggage()

 if baggage is not None:
 return baggage.serialize()
Expand All@@ -679,9 +638,9 @@ def iter_trace_propagation_headers(self, span=None):
 from the span representing the request, if available, or the current
 span on the scope if not.
 """
client, scope = self._stack[-1]

return scope.iter_trace_propagation_headers(span=span, client=client)
return Scope.get_current_scope().iter_trace_propagation_headers(
 span=span,
 )

 def trace_propagation_meta(self, span=None):
 # type: (Optional[Span]) -> str
Expand All@@ -694,8 +653,9 @@ def trace_propagation_meta(self, span=None):
 "The parameter `span` in trace_propagation_meta() is deprecated and will be removed in the future."
 )

 client, scope = self._stack[-1]
 return scope.trace_propagation_meta(span=span, client=client)
 return Scope.get_current_scope().trace_propagation_meta(
 span=span,
 )


GLOBAL_HUB = Hub()
Expand Down
Loading