Merge branch 'master' into feat/new-scopes

Author: antonpirker

CHANGELOG.md

@@ -4,7 +4,18 @@
 
 ### Various fixes & improvements
 
+- Add support for cluster clients from Redis SDK (#2394) by @md384
 - Improve location reporting for timer metrics (#2552) by @mitsuhiko
+- Fix Celery `TypeError` with no-argument `apply_async` (#2575) by @szokeasaurusrex
+- Fix Lambda integration with EventBridge source (#2546) by @davidcroda
+- Add max tries to Spotlight (#2571) by @hazAT
+- Handle `os.path.devnull` access issues (#2579) by @sentrivana
+- Change `code.filepath` frame picking logic (#2568) by @sentrivana
+- Trigger AWS Lambda tests on label (#2538) by @sentrivana
+- Run permissions step on pull_request_target but not push (#2548) by @sentrivana
+- Hash AWS Lambda test functions based on current revision (#2557) by @sentrivana
+- Update Django version in tests (#2562) by @sentrivana
+- Make metrics tests non-flaky (#2572) by @antonpirker
 
 ## 1.38.0
 

docs/conf.py

@@ -30,7 +30,7 @@
 copyright = "2019-{}, Sentry Team and Contributors".format(datetime.now().year)
 author = "Sentry Team and Contributors"
 
-release = "1.38.0"
+release = "1.39.0"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 

sentry_sdk/client.py

@@ -469,20 +469,28 @@ def _should_sample_error(
         hint,  # type: Hint
     ):
         # type: (...) -> bool
-        sampler = self.options.get("error_sampler", None)
+        error_sampler = self.options.get("error_sampler", None)
 
-        if callable(sampler):
+        if callable(error_sampler):
             with capture_internal_exceptions():
-                sample_rate = sampler(event, hint)
+                sample_rate = error_sampler(event, hint)
         else:
             sample_rate = self.options["sample_rate"]
 
         try:
             not_in_sample_rate = sample_rate < 1.0 and random.random() >= sample_rate
+        except NameError:
+            logger.warning(
+                "The provided error_sampler raised an error. Defaulting to sampling the event."
+            )
+
+            # If the error_sampler raised an error, we should sample the event, since the default behavior
+            # (when no sample_rate or error_sampler is provided) is to sample all events.
+            not_in_sample_rate = False
         except TypeError:
             parameter, verb = (
                 ("error_sampler", "returned")
-                if callable(sampler)
+                if callable(error_sampler)
                 else ("sample_rate", "contains")
             )
             logger.warning(

sentry_sdk/consts.py

@@ -316,4 +316,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.38.0"
+VERSION = "1.39.0"

sentry_sdk/integrations/aiohttp.py

@@ -44,14 +44,13 @@
 
 if TYPE_CHECKING:
     from aiohttp.web_request import Request
-    from aiohttp.abc import AbstractMatchInfo
+    from aiohttp.web_urldispatcher import UrlMappingMatchInfo
     from aiohttp import TraceRequestStartParams, TraceRequestEndParams
     from types import SimpleNamespace
     from typing import Any
     from typing import Dict
     from typing import Optional
     from typing import Tuple
-    from typing import Callable
     from typing import Union
 
     from sentry_sdk.utils import ExcInfo
@@ -113,8 +112,9 @@ async def sentry_app_handle(self, request, *args, **kwargs):
                         scope.clear_breadcrumbs()
                         scope.add_event_processor(_make_request_processor(weak_request))
 
+                    headers = dict(request.headers)
                     transaction = continue_trace(
-                        request.headers,
+                        headers,
                         op=OP.HTTP_SERVER,
                         # If this transaction name makes it to the UI, AIOHTTP's
                         # URL resolver did not find a route or died trying.
@@ -141,12 +141,12 @@ async def sentry_app_handle(self, request, *args, **kwargs):
                         transaction.set_http_status(response.status)
                         return response
 
-        Application._handle = sentry_app_handle
+        Application._handle = sentry_app_handle  # type: ignore[method-assign]
 
         old_urldispatcher_resolve = UrlDispatcher.resolve
 
         async def sentry_urldispatcher_resolve(self, request):
-            # type: (UrlDispatcher, Request) -> AbstractMatchInfo
+            # type: (UrlDispatcher, Request) -> UrlMappingMatchInfo
             rv = await old_urldispatcher_resolve(self, request)
 
             hub = Hub.current
@@ -173,12 +173,12 @@ async def sentry_urldispatcher_resolve(self, request):
 
             return rv
 
-        UrlDispatcher.resolve = sentry_urldispatcher_resolve
+        UrlDispatcher.resolve = sentry_urldispatcher_resolve  # type: ignore[method-assign]
 
         old_client_session_init = ClientSession.__init__
 
         def init(*args, **kwargs):
-            # type: (Any, Any) -> ClientSession
+            # type: (Any, Any) -> None
             hub = Hub.current
             if hub.get_integration(AioHttpIntegration) is None:
                 return old_client_session_init(*args, **kwargs)
@@ -190,7 +190,7 @@ def init(*args, **kwargs):
             kwargs["trace_configs"] = client_trace_configs
             return old_client_session_init(*args, **kwargs)
 
-        ClientSession.__init__ = init
+        ClientSession.__init__ = init  # type: ignore[method-assign]
 
 
 def create_trace_config():
@@ -253,7 +253,7 @@ async def on_request_end(session, trace_config_ctx, params):
 
 
 def _make_request_processor(weak_request):
-    # type: (Callable[[], Request]) -> EventProcessor
+    # type: (weakref.ReferenceType[Request]) -> EventProcessor
     def aiohttp_processor(
         event,  # type: Dict[str, Any]
         hint,  # type: Dict[str, Tuple[type, BaseException, Any]]

sentry_sdk/integrations/asyncpg.py

@@ -8,7 +8,7 @@
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations import Integration, DidNotEnable
 from sentry_sdk.tracing import Span
-from sentry_sdk.tracing_utils import record_sql_queries
+from sentry_sdk.tracing_utils import add_query_source, record_sql_queries
 from sentry_sdk.utils import parse_version, capture_internal_exceptions
 
 try:
@@ -66,8 +66,14 @@ async def _inner(*args: Any, **kwargs: Any) -> T:
             return await f(*args, **kwargs)
 
         query = args[1]
-        with record_sql_queries(hub, None, query, None, None, executemany=False):
+        with record_sql_queries(
+            hub, None, query, None, None, executemany=False
+        ) as span:
             res = await f(*args, **kwargs)
+
+        with capture_internal_exceptions():
+            add_query_source(hub, span)
+
         return res
 
     return _inner
@@ -118,6 +124,7 @@ async def _inner(*args: Any, **kwargs: Any) -> T:
         with _record(hub, None, query, params_list, executemany=executemany) as span:
             _set_db_data(span, args[0])
             res = await f(*args, **kwargs)
+
         return res
 
     return _inner

sentry_sdk/integrations/django/__init__.py

@@ -15,7 +15,7 @@
 from sentry_sdk.scope import add_global_event_processor
 from sentry_sdk.serializer import add_global_repr_processor
 from sentry_sdk.tracing import SOURCE_FOR_STYLE, TRANSACTION_SOURCE_URL
-from sentry_sdk.tracing_utils import record_sql_queries
+from sentry_sdk.tracing_utils import add_query_source, record_sql_queries
 from sentry_sdk.utils import (
     AnnotatedValue,
     HAS_REAL_CONTEXTVARS,
@@ -638,7 +638,12 @@ def execute(self, sql, params=None):
                         self.mogrify,
                         options,
                     )
-            return real_execute(self, sql, params)
+            result = real_execute(self, sql, params)
+
+        with capture_internal_exceptions():
+            add_query_source(hub, span)
+
+        return result
 
     def executemany(self, sql, param_list):
         # type: (CursorWrapper, Any, List[Any]) -> Any
@@ -650,7 +655,13 @@ def executemany(self, sql, param_list):
             hub, self.cursor, sql, param_list, paramstyle="format", executemany=True
         ) as span:
             _set_db_data(span, self)
-            return real_executemany(self, sql, param_list)
+
+            result = real_executemany(self, sql, param_list)
+
+        with capture_internal_exceptions():
+            add_query_source(hub, span)
+
+        return result
 
     def connect(self):
         # type: (BaseDatabaseWrapper) -> None

sentry_sdk/integrations/sqlalchemy.py

@@ -6,9 +6,8 @@
 from sentry_sdk.db.explain_plan.sqlalchemy import attach_explain_plan_to_span
 from sentry_sdk.hub import Hub
 from sentry_sdk.integrations import Integration, DidNotEnable
-from sentry_sdk.tracing_utils import record_sql_queries
-
-from sentry_sdk.utils import parse_version
+from sentry_sdk.tracing_utils import add_query_source, record_sql_queries
+from sentry_sdk.utils import capture_internal_exceptions, parse_version
 
 try:
     from sqlalchemy.engine import Engine  # type: ignore
@@ -84,6 +83,10 @@ def _before_cursor_execute(
 
 def _after_cursor_execute(conn, cursor, statement, parameters, context, *args):
     # type: (Any, Any, Any, Any, Any, *Any) -> None
+    hub = Hub.current
+    if hub.get_integration(SqlalchemyIntegration) is None:
+        return
+
     ctx_mgr = getattr(
         context, "_sentry_sql_span_manager", None
     )  # type: Optional[ContextManager[Any]]
@@ -92,6 +95,11 @@ def _after_cursor_execute(conn, cursor, statement, parameters, context, *args):
         context._sentry_sql_span_manager = None
         ctx_mgr.__exit__(None, None, None)
 
+    span = context._sentry_sql_span
+    if span is not None:
+        with capture_internal_exceptions():
+            add_query_source(hub, span)
+
 
 def _handle_error(context, *args):
     # type: (Any, *Any) -> None

sentry_sdk/tracing.py

@@ -488,7 +488,6 @@ def finish(self, hub=None, end_timestamp=None):
             self.timestamp = datetime_utcnow()
 
         maybe_create_breadcrumbs_from_span(hub, self)
-        add_additional_span_data(hub, self)
 
         return None
 
@@ -1021,7 +1020,6 @@ async def my_async_function():
 from sentry_sdk.tracing_utils import (
     Baggage,
     EnvironHeaders,
-    add_additional_span_data,
     extract_sentrytrace_data,
     has_tracing_enabled,
     maybe_create_breadcrumbs_from_span,

sentry_sdk/tracing_utils.py

@@ -1,4 +1,5 @@
 import contextlib
+import os
 import re
 import sys
 
@@ -11,6 +12,7 @@
     to_string,
     is_sentry_url,
     _is_external_source,
+    _module_in_list,
 )
 from sentry_sdk._compat import PY2, iteritems
 from sentry_sdk._types import TYPE_CHECKING
@@ -190,29 +192,44 @@ def add_query_source(hub, span):
         return
 
     project_root = client.options["project_root"]
+    in_app_include = client.options.get("in_app_include")
+    in_app_exclude = client.options.get("in_app_exclude")
 
     # Find the correct frame
     frame = sys._getframe()  # type: Union[FrameType, None]
     while frame is not None:
         try:
             abs_path = frame.f_code.co_filename
+            if abs_path and PY2:
+                abs_path = os.path.abspath(abs_path)
         except Exception:
             abs_path = ""
 
         try:
-            namespace = frame.f_globals.get("__name__")
+            namespace = frame.f_globals.get("__name__")  # type: Optional[str]
         except Exception:
             namespace = None
 
         is_sentry_sdk_frame = namespace is not None and namespace.startswith(
             "sentry_sdk."
         )
+
+        should_be_included = not _is_external_source(abs_path)
+        if namespace is not None:
+            if in_app_exclude and _module_in_list(namespace, in_app_exclude):
+                should_be_included = False
+            if in_app_include and _module_in_list(namespace, in_app_include):
+                # in_app_include takes precedence over in_app_exclude, so doing it
+                # at the end
+                should_be_included = True
+
         if (
             abs_path.startswith(project_root)
-            and not _is_external_source(abs_path)
+            and should_be_included
             and not is_sentry_sdk_frame
         ):
             break
+
         frame = frame.f_back
     else:
         frame = None
@@ -250,15 +267,6 @@ def add_query_source(hub, span):
             span.set_data(SPANDATA.CODE_FUNCTION, frame.f_code.co_name)
 
 
-def add_additional_span_data(hub, span):
-    # type: (sentry_sdk.Hub, sentry_sdk.tracing.Span) -> None
-    """
-    Adds additional data to the span
-    """
-    if span.op == OP.DB:
-        add_query_source(hub, span)
-
-
 def extract_sentrytrace_data(header):
     # type: (Optional[str]) -> Optional[Dict[str, Union[str, bool, None]]]
     """