Merge branch 'master' into feat/grpc-aio-integration

Author: antonpirker

.craft.yml

@@ -14,14 +14,15 @@ targets:
       - name: python
         versions:
           # The number of versions must be, at most, the maximum number of
-          # runtimes AWS Lambda permits for a layer.
+          # runtimes AWS Lambda permits for a layer (currently 15).
           # On the other hand, AWS Lambda does not support every Python runtime.
           # The supported runtimes are available in the following link:
           # https://docs.aws.amazon.com/lambda/latest/dg/lambda-python.html
-          - python3.6
           - python3.7
           - python3.8
           - python3.9
+          - python3.10
+          - python3.11
     license: MIT
   - name: sentry-pypi
     internalPypiRepo: getsentry/pypi

.github/workflows/test-common.yml

@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.5","3.6","3.7","3.8","3.9","3.10","3.11"]
+        python-version: ["3.5","3.6","3.7","3.8","3.9","3.10","3.11","3.12"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6

.github/workflows/test-integration-aws_lambda.yml

@@ -18,6 +18,8 @@ permissions:
   contents: read
 
 env:
+  SENTRY_PYTHON_TEST_AWS_ACCESS_KEY_ID: ${{ secrets.SENTRY_PYTHON_TEST_AWS_ACCESS_KEY_ID }}
+  SENTRY_PYTHON_TEST_AWS_SECRET_ACCESS_KEY: ${{ secrets.SENTRY_PYTHON_TEST_AWS_SECRET_ACCESS_KEY }}
   BUILD_CACHE_KEY: ${{ github.sha }}
   CACHED_BUILD_PATHS: |
     ${{ github.workspace }}/dist-serverless
@@ -31,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7"]
+        python-version: ["3.9"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6

CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## 1.34.0
+
+### Various fixes & improvements
+- Added Python 3.12 support (#2471, #2483)
+- Handle missing `connection_kwargs` in `patch_redis_client` (#2482) by @szokeasaurusrex
+- Run common test suite on Python 3.12 (#2479) by @sentrivana
+
+## 1.33.1
+
+### Various fixes & improvements
+
+- Make parse_version work in utils.py itself. (#2474) by @antonpirker
+
+## 1.33.0
+
+### Various fixes & improvements
+
+- New: Added `error_sampler` option (#2456) by @szokeasaurusrex
+- Python 3.12: Detect interpreter in shutdown state on thread spawn (#2468) by @mitsuhiko
+- Patch eventlet under Sentry SDK (#2464) by @szokeasaurusrex
+- Mitigate CPU spikes when sending lots of events with lots of data (#2449) by @antonpirker
+- Make `debug` option also configurable via environment (#2450) by @antonpirker
+- Make sure `get_dsn_parameters` is an actual function (#2441) by @sentrivana
+- Bump pytest-localserver, add compat comment (#2448) by @sentrivana
+- AWS Lambda: Update compatible runtimes for AWS Lambda layer (#2453) by @antonpirker
+- AWS Lambda: Load AWS Lambda secrets in Github CI (#2153) by @antonpirker
+- Redis: Connection attributes in `redis` database spans (#2398) by @antonpirker
+- Falcon: Falcon integration checks response status before reporting error (#2465) by @szokeasaurusrex
+- Quart: Support Quart 0.19 onwards (#2403) by @pgjones
+- Sanic: Sanic integration initial version (#2419) by @szokeasaurusrex
+- Django: Fix parsing of Django `path` patterns (#2452) by @sentrivana
+- Django: Add Django 4.2 to test suite (#2462) by @sentrivana
+- Polish changelog (#2434) by @sentrivana
+- Update CONTRIBUTING.md (#2443) by @krishvsoni
+- Update README.md (#2435) by @sentrivana
+
 ## 1.32.0
 
 ### Various fixes & improvements

CONTRIBUTING.md

@@ -33,7 +33,7 @@ Before you can contribute, you will need to [fork the `sentry-python` repository
 ### Create a Virtual Environment
 
 To keep your Python development environment and packages separate from the ones
-used by your operation system, create a virtual environment:
+used by your operation system, create a [virtual environment](https://docs.python.org/3/tutorial/venv.html):
 
 ```bash
 cd sentry-python

Makefile

@@ -60,7 +60,6 @@ apidocs-hotfix: apidocs
 .PHONY: apidocs-hotfix
 
 aws-lambda-layer: dist
-	$(VENV_PATH)/bin/pip install urllib3
-	$(VENV_PATH)/bin/pip install certifi
+	$(VENV_PATH)/bin/pip install -r aws-lambda-layer-requirements.txt
 	$(VENV_PATH)/bin/python -m scripts.build_aws_lambda_layer
 .PHONY: aws-lambda-layer

aws-lambda-layer-requirements.txt

@@ -0,0 +1,7 @@
+certifi
+
+# In Lambda functions botocore is used, and botocore is not
+# yet supporting urllib3 1.27.0 never mind 2+.
+# So we pin this here to make our Lambda layer work with
+# Lambda Function using Python 3.7+
+urllib3<1.27

docs/conf.py

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

scripts/aws-cleanup.sh

@@ -1,11 +1,18 @@
 #!/bin/sh
-# Delete all AWS Lambda functions
+#
+# Helper script to clean up AWS Lambda functions created
+# by the test suite (tests/integrations/aws_lambda/test_aws.py).
+#
+# This will delete all Lambda functions named `test_function_*`.
+#
 
+export AWS_DEFAULT_REGION="us-east-1"
 export AWS_ACCESS_KEY_ID="$SENTRY_PYTHON_TEST_AWS_ACCESS_KEY_ID"
 export AWS_SECRET_ACCESS_KEY="$SENTRY_PYTHON_TEST_AWS_SECRET_ACCESS_KEY"
-export AWS_IAM_ROLE="$SENTRY_PYTHON_TEST_AWS_IAM_ROLE"
 
-for func in $(aws lambda list-functions | jq -r .Functions[].FunctionName); do
+for func in $(aws lambda list-functions --output text --query 'Functions[?starts_with(FunctionName, `test_`) == `true`].FunctionName'); do
     echo "Deleting $func"
-    aws lambda delete-function --function-name $func
+    aws lambda delete-function --function-name "$func"
 done
+
+echo "All done! Have a nice day!"

scripts/aws-deploy-local-layer.sh

@@ -22,7 +22,7 @@ aws lambda publish-layer-version \
     --region "eu-central-1" \
     --zip-file "fileb://dist/$ZIP" \
     --description "Local test build of SentryPythonServerlessSDK (can be deleted)" \
-    --compatible-runtimes python3.6 python3.7 python3.8 python3.9
+    --compatible-runtimes python3.7 python3.8 python3.9 python3.10 python3.11 \
     --no-cli-pager
 
 echo "Done deploying zipped Lambda layer to AWS as 'SentryPythonServerlessSDK-local-dev'."

scripts/build_aws_lambda_layer.py

@@ -1,10 +1,15 @@
 import os
 import shutil
 import subprocess
+import sys
 import tempfile
+from typing import TYPE_CHECKING
 
 from sentry_sdk.consts import VERSION as SDK_VERSION
 
+if TYPE_CHECKING:
+    from typing import Optional
+
 DIST_PATH = "dist"  # created by "make dist" that is called by "make aws-lambda-layer"
 PYTHON_SITE_PACKAGES = "python"  # see https://docs.aws.amazon.com/lambda/latest/dg/configuration-layers.html#configuration-layers-path
 
@@ -13,18 +18,38 @@ class LayerBuilder:
     def __init__(
         self,
         base_dir,  # type: str
+        out_zip_filename=None,  # type: Optional[str]
     ):
         # type: (...) -> None
         self.base_dir = base_dir
         self.python_site_packages = os.path.join(self.base_dir, PYTHON_SITE_PACKAGES)
-        self.out_zip_filename = f"sentry-python-serverless-{SDK_VERSION}.zip"
+        self.out_zip_filename = (
+            f"sentry-python-serverless-{SDK_VERSION}.zip"
+            if out_zip_filename is None
+            else out_zip_filename
+        )
 
     def make_directories(self):
         # type: (...) -> None
         os.makedirs(self.python_site_packages)
 
     def install_python_packages(self):
         # type: (...) -> None
+        # Install requirements for Lambda Layer (these are more limited than the SDK requirements,
+        # because Lambda does not support the newest versions of some packages)
+        subprocess.check_call(
+            [
+                sys.executable,
+                "-m",
+                "pip",
+                "install",
+                "-r",
+                "aws-lambda-layer-requirements.txt",
+                "--target",
+                self.python_site_packages,
+            ],
+        )
+
         sentry_python_sdk = os.path.join(
             DIST_PATH,
             f"sentry_sdk-{SDK_VERSION}-py2.py3-none-any.whl",  # this is generated by "make dist" that is called by "make aws-lamber-layer"
@@ -34,6 +59,7 @@ def install_python_packages(self):
                 "pip",
                 "install",
                 "--no-cache-dir",  # always access PyPI
+                "--no-deps",  # the right depencencies have been installed in the call above
                 "--quiet",
                 sentry_python_sdk,
                 "--target",
@@ -80,13 +106,34 @@ def zip(self):
         )
 
 
-def build_packaged_zip():
-    with tempfile.TemporaryDirectory() as base_dir:
-        layer_builder = LayerBuilder(base_dir)
-        layer_builder.make_directories()
-        layer_builder.install_python_packages()
-        layer_builder.create_init_serverless_sdk_package()
-        layer_builder.zip()
+def build_packaged_zip(base_dir=None, make_dist=False, out_zip_filename=None):
+    if base_dir is None:
+        base_dir = tempfile.mkdtemp()
+
+    if make_dist:
+        # Same thing that is done by "make dist"
+        # (which is a dependency of "make aws-lambda-layer")
+        subprocess.check_call(
+            [sys.executable, "setup.py", "sdist", "bdist_wheel", "-d", DIST_PATH],
+        )
+
+    layer_builder = LayerBuilder(base_dir, out_zip_filename=out_zip_filename)
+    layer_builder.make_directories()
+    layer_builder.install_python_packages()
+    layer_builder.create_init_serverless_sdk_package()
+    layer_builder.zip()
+
+    # Just for debugging
+    dist_path = os.path.abspath(DIST_PATH)
+    print("Created Lambda Layer package with this information:")
+    print(" - Base directory for generating package: {}".format(layer_builder.base_dir))
+    print(
+        " - Created Python SDK distribution (in `{}`): {}".format(dist_path, make_dist)
+    )
+    if not make_dist:
+        print("    If 'False' we assume it was already created (by 'make dist')")
+    print(" - Package zip filename: {}".format(layer_builder.out_zip_filename))
+    print(" - Copied package zip to: {}".format(dist_path))
 
 
 if __name__ == "__main__":

scripts/split-tox-gh-actions/ci-yaml-aws-credentials.txt

@@ -0,0 +1,2 @@
+  SENTRY_PYTHON_TEST_AWS_ACCESS_KEY_ID: ${{ secrets.SENTRY_PYTHON_TEST_AWS_ACCESS_KEY_ID }}
+  SENTRY_PYTHON_TEST_AWS_SECRET_ACCESS_KEY: ${{ secrets.SENTRY_PYTHON_TEST_AWS_SECRET_ACCESS_KEY }}

scripts/split-tox-gh-actions/ci-yaml.txt

@@ -18,6 +18,7 @@ permissions:
   contents: read
 
 env:
+{{ aws_credentials }}
   BUILD_CACHE_KEY: ${{ github.sha }}
   CACHED_BUILD_PATHS: |
     ${{ github.workspace }}/dist-serverless

scripts/split-tox-gh-actions/split-tox-gh-actions.py

@@ -28,6 +28,7 @@
 TEMPLATE_FILE = TEMPLATE_DIR / "ci-yaml.txt"
 TEMPLATE_FILE_SERVICES = TEMPLATE_DIR / "ci-yaml-services.txt"
 TEMPLATE_FILE_SETUP_DB = TEMPLATE_DIR / "ci-yaml-setup-db.txt"
+TEMPLATE_FILE_AWS_CREDENTIALS = TEMPLATE_DIR / "ci-yaml-aws-credentials.txt"
 TEMPLATE_SNIPPET_TEST = TEMPLATE_DIR / "ci-yaml-test-snippet.txt"
 TEMPLATE_SNIPPET_TEST_PY27 = TEMPLATE_DIR / "ci-yaml-test-py27-snippet.txt"
 
@@ -40,6 +41,10 @@
     "clickhouse_driver",
 ]
 
+FRAMEWORKS_NEEDING_AWS = [
+    "aws_lambda",
+]
+
 MATRIX_DEFINITION = """
     strategy:
       fail-fast: false
@@ -128,6 +133,11 @@ def write_yaml_file(
                 f = open(TEMPLATE_FILE_SETUP_DB, "r")
                 out += "".join(f.readlines())
 
+        elif template_line.strip() == "{{ aws_credentials }}":
+            if current_framework in FRAMEWORKS_NEEDING_AWS:
+                f = open(TEMPLATE_FILE_AWS_CREDENTIALS, "r")
+                out += "".join(f.readlines())
+
         elif template_line.strip() == "{{ additional_uses }}":
             if current_framework in FRAMEWORKS_NEEDING_CLICKHOUSE:
                 out += ADDITIONAL_USES_CLICKHOUSE

sentry_sdk/client.py

@@ -109,6 +109,13 @@ def _get_options(*args, **kwargs):
     if rv["environment"] is None:
         rv["environment"] = os.environ.get("SENTRY_ENVIRONMENT") or "production"
 
+    if rv["debug"] is None:
+        rv["debug"] = os.environ.get("SENTRY_DEBUG", "False").lower() in (
+            "true",
+            "1",
+            "t",
+        )
+
     if rv["server_name"] is None and hasattr(socket, "gethostname"):
         rv["server_name"] = socket.gethostname()
 
@@ -447,12 +454,34 @@ def _should_capture(
     def _should_sample_error(
         self,
         event,  # type: Event
+        hint,  # type: Hint
     ):
         # type: (...) -> bool
-        not_in_sample_rate = (
-            self.options["sample_rate"] < 1.0
-            and random.random() >= self.options["sample_rate"]
-        )
+        sampler = self.options.get("error_sampler", None)
+
+        if callable(sampler):
+            with capture_internal_exceptions():
+                sample_rate = 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 TypeError:
+            parameter, verb = (
+                ("error_sampler", "returned")
+                if callable(sampler)
+                else ("sample_rate", "contains")
+            )
+            logger.warning(
+                "The provided %s %s an invalid value of %s. The value should be a float or a bool. Defaulting to sampling the event."
+                % (parameter, verb, repr(sample_rate))
+            )
+
+            # If the sample_rate has an invalid value, 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
+
         if not_in_sample_rate:
             # because we will not sample this event, record a "lost event".
             if self.transport:
@@ -549,7 +578,7 @@ def capture_event(
         if (
             not is_transaction
             and not is_checkin
-            and not self._should_sample_error(event)
+            and not self._should_sample_error(event, hint)
         ):
             return None