plainx-sentry 0.4.0__py3-none-any.whl → 0.4.1__py3-none-any.whl

plainx/sentry/middleware.py

@@ -41,6 +41,10 @@ class SentryMiddleware:
         self.get_response = get_response
 
     def __call__(self, request):
+        # Don't do anything if Sentry is not active
+        if not sentry_sdk.get_client().is_active():
+            return self.get_response(request)
+
         def event_processor(event, hint):
             # request gets attached directly to an event,
             # not necessarily in the "context"
@@ -66,44 +70,45 @@ class SentryMiddleware:
 
             return event
 
-        # Reset the scope (and breadcrumbs) for each request
-        scope = sentry_sdk.get_isolation_scope()
-        scope.add_event_processor(event_processor)
-
-        # Sentry's Django integration patches the WSGIHandler.
-        # We could make our own WSGIHandler and patch it or call it directly from gunicorn,
-        # but putting our middleware at the top of MIDDLEWARE is pretty close and easier.
-        with sentry_sdk.start_transaction(
-            op="http.server", name=request.path_info
-        ) as transaction:
-            if connection:
-                # Also get spans for db queries
-                with connection.execute_wrapper(trace_db):
+        with sentry_sdk.isolation_scope() as scope:
+            # Reset the scope (and breadcrumbs) for each request
+            scope.clear()
+            scope.add_event_processor(event_processor)
+
+            # Sentry's Django integration patches the WSGIHandler.
+            # We could make our own WSGIHandler and patch it or call it directly from gunicorn,
+            # but putting our middleware at the top of MIDDLEWARE is pretty close and easier.
+            with sentry_sdk.start_transaction(
+                op="http.server", name=request.path_info
+            ) as transaction:
+                if connection:
+                    # Also get spans for db queries
+                    with connection.execute_wrapper(trace_db):
+                        response = self.get_response(request)
+                else:
+                    # No db presumably
                     response = self.get_response(request)
-            else:
-                # No db presumably
-                response = self.get_response(request)
-
-            if resolver_match := getattr(request, "resolver_match", None):
-                # Rename the transaction using a pattern,
-                # and attach other url/views tags we can use to filter
-                transaction.name = f"route:{resolver_match.route}"
-                transaction.set_tag("url_namespace", resolver_match.namespace)
-                transaction.set_tag("url_name", resolver_match.url_name)
-                transaction.set_tag("view_name", resolver_match.view_name)
-                transaction.set_tag("view_class", resolver_match._func_path)
-                # Don't need to filter on this, but do want the context to view
-                transaction.set_context(
-                    "url_params",
-                    {
-                        "args": resolver_match.args,
-                        "kwargs": resolver_match.kwargs,
-                    },
-                )
-
-            transaction.set_http_status(response.status_code)
-
-        return response
+
+                if resolver_match := getattr(request, "resolver_match", None):
+                    # Rename the transaction using a pattern,
+                    # and attach other url/views tags we can use to filter
+                    transaction.name = f"route:{resolver_match.route}"
+                    transaction.set_tag("url_namespace", resolver_match.namespace)
+                    transaction.set_tag("url_name", resolver_match.url_name)
+                    transaction.set_tag("view_name", resolver_match.view_name)
+                    transaction.set_tag("view_class", resolver_match._func_path)
+                    # Don't need to filter on this, but do want the context to view
+                    transaction.set_context(
+                        "url_params",
+                        {
+                            "args": resolver_match.args,
+                            "kwargs": resolver_match.kwargs,
+                        },
+                    )
+
+                transaction.set_http_status(response.status_code)
+
+            return response
 
 
 class SentryWorkerMiddleware:
@@ -111,6 +116,10 @@ class SentryWorkerMiddleware:
         self.run_job = run_job
 
     def __call__(self, job):
+        # Don't do anything if Sentry is not active
+        if not sentry_sdk.get_client().is_active():
+            return self.run_job(job)
+
         def event_processor(event, hint):
             with capture_internal_exceptions():
                 # Attach it directly to any events
