Merge remote-tracking branch 'origin/master'

Author: mxrcooo

CONTRIBUTING-aws-lambda.md

@@ -172,3 +172,24 @@ sentry-sdk==2.4.0
 ```
 
 A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+
+
+## Contributing to Sentry AWS Lambda Layer
+
+### Development environment
+
+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`
+
+  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.
+
+  The Lambda layer will have the name `SentryPythonServerlessSDK-local-dev`
+
+- `./scripts/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.)
+
+With these two helper scripts it should be easy to rapidly iterate your development on the Lambda layer.

CONTRIBUTING.md

@@ -5,13 +5,11 @@ VENV_PATH = .venv
 help:
 	@echo "Thanks for your interest in the Sentry Python SDK!"
 	@echo
-	@echo "make lint: Run linters"
-	@echo "make test: Run basic tests (not testing most integrations)"
-	@echo "make test-all: Run ALL tests (slow, closest to CI)"
-	@echo "make format: Run code formatters (destructive)"
+	@echo "make apidocs: Build the API documentation"
 	@echo "make aws-lambda-layer: Build AWS Lambda layer directory for serverless integration"
 	@echo
 	@echo "Also make sure to read ./CONTRIBUTING.md"
+	@echo
 	@false
 
 .venv:
@@ -24,42 +22,13 @@ dist: .venv
 	$(VENV_PATH)/bin/python setup.py sdist bdist_wheel
 .PHONY: dist
 
-format: .venv
-	$(VENV_PATH)/bin/tox -e linters --notest
-	.tox/linters/bin/black .
-.PHONY: format
-
-test: .venv
-	@$(VENV_PATH)/bin/tox -e py3.12
-.PHONY: test
-
-test-all: .venv
-	@TOXPATH=$(VENV_PATH)/bin/tox sh ./scripts/runtox.sh
-.PHONY: test-all
-
-check: lint test
-.PHONY: check
-
-lint: .venv
-	@set -e && $(VENV_PATH)/bin/tox -e linters || ( \
-		echo "================================"; \
-		echo "Bad formatting? Run: make format"; \
-		echo "================================"; \
-		false)
-.PHONY: lint
-
 apidocs: .venv
 	@$(VENV_PATH)/bin/pip install --editable .
 	@$(VENV_PATH)/bin/pip install -U -r ./requirements-docs.txt
 	rm -rf docs/_build
 	@$(VENV_PATH)/bin/sphinx-build -vv -W -b html docs/ docs/_build
 .PHONY: apidocs
 
-apidocs-hotfix: apidocs
-	@$(VENV_PATH)/bin/pip install ghp-import
-	@$(VENV_PATH)/bin/ghp-import -pf docs/_build
-.PHONY: apidocs-hotfix
-
 aws-lambda-layer: dist
 	$(VENV_PATH)/bin/pip install -r requirements-aws-lambda-layer.txt
 	$(VENV_PATH)/bin/python -m scripts.build_aws_lambda_layer

Makefile

@@ -10,4 +10,6 @@ executing
 asttokens
 responses
 pysocks
+socksio
+httpcore[http2]
 setuptools

requirements-testing.txt

@@ -23,7 +23,7 @@
 )
 from sentry_sdk.serializer import serialize
 from sentry_sdk.tracing import trace
-from sentry_sdk.transport import HttpTransport, make_transport
+from sentry_sdk.transport import BaseHttpTransport, make_transport
 from sentry_sdk.consts import (
     DEFAULT_MAX_VALUE_LENGTH,
     DEFAULT_OPTIONS,
@@ -61,6 +61,7 @@
     from sentry_sdk.metrics import MetricsAggregator
     from sentry_sdk.scope import Scope
     from sentry_sdk.session import Session
+    from sentry_sdk.spotlight import SpotlightClient
     from sentry_sdk.transport import Transport
 
     I = TypeVar("I", bound=Integration)  # noqa: E741
@@ -153,6 +154,8 @@ class BaseClient:
     The basic definition of a client that is used for sending data to Sentry.
     """
 
+    spotlight = None  # type: Optional[SpotlightClient]
+
     def __init__(self, options=None):
         # type: (Optional[Dict[str, Any]]) -> None
         self.options = (
@@ -385,7 +388,6 @@ def _capture_envelope(envelope):
                 disabled_integrations=self.options["disabled_integrations"],
             )
 
-            self.spotlight = None
             spotlight_config = self.options.get("spotlight")
             if spotlight_config is None and "SENTRY_SPOTLIGHT" in os.environ:
                 spotlight_env_value = os.environ["SENTRY_SPOTLIGHT"]
@@ -427,7 +429,7 @@ def _capture_envelope(envelope):
             self.monitor
             or self.metrics_aggregator
             or has_profiling_enabled(self.options)
-            or isinstance(self.transport, HttpTransport)
+            or isinstance(self.transport, BaseHttpTransport)
         ):
             # If we have anything on that could spawn a background thread, we
             # need to check if it's safe to use them.

sentry_sdk/client.py

@@ -60,6 +60,7 @@ class EndpointType(Enum):
             "otel_powered_performance": Optional[bool],
             "transport_zlib_compression_level": Optional[int],
             "transport_num_pools": Optional[int],
+            "transport_http2": Optional[bool],
             "enable_metrics": Optional[bool],
             "before_emit_metric": Optional[
                 Callable[[str, MetricValue, MeasurementUnit, MetricTags], bool]

sentry_sdk/consts.py

@@ -30,7 +30,6 @@
         Bottle,
         Route,
         request as bottle_request,
-        HTTPResponse,
         __version__ as BOTTLE_VERSION,
     )
 except ImportError:
@@ -114,8 +113,6 @@ def wrapped_callback(*args, **kwargs):
 
                 try:
                     res = prepared_callback(*args, **kwargs)
-                except HTTPResponse:
-                    raise
                 except Exception as exception:
                     event, hint = event_from_exception(
                         exception,

sentry_sdk/integrations/bottle.py

@@ -90,13 +90,15 @@ def patch_django_asgi_handler_impl(cls):
 
     async def sentry_patched_asgi_handler(self, scope, receive, send):
         # type: (Any, Any, Any, Any) -> Any
-        if sentry_sdk.get_client().get_integration(DjangoIntegration) is None:
+        integration = sentry_sdk.get_client().get_integration(DjangoIntegration)
+        if integration is None:
             return await old_app(self, scope, receive, send)
 
         middleware = SentryAsgiMiddleware(
             old_app.__get__(self, cls),
             unsafe_context_data=True,
             span_origin=DjangoIntegration.origin,
+            http_methods_to_capture=integration.http_methods_to_capture,
         )._run_asgi3
 
         return await middleware(scope, receive, send)
@@ -142,13 +144,15 @@ def patch_channels_asgi_handler_impl(cls):
 
         async def sentry_patched_asgi_handler(self, receive, send):
             # type: (Any, Any, Any) -> Any
-            if sentry_sdk.get_client().get_integration(DjangoIntegration) is None:
+            integration = sentry_sdk.get_client().get_integration(DjangoIntegration)
+            if integration is None:
                 return await old_app(self, receive, send)
 
             middleware = SentryAsgiMiddleware(
                 lambda _scope: old_app.__get__(self, cls),
                 unsafe_context_data=True,
                 span_origin=DjangoIntegration.origin,
+                http_methods_to_capture=integration.http_methods_to_capture,
             )
 
             return await middleware(self.scope)(receive, send)

sentry_sdk/integrations/django/asgi.py

@@ -1,14 +1,19 @@
 import io
+import os
+import urllib.parse
+import urllib.request
+import urllib.error
 import urllib3
 
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing import Any
+    from typing import Callable
     from typing import Dict
     from typing import Optional
 
-from sentry_sdk.utils import logger
+from sentry_sdk.utils import logger, env_to_bool
 from sentry_sdk.envelope import Envelope
 
 
@@ -46,6 +51,47 @@ def capture_envelope(self, envelope):
             logger.warning(str(e))
 
 
+try:
+    from django.http import HttpResponseServerError
+    from django.conf import settings
+
+    class SpotlightMiddleware:
+        def __init__(self, get_response):
+            # type: (Any, Callable[..., Any]) -> None
+            self.get_response = get_response
+
+        def __call__(self, request):
+            # type: (Any, Any) -> Any
+            return self.get_response(request)
+
+        def process_exception(self, _request, exception):
+            # type: (Any, Any, Exception) -> Optional[HttpResponseServerError]
+            if not settings.DEBUG:
+                return None
+
+            import sentry_sdk.api
+
+            spotlight_client = sentry_sdk.api.get_client().spotlight
+            if spotlight_client is None:
+                return None
+
+            # Spotlight URL has a trailing `/stream` part at the end so split it off
+            spotlight_url = spotlight_client.url.rsplit("/", 1)[0]
+
+            try:
+                spotlight = (
+                    urllib.request.urlopen(spotlight_url).read().decode("utf-8")
+                ).replace("<html>", f'<html><base href="{spotlight_url}">')
+            except urllib.error.URLError:
+                return None
+            else:
+                sentry_sdk.api.capture_exception(exception)
+                return HttpResponseServerError(spotlight)
+
+except ImportError:
+    settings = None
+
+
 def setup_spotlight(options):
     # type: (Dict[str, Any]) -> Optional[SpotlightClient]
 
@@ -58,4 +104,9 @@ def setup_spotlight(options):
     else:
         return None
 
+    if settings is not None and env_to_bool(
+        os.environ.get("SENTRY_SPOTLIGHT_ON_ERROR", "1")
+    ):
+        settings.MIDDLEWARE.append("sentry_sdk.spotlight.SpotlightMiddleware")
+
     return SpotlightClient(url)

sentry_sdk/spotlight.py

@@ -532,7 +532,7 @@ def from_options(cls, scope):
             sentry_items["public_key"] = Dsn(options["dsn"]).public_key
 
         if options.get("traces_sample_rate"):
-            sentry_items["sample_rate"] = options["traces_sample_rate"]
+            sentry_items["sample_rate"] = str(options["traces_sample_rate"])
 
         return Baggage(sentry_items, third_party_items, mutable)