Merge branch 'master' into logger_ourlogs

Author: antonpirker

CONTRIBUTING.md

@@ -182,14 +182,14 @@ You need to have an AWS account and AWS CLI installed and setup.
 
 We put together two helper functions that can help you with development:
 
-- `./scripts/aws-deploy-local-layer.sh`
+- `./scripts/aws/aws-deploy-local-layer.sh`
 
-  This script [scripts/aws-deploy-local-layer.sh](scripts/aws-deploy-local-layer.sh) will take the code you have checked out locally, create a Lambda layer out of it and deploy it to the `eu-central-1` region of your configured AWS account using `aws` CLI.
+  This script [scripts/aws/aws-deploy-local-layer.sh](scripts/aws/aws-deploy-local-layer.sh) will take the code you have checked out locally, create a Lambda layer out of it and deploy it to the `eu-central-1` region of your configured AWS account using `aws` CLI.
 
   The Lambda layer will have the name `SentryPythonServerlessSDK-local-dev`
 
-- `./scripts/aws-attach-layer-to-lambda-function.sh`
+- `./scripts/aws/aws-attach-layer-to-lambda-function.sh`
 
-  You can use this script [scripts/aws-attach-layer-to-lambda-function.sh](scripts/aws-attach-layer-to-lambda-function.sh) to attach the Lambda layer you just deployed (using the first script) onto one of your existing Lambda functions. You will have to give the name of the Lambda function to attach onto as an argument. (See the script for details.)
+  You can use this script [scripts/aws/aws-attach-layer-to-lambda-function.sh](scripts/aws/aws-attach-layer-to-lambda-function.sh) to attach the Lambda layer you just deployed (using the first script) onto one of your existing Lambda functions. You will have to give the name of the Lambda function to attach onto as an argument. (See the script for details.)
 
 With these two helper scripts it should be easy to rapidly iterate your development on the Lambda layer.

sentry_sdk/client.py

@@ -36,6 +36,7 @@
     ClientConstructor,
 )
 from sentry_sdk.integrations import _DEFAULT_INTEGRATIONS, setup_integrations
+from sentry_sdk.integrations.dedupe import DedupeIntegration
 from sentry_sdk.sessions import SessionFlusher
 from sentry_sdk.envelope import Envelope
 from sentry_sdk.profiler.continuous_profiler import setup_continuous_profiler
