Merge branch 'master' into antonpirker/moving-sanic-to-toxgen

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/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()

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"