@@ -118,27 +127,28 @@ class SentryWorkerMiddleware:
                 extra["plain.worker"] = {"job": job.as_json()}
             return event
 
-        # Reset the scope (and breadcrumbs) for each job
-        scope = sentry_sdk.get_isolation_scope()
-        scope.add_event_processor(event_processor)
-
-        with sentry_sdk.start_transaction(
-            op="plain.worker.job",
-            name=f"job:{job.job_class}",
-            source=TransactionSource.TASK,
-        ) as transaction:
-            if connection:
-                # Also get spans for db queries
-                with connection.execute_wrapper(trace_db):
+        with sentry_sdk.isolation_scope() as scope:
+            # Reset the scope (and breadcrumbs) for each request
+            scope.clear()
+            scope.add_event_processor(event_processor)
+
+            with sentry_sdk.start_transaction(
+                op="plain.worker.job",
+                name=f"job:{job.job_class}",
+                source=TransactionSource.TASK,
+            ) as transaction:
+                if connection:
+                    # Also get spans for db queries
+                    with connection.execute_wrapper(trace_db):
+                        job_result = self.run_job(job)
+                else:
+                    # No db presumably
                     job_result = self.run_job(job)
-            else:
-                # No db presumably
-                job_result = self.run_job(job)
 
-            with capture_internal_exceptions():
-                # Don't need to filter on this, but do want the context to view
-                transaction.set_context("job", job.as_json())
+                with capture_internal_exceptions():
+                    # Don't need to filter on this, but do want the context to view
+                    transaction.set_context("job", job.as_json())
 
-            transaction.set_status("ok")
+                transaction.set_status("ok")
 
-        return job_result
+            return job_result

{plainx_sentry-0.4.0.dist-info → plainx_sentry-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plainx-sentry
-Version: 0.4.0
+Version: 0.4.1
 Author-email: Dave Gaeddert <dave.gaeddert@gmail.com>
 Requires-Python: >=3.11
 Requires-Dist: sentry-sdk>=2.24.0

{plainx_sentry-0.4.0.dist-info → plainx_sentry-0.4.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
 plainx/sentry/__init__.py,sha256=Klz3mH_itM2RXzJ_sWWJRIoZcS0jCRxWrhVVIPsG5FY,123
 plainx/sentry/config.py,sha256=EwMnY3DaanIGkgtKD_4h8ncx6MH_MxOML8BF5Hx5GBA,723
 plainx/sentry/default_settings.py,sha256=DNX6OQ0-BqfjyWuszW7JnZhiDn0tGtS3Fa2W7VbTIF8,564
-plainx/sentry/middleware.py,sha256=DXBeKKp4s98__nGfsjbutRjEeNkFNwHRpd5Vahws9eY,5516
+plainx/sentry/middleware.py,sha256=XsWwG9Jmbc6pAzaqqSq64_1ktJMHZ1sfKDHE4ML8uzM,6079
 plainx/sentry/templates.py,sha256=YovKIswcsjLRjHdmRzdaxG1PHjGfz8fc5TeNE9wcYQA,2046
 plainx/sentry/templates/sentry/js.html,sha256=aOjWAwuUaecGbC-5yZWP1aaGyYAcM-GK0dru-4VOYoE,491
-plainx_sentry-0.4.0.dist-info/METADATA,sha256=oLlsn9RHvE5HtYEu37nlkdiJIdk-ohngTxlwBoA31lg,1559
-plainx_sentry-0.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plainx_sentry-0.4.0.dist-info/RECORD,,
+plainx_sentry-0.4.1.dist-info/METADATA,sha256=-wMUljIYVnu3VBESQ12OlQ-dc93yjFcIdyGZzcB21wk,1559
+plainx_sentry-0.4.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plainx_sentry-0.4.1.dist-info/RECORD,,