@@ -605,6 +606,14 @@ def _prepare_event(
                     self.transport.record_lost_event(
                         "before_send", data_category="error"
                     )
+
+                # If this is an exception, reset the DedupeIntegration. It still
+                # remembers the dropped exception as the last exception, meaning
+                # that if the same exception happens again and is not dropped
+                # in before_send, it'd get dropped by DedupeIntegration.
+                if event.get("exception"):
+                    DedupeIntegration.reset_last_seen()
+
             event = new_event
 
         before_send_transaction = self.options["before_send_transaction"]

sentry_sdk/integrations/dedupe.py

@@ -40,3 +40,12 @@ def processor(event, hint):
                 return None
             integration._last_seen.set(exc)
             return event
+
+    @staticmethod
+    def reset_last_seen():
+        # type: () -> None
+        integration = sentry_sdk.get_client().get_integration(DedupeIntegration)
+        if integration is None:
+            return
+
+        integration._last_seen.set(None)

sentry_sdk/integrations/logging.py

@@ -242,10 +242,10 @@ def _emit(self, record):
         event["logger"] = record.name
 
         # Log records from `warnings` module as separate issues
-        record_caputured_from_warnings_module = (
+        record_captured_from_warnings_module = (
             record.name == "py.warnings" and record.msg == "%s"
         )
-        if record_caputured_from_warnings_module:
+        if record_captured_from_warnings_module:
             # use the actual message and not "%s" as the message
             # this prevents grouping all warnings under one "%s" issue
             msg = record.args[0]  # type: ignore

sentry_sdk/integrations/loguru.py

@@ -11,7 +11,7 @@
 
 if TYPE_CHECKING:
     from logging import LogRecord
-    from typing import Optional, Tuple
+    from typing import Optional, Tuple, Any
 
 try:
     import loguru
@@ -31,6 +31,16 @@ class LoggingLevels(enum.IntEnum):
     CRITICAL = 50
 
 
+SENTRY_LEVEL_FROM_LOGURU_LEVEL = {
+    "TRACE": "DEBUG",
+    "DEBUG": "DEBUG",
+    "INFO": "INFO",
+    "SUCCESS": "INFO",
+    "WARNING": "WARNING",
+    "ERROR": "ERROR",
+    "CRITICAL": "CRITICAL",
+}
+
 DEFAULT_LEVEL = LoggingLevels.INFO.value
 DEFAULT_EVENT_LEVEL = LoggingLevels.ERROR.value
 # We need to save the handlers to be able to remove them later
@@ -87,14 +97,34 @@ class _LoguruBaseHandler(_BaseHandler):
     def _logging_to_event_level(self, record):
         # type: (LogRecord) -> str
         try:
-            return LoggingLevels(record.levelno).name.lower()
-        except ValueError:
+            return SENTRY_LEVEL_FROM_LOGURU_LEVEL[
+                LoggingLevels(record.levelno).name
+            ].lower()
+        except (ValueError, KeyError):
             return record.levelname.lower() if record.levelname else ""
 
 
 class LoguruEventHandler(_LoguruBaseHandler, EventHandler):
     """Modified version of :class:`sentry_sdk.integrations.logging.EventHandler` to use loguru's level names."""
 
+    def __init__(self, *args, **kwargs):
+        # type: (*Any, **Any) -> None
+        if kwargs.get("level"):
+            kwargs["level"] = SENTRY_LEVEL_FROM_LOGURU_LEVEL.get(
+                kwargs.get("level", ""), DEFAULT_LEVEL
+            )
+
+        super().__init__(*args, **kwargs)
+
 
 class LoguruBreadcrumbHandler(_LoguruBaseHandler, BreadcrumbHandler):
     """Modified version of :class:`sentry_sdk.integrations.logging.BreadcrumbHandler` to use loguru's level names."""
+
+    def __init__(self, *args, **kwargs):
+        # type: (*Any, **Any) -> None
+        if kwargs.get("level"):
+            kwargs["level"] = SENTRY_LEVEL_FROM_LOGURU_LEVEL.get(
+                kwargs.get("level", ""), DEFAULT_LEVEL
+            )
+
+        super().__init__(*args, **kwargs)

sentry_sdk/integrations/spark/spark_driver.py

@@ -31,9 +31,13 @@ def _set_app_properties():
 
     spark_context = SparkContext._active_spark_context
     if spark_context:
-        spark_context.setLocalProperty("sentry_app_name", spark_context.appName)
         spark_context.setLocalProperty(
-            "sentry_application_id", spark_context.applicationId
+            "sentry_app_name",
+            spark_context.appName,
+        )
+        spark_context.setLocalProperty(
+            "sentry_application_id",
+            spark_context.applicationId,
         )
 
 
@@ -231,12 +235,14 @@ def _add_breadcrumb(
         data=None,  # type: Optional[dict[str, Any]]
     ):
         # type: (...) -> None
-        sentry_sdk.get_global_scope().add_breadcrumb(
+        sentry_sdk.get_isolation_scope().add_breadcrumb(
             level=level, message=message, data=data
         )
 
     def onJobStart(self, jobStart):  # noqa: N802,N803
         # type: (Any) -> None
+        sentry_sdk.get_isolation_scope().clear_breadcrumbs()
+
         message = "Job {} Started".format(jobStart.jobId())
         self._add_breadcrumb(level="info", message=message)
         _set_app_properties()

sentry_sdk/profiler/__init__.py

@@ -25,10 +25,10 @@
 )
 
 __all__ = [
-    "start_profile_session",
-    "start_profiler",  # TODO: Deprecate this in favor of `start_profile_session`
-    "stop_profile_session",
-    "stop_profiler",  # TODO: Deprecate this in favor of `stop_profile_session`
+    "start_profile_session",  # TODO: Deprecate this in favor of `start_profiler`
+    "start_profiler",
+    "stop_profile_session",  # TODO: Deprecate this in favor of `stop_profiler`
+    "stop_profiler",
     # DEPRECATED: The following was re-exported for backwards compatibility. It
     # will be removed from sentry_sdk.profiler in a future release.
     "MAX_PROFILE_DURATION_NS",

sentry_sdk/profiler/continuous_profiler.py

@@ -5,6 +5,7 @@
 import threading
 import time
 import uuid
+import warnings
 from collections import deque
 from datetime import datetime, timezone
 
@@ -145,32 +146,40 @@ def try_profile_lifecycle_trace_start():
 
 def start_profiler():
     # type: () -> None
+    if _scheduler is None:
+        return
 
-    # TODO: deprecate this as it'll be replaced by `start_profile_session`
-    start_profile_session()
+    _scheduler.manual_start()
 
 
 def start_profile_session():
     # type: () -> None
-    if _scheduler is None:
-        return
 
-    _scheduler.manual_start()
+    warnings.warn(
+        "The `start_profile_session` function is deprecated. Please use `start_profile` instead.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+    start_profiler()
 
 
 def stop_profiler():
     # type: () -> None
+    if _scheduler is None:
+        return
 
-    # TODO: deprecate this as it'll be replaced by `stop_profile_session`
-    stop_profile_session()
+    _scheduler.manual_stop()
 
 
 def stop_profile_session():
     # type: () -> None
-    if _scheduler is None:
-        return
 
-    _scheduler.manual_stop()
+    warnings.warn(
+        "The `stop_profile_session` function is deprecated. Please use `stop_profile` instead.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+    stop_profiler()
 
 
 def teardown_continuous_profiler():

sentry_sdk/tracing_utils.py

@@ -5,7 +5,7 @@
 import sys
 from collections.abc import Mapping
 from datetime import timedelta
-from decimal import ROUND_DOWN, Decimal
+from decimal import ROUND_DOWN, Context, Decimal
 from functools import wraps
 from random import Random
 from urllib.parse import quote, unquote
@@ -871,7 +871,11 @@ def _generate_sample_rand(
         sample_rand = rng.uniform(lower, upper)
 
     # Round down to exactly six decimal-digit precision.
-    return Decimal(sample_rand).quantize(Decimal("0.000001"), rounding=ROUND_DOWN)
+    # Setting the context is needed to avoid an InvalidOperation exception
+    # in case the user has changed the default precision.
+    return Decimal(sample_rand).quantize(
+        Decimal("0.000001"), rounding=ROUND_DOWN, context=Context(prec=6)
+    )
 
 
 def _sample_rand_range(parent_sampled, sample_rate):

tests/integrations/loguru/test_loguru.py

@@ -8,18 +8,18 @@
 
 
 @pytest.mark.parametrize(
-    "level,created_event",
+    "level,created_event,expected_sentry_level",
     [
         # None - no breadcrumb
         # False - no event
         # True - event created
-        (LoggingLevels.TRACE, None),
-        (LoggingLevels.DEBUG, None),
-        (LoggingLevels.INFO, False),
-        (LoggingLevels.SUCCESS, False),
-        (LoggingLevels.WARNING, False),
-        (LoggingLevels.ERROR, True),
-        (LoggingLevels.CRITICAL, True),
+        (LoggingLevels.TRACE, None, "debug"),
+        (LoggingLevels.DEBUG, None, "debug"),
+        (LoggingLevels.INFO, False, "info"),
+        (LoggingLevels.SUCCESS, False, "info"),
+        (LoggingLevels.WARNING, False, "warning"),
+        (LoggingLevels.ERROR, True, "error"),
+        (LoggingLevels.CRITICAL, True, "critical"),
     ],
 )
 @pytest.mark.parametrize("disable_breadcrumbs", [True, False])
@@ -29,6 +29,7 @@ def test_just_log(
     capture_events,
     level,
     created_event,
+    expected_sentry_level,
     disable_breadcrumbs,
     disable_events,
 ):
@@ -48,7 +49,7 @@ def test_just_log(
     formatted_message = (
         " | "
         + "{:9}".format(level.name.upper())
-        + "| tests.integrations.loguru.test_loguru:test_just_log:46 - test"
+        + "| tests.integrations.loguru.test_loguru:test_just_log:47 - test"
     )
 
     if not created_event:
@@ -59,7 +60,7 @@ def test_just_log(
             not disable_breadcrumbs and created_event is not None
         ):  # not None == not TRACE or DEBUG level
             (breadcrumb,) = breadcrumbs
-            assert breadcrumb["level"] == level.name.lower()
+            assert breadcrumb["level"] == expected_sentry_level
             assert breadcrumb["category"] == "tests.integrations.loguru.test_loguru"
             assert breadcrumb["message"][23:] == formatted_message
         else:
@@ -72,7 +73,7 @@ def test_just_log(
         return
 
     (event,) = events
-    assert event["level"] == (level.name.lower())
+    assert event["level"] == expected_sentry_level
     assert event["logger"] == "tests.integrations.loguru.test_loguru"
     assert event["logentry"]["message"][23:] == formatted_message
 

tests/integrations/stdlib/test_httplib.py

@@ -398,25 +398,16 @@ def test_http_timeout(monkeypatch, sentry_init, capture_envelopes):
 
     envelopes = capture_envelopes()
 
-    with start_transaction(op="op", name="name"):
-        try:
-            conn = HTTPSConnection("www.squirrelchasers.com")
-            conn.request("GET", "/top-chasers")
+    with pytest.raises(TimeoutError):
+        with start_transaction(op="op", name="name"):
+            conn = HTTPSConnection("www.example.com")
+            conn.request("GET", "/bla")
             conn.getresponse()
-        except Exception:
-            pass
-
-    items = [
-        item
-        for envelope in envelopes
-        for item in envelope.items
-        if item.type == "transaction"
-    ]
-    assert len(items) == 1
-
-    transaction = items[0].payload.json
+
+    (transaction_envelope,) = envelopes
+    transaction = transaction_envelope.get_transaction_event()
     assert len(transaction["spans"]) == 1
 
     span = transaction["spans"][0]
     assert span["op"] == "http.client"
-    assert span["description"] == "GET https://www.squirrelchasers.com/top-chasers"
+    assert span["description"] == "GET https://www.example.com/bla"

tests/test_basics.py

@@ -710,6 +710,37 @@ def test_dedupe_event_processor_drop_records_client_report(
     assert lost_event_call == ("event_processor", "error", None, 1)
 
 
+def test_dedupe_doesnt_take_into_account_dropped_exception(sentry_init, capture_events):
+    # Two exceptions happen one after another. The first one is dropped in the
+    # user's before_send. The second one isn't.
+    # Originally, DedupeIntegration would drop the second exception. This test
+    # is making sure that that is no longer the case -- i.e., DedupeIntegration
+    # doesn't consider exceptions dropped in before_send.
+    count = 0
+
+    def before_send(event, hint):
+        nonlocal count
+        count += 1
+        if count == 1:
+            return None
+        return event
+
+    sentry_init(before_send=before_send)
+    events = capture_events()
+
+    exc = ValueError("aha!")
+    for _ in range(2):
+        # The first ValueError will be dropped by before_send. The second
+        # ValueError will be accepted by before_send, and should be sent to
+        # Sentry.
+        try:
+            raise exc
+        except Exception:
+            capture_exception()
+
+    assert len(events) == 1
+
+
 def test_event_processor_drop_records_client_report(
     sentry_init, capture_events, capture_record_lost_event_calls
 ):