Merge branch 'master' into webb/disable-starlette-spans

Author: alexander-alderman-webb

sentry_sdk/integrations/django/asgi.py

@@ -180,6 +180,10 @@ async def sentry_wrapped_callback(request, *args, **kwargs):
         if sentry_scope.profile is not None:
             sentry_scope.profile.update_active_thread_id()
 
+        integration = sentry_sdk.get_client().get_integration(DjangoIntegration)
+        if not integration or not integration.middleware_spans:
+            return await callback(request, *args, **kwargs)
+
         with sentry_sdk.start_span(
             op=OP.VIEW_RENDER,
             name=request.resolver_match.view_name,

sentry_sdk/integrations/django/views.py

@@ -49,7 +49,7 @@ def sentry_patched_make_view_atomic(self, *args, **kwargs):
         # efficient way to wrap views (or build a cache?)
 
         integration = sentry_sdk.get_client().get_integration(DjangoIntegration)
-        if integration is not None and integration.middleware_spans:
+        if integration is not None:
             is_async_view = (
                 iscoroutinefunction is not None
                 and wrap_async_view is not None
@@ -86,6 +86,10 @@ def sentry_wrapped_callback(request, *args, **kwargs):
         if sentry_scope.profile is not None:
             sentry_scope.profile.update_active_thread_id()
 
+        integration = sentry_sdk.get_client().get_integration(DjangoIntegration)
+        if not integration or not integration.middleware_spans:
+            return callback(request, *args, **kwargs)
+
         with sentry_sdk.start_span(
             op=OP.VIEW_RENDER,
             name=request.resolver_match.view_name,

sentry_sdk/integrations/starlette.py

@@ -144,19 +144,23 @@ def _enable_span_for_middleware(middleware_class):
     async def _create_span_call(app, scope, receive, send, **kwargs):
         # type: (Any, Dict[str, Any], Callable[[], Awaitable[Dict[str, Any]]], Callable[[Dict[str, Any]], Awaitable[None]], Any) -> None
         integration = sentry_sdk.get_client().get_integration(StarletteIntegration)
-        if integration is None or not integration.middleware_spans:
+        if integration is None:
             return await old_call(app, scope, receive, send, **kwargs)
 
-        middleware_name = app.__class__.__name__
-
         # Update transaction name with middleware name
         name, source = _get_transaction_from_middleware(app, scope, integration)
+
         if name is not None:
             sentry_sdk.get_current_scope().set_transaction_name(
                 name,
                 source=source,
             )
 
+        if not integration.middleware_spans:
+            return await old_call(app, scope, receive, send, **kwargs)
+
+        middleware_name = app.__class__.__name__
+
         with sentry_sdk.start_span(
             op=OP.MIDDLEWARE_STARLETTE,
             name=middleware_name,

sentry_sdk/utils.py

@@ -154,6 +154,7 @@ def get_default_release():
         "CODEBUILD_RESOLVED_SOURCE_VERSION",
         "CIRCLE_SHA1",
         "GAE_DEPLOYMENT_ID",
+        "K_REVISION",
     ):
         release = os.environ.get(var)
         if release:

tests/integrations/django/asgi/test_asgi.py

@@ -118,19 +118,25 @@ async def test_async_views(sentry_init, capture_events, application):
 
 @pytest.mark.parametrize("application", APPS)
 @pytest.mark.parametrize("endpoint", ["/sync/thread_ids", "/async/thread_ids"])
+@pytest.mark.parametrize("middleware_spans", [False, True])
 @pytest.mark.asyncio
 @pytest.mark.forked
 @pytest.mark.skipif(
     django.VERSION < (3, 1), reason="async views have been introduced in Django 3.1"
 )
 async def test_active_thread_id(
-    sentry_init, capture_envelopes, teardown_profiling, endpoint, application
+    sentry_init,
+    capture_envelopes,
+    teardown_profiling,
+    endpoint,
+    application,
+    middleware_spans,
 ):
     with mock.patch(
         "sentry_sdk.profiler.transaction_profiler.PROFILE_MINIMUM_SAMPLES", 0
     ):
         sentry_init(
-            integrations=[DjangoIntegration()],
+            integrations=[DjangoIntegration(middleware_spans=middleware_spans)],
             traces_sample_rate=1.0,
             profiles_sample_rate=1.0,
         )

tests/integrations/fastapi/test_fastapi.py

@@ -469,6 +469,7 @@ def dummy_traces_sampler(sampling_context):
     client.get(request_url)
 
 
+@pytest.mark.parametrize("middleware_spans", [False, True])
 @pytest.mark.parametrize(
     "request_url,transaction_style,expected_transaction_name,expected_transaction_source",
     [
@@ -488,6 +489,7 @@ def dummy_traces_sampler(sampling_context):
 )
 def test_transaction_name_in_middleware(
     sentry_init,
+    middleware_spans,
     request_url,
     transaction_style,
     expected_transaction_name,
@@ -500,8 +502,12 @@ def test_transaction_name_in_middleware(
     sentry_init(
         auto_enabling_integrations=False,  # Make sure that httpx integration is not added, because it adds tracing information to the starlette test clients request.
         integrations=[
-            StarletteIntegration(transaction_style=transaction_style),
-            FastApiIntegration(transaction_style=transaction_style),
+            StarletteIntegration(
+                transaction_style=transaction_style, middleware_spans=middleware_spans
+            ),
+            FastApiIntegration(
+                transaction_style=transaction_style, middleware_spans=middleware_spans
+            ),
         ],
         traces_sample_rate=1.0,
     )

tests/integrations/starlette/test_starlette.py

@@ -1099,6 +1099,7 @@ def dummy_traces_sampler(sampling_context):
     client.get(request_url)
 
 
+@pytest.mark.parametrize("middleware_spans", [False, True])
 @pytest.mark.parametrize(
     "request_url,transaction_style,expected_transaction_name,expected_transaction_source",
     [
@@ -1118,6 +1119,7 @@ def dummy_traces_sampler(sampling_context):
 )
 def test_transaction_name_in_middleware(
     sentry_init,
+    middleware_spans,
     request_url,
     transaction_style,
     expected_transaction_name,
@@ -1130,7 +1132,9 @@ def test_transaction_name_in_middleware(
     sentry_init(
         auto_enabling_integrations=False,  # Make sure that httpx integration is not added, because it adds tracing information to the starlette test clients request.
         integrations=[
-            StarletteIntegration(transaction_style=transaction_style),
+            StarletteIntegration(
+                transaction_style=transaction_style, middleware_spans=middleware_spans
+            ),
         ],
         traces_sample_rate=1.0,
     )