Merge branch 'master' into major/3.0

Author: sentrivana

.github/workflows/test-integrations-mcp.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10","3.13","3.14","3.14t","3.15","3.15t"]
+        python-version: ["3.10","3.11","3.13","3.14","3.14t","3.15","3.15t"]
         os: [ubuntu-22.04]
     env:
       # 3.7 runs in the python:X.Y container; tell uv to use that system Python.

scripts/aws/aws-attach-layer-to-lambda-function.sh

@@ -22,12 +22,12 @@ echo "Getting ARN of newest Sentry lambda layer..."
 LAYER_ARN=$(aws lambda list-layer-versions --layer-name SentryPythonServerlessSDK-local-dev --query "LayerVersions[0].LayerVersionArn" | tr -d '"')
 echo "Done getting ARN of newest Sentry lambda layer $LAYER_ARN."
 
-echo "Attaching Lamba layer to function $FUNCTION_NAME..."
+echo "Attaching Lambda layer to function $FUNCTION_NAME..."
 echo "Warning: This remove all other layers!"
 aws lambda update-function-configuration \
     --function-name "$FUNCTION_NAME" \
     --layers "$LAYER_ARN" \
     --no-cli-pager
-echo "Done attaching Lamba layer to function '$FUNCTION_NAME'."
+echo "Done attaching Lambda layer to function '$FUNCTION_NAME'."
 
 echo "All done. Have a nice day!"

scripts/build_aws_lambda_layer.py

@@ -56,7 +56,7 @@ def install_python_packages(self) -> None:
                 "pip",
                 "install",
                 "--no-cache-dir",  # always access PyPI
-                "--no-deps",  # the right depencencies have been installed in the call above
+                "--no-deps",  # the right dependencies have been installed in the call above
                 "--quiet",
                 sentry_python_sdk,
                 "--target",

scripts/find_raise_from_none.py

@@ -43,8 +43,8 @@ def main():
         scan_file(module_path)
 
     raise_from_none_count = {
-        file: len(occurences)
-        for file, occurences in RaiseFromNoneVisitor.line_numbers.items()
+        file: len(occurrences)
+        for file, occurrences in RaiseFromNoneVisitor.line_numbers.items()
     }
     if raise_from_none_count:
         exc = Exception("Detected unexpected raise ... from None.")

scripts/init_serverless_sdk.py

@@ -6,9 +6,8 @@
 'sentry_sdk.integrations.init_serverless_sdk.sentry_lambda_handler'
 """
 
+import importlib
 import os
-import re
-import sys
 from typing import TYPE_CHECKING
 
 import sentry_sdk
@@ -27,8 +26,6 @@
 
 
 class AWSLambdaModuleLoader:
-    DIR_PATH_REGEX = r"^(.+)\/([^\/]+)$"
-
     def __init__(self, sentry_initial_handler):
         try:
             module_path, self.handler_name = sentry_initial_handler.rsplit(".", 1)
@@ -41,35 +38,24 @@ def extract_and_load_lambda_function_module(self, module_path):
         """
         Method that extracts and loads lambda function module from module_path
         """
-        py_version = sys.version_info
-
-        if re.match(self.DIR_PATH_REGEX, module_path):
-            # With a path like -> `scheduler/scheduler/event`
-            # `module_name` is `event`, and `module_file_path` is `scheduler/scheduler/event.py`
-            module_name = module_path.split(os.path.sep)[-1]
-            module_file_path = module_path + ".py"
-
-            # Supported python versions are 3.7, 3.8
-            if py_version >= (3, 7):
-                import importlib.util
-
-                spec = importlib.util.spec_from_file_location(
-                    module_name, module_file_path
-                )
-                self.lambda_function_module = importlib.util.module_from_spec(spec)
-                spec.loader.exec_module(self.lambda_function_module)
-            else:
-                raise ValueError("Python version %s is not supported." % py_version)
-        else:
-            import importlib
-
-            self.lambda_function_module = importlib.import_module(module_path)
+        # the handler used to be loaded from a file path, so keep accepting
+        # `./dir/file` and absolute `<task root>/dir/file` by making them relative
+        # to the task root, which is on `sys.path`.
+        task_root = os.environ.get("LAMBDA_TASK_ROOT", os.getcwd())
+        module_path = os.path.relpath(os.path.join(task_root, module_path), task_root)
+
+        # like the Lambda runtime: `dir/file` is the module `dir.file`, which `sys.modules`
+        # keeps, so its code only runs on the first invocation.
+        # https://github.com/aws/aws-lambda-python-runtime-interface-client/blob/fa2462d93d11da632aad8f8bfb07a3e060438150/awslambdaric/bootstrap.py#L53
+        self.lambda_function_module = importlib.import_module(
+            module_path.replace("/", ".")
+        )
 
     def get_lambda_handler(self):
         return getattr(self.lambda_function_module, self.handler_name)
 
 
-def sentry_lambda_handler(event: "Any", context: "Any") -> None:
+def sentry_lambda_handler(event: "Any", context: "Any") -> "Any":
     """
     Handler function that invokes a lambda handler which path is defined in
     environment variables as "SENTRY_INITIAL_HANDLER"

scripts/populate_tox/config.py

@@ -440,6 +440,7 @@
     },
     "redis": {
         "package": "redis",
+        "include": "!=8.2.0b1",
         "deps": {
             "*": ["fakeredis!=1.7.4", "pytest<8.0.0", "pytest-asyncio"],
             ">=4.0,<5.0": ["fakeredis<2.31.0"],

scripts/populate_tox/package_dependencies.jsonl

@@ -212,7 +212,7 @@ def fetch_package_dependencies(
     print(f"  Resolving dependencies: {package}=={version} on Python {python_version}")
 
     # Removing non-report output with -qqq may be brittle, but avoids file I/O.
-    # Currently -qqq supresses all non-report output that would break json.loads().
+    # Currently -qqq suppresses all non-report output that would break json.loads().
     result = subprocess.run(
         [
             "uv",
@@ -1327,6 +1327,11 @@ def main() -> dict[str, list]:
 
     write_tox_file(packages)
 
+    # Unused cache entries are only pruned on full runs. With --only/--skip,
+    # skipped integrations don't touch (most of) their cache entries, so pruning
+    # would wipe them.
+    prune_cache = not (only_update or skip_update)
+
     # Sort the release cache file
     releases = []
     with open(RELEASES_CACHE_FILE) as releases_cache:
@@ -1335,7 +1340,8 @@ def main() -> dict[str, list]:
     with open(RELEASES_CACHE_FILE, "w") as releases_cache:
         for release in releases:
             if (
-                CACHE[_normalize_name(release["info"]["name"])][
+                not prune_cache
+                or CACHE[_normalize_name(release["info"]["name"])][
                     release["info"]["version"]
                 ]["_accessed"]
                 is True
@@ -1350,7 +1356,8 @@ def main() -> dict[str, list]:
     with open(DEPENDENCIES_CACHE_FILE, "w") as releases_cache:
         for release in releases:
             if (
-                DEPENDENCIES_CACHE[release["python_version"]][
+                not prune_cache
+                or DEPENDENCIES_CACHE[release["python_version"]][
                     release["install_targets_hash"]
                 ]["_accessed"]
                 is True

scripts/populate_tox/populate_tox.py

@@ -4,7 +4,7 @@
 This way each group of frameworks defined in tox.ini will get its own GitHub actions configuration file
 which allows them to be run in parallel in GitHub actions.
 
-This will generate/update several configuration files, that need to be commited to Git afterwards.
+This will generate/update several configuration files, that need to be committed to Git afterwards.
 Whenever tox.ini is changed, this script needs to be run.
 
 Usage: