Add origin to transactions/spans created by integrations

sentry_sdk/integrations/aiohttp.py

@@ -63,6 +63,7 @@
 
 class AioHttpIntegration(Integration):
     identifier = "aiohttp"
+    origin = f"auto.http.{identifier}"
 
     def __init__(self, transaction_style="handler_name"):
         # type: (str) -> None
@@ -120,6 +121,7 @@ async def sentry_app_handle(self, request, *args, **kwargs):
                         # URL resolver did not find a route or died trying.
                         name="generic AIOHTTP request",
                         source=TRANSACTION_SOURCE_ROUTE,
+                        origin=AioHttpIntegration.origin,
                     )
                     with sentry_sdk.start_transaction(
                         transaction,
@@ -206,6 +208,7 @@ async def on_request_start(session, trace_config_ctx, params):
             op=OP.HTTP_CLIENT,
             description="%s %s"
             % (method, parsed_url.url if parsed_url else SENSITIVE_DATA_SUBSTITUTE),
+            origin=AioHttpIntegration.origin,
         )
         span.set_data(SPANDATA.HTTP_METHOD, method)
         if parsed_url is not None:

sentry_sdk/integrations/anthropic.py

@@ -30,6 +30,7 @@
 
 class AnthropicIntegration(Integration):
     identifier = "anthropic"
+    origin = f"auto.ai.{identifier}"
 
     def __init__(self, include_prompts=True):
         # type: (AnthropicIntegration, bool) -> None
@@ -92,7 +93,9 @@ def _sentry_patched_create(*args, **kwargs):
         model = kwargs.get("model")
 
         span = sentry_sdk.start_span(
-            op=OP.ANTHROPIC_MESSAGES_CREATE, description="Anthropic messages create"
+            op=OP.ANTHROPIC_MESSAGES_CREATE,
+            description="Anthropic messages create",
+            origin=AnthropicIntegration.origin,
         )
         span.__enter__()
 

sentry_sdk/integrations/arq.py

@@ -39,6 +39,7 @@
 
 class ArqIntegration(Integration):
     identifier = "arq"
+    origin = f"auto.queue.{identifier}"
 
     @staticmethod
     def setup_once():
@@ -76,7 +77,9 @@ async def _sentry_enqueue_job(self, function, *args, **kwargs):
         if integration is None:
             return await old_enqueue_job(self, function, *args, **kwargs)
 
-        with sentry_sdk.start_span(op=OP.QUEUE_SUBMIT_ARQ, description=function):
+        with sentry_sdk.start_span(
+            op=OP.QUEUE_SUBMIT_ARQ, description=function, origin=ArqIntegration.origin
+        ):
             return await old_enqueue_job(self, function, *args, **kwargs)
 
     ArqRedis.enqueue_job = _sentry_enqueue_job
@@ -101,6 +104,7 @@ async def _sentry_run_job(self, job_id, score):
                 status="ok",
                 op=OP.QUEUE_TASK_ARQ,
                 source=TRANSACTION_SOURCE_TASK,
+                origin=ArqIntegration.origin,
             )
 
             with sentry_sdk.start_transaction(transaction):

sentry_sdk/integrations/asgi.py

@@ -82,16 +82,23 @@ def _looks_like_asgi3(app):
 
 
 class SentryAsgiMiddleware:
-    __slots__ = ("app", "__call__", "transaction_style", "mechanism_type")
+    __slots__ = (
+        "app",
+        "__call__",
+        "transaction_style",
+        "mechanism_type",
+        "span_origin",
+    )
 
     def __init__(
         self,
         app,
         unsafe_context_data=False,
         transaction_style="endpoint",
         mechanism_type="asgi",
+        span_origin="manual",
     ):
-        # type: (Any, bool, str, str) -> None
+        # type: (Any, bool, str, str, str) -> None
         """
         Instrument an ASGI application with Sentry. Provides HTTP/websocket
         data to sent events and basic handling for exceptions bubbling up
@@ -124,6 +131,7 @@ def __init__(
 
         self.transaction_style = transaction_style
         self.mechanism_type = mechanism_type
+        self.span_origin = span_origin
         self.app = app
 
         if _looks_like_asgi3(app):
@@ -182,6 +190,7 @@ async def _run_app(self, scope, receive, send, asgi_version):
                             op="{}.server".format(ty),
                             name=transaction_name,
                             source=transaction_source,
+                            origin=self.span_origin,
                         )
                         logger.debug(
                             "[ASGI] Created transaction (continuing trace): %s",
@@ -192,6 +201,7 @@ async def _run_app(self, scope, receive, send, asgi_version):
                             op=OP.HTTP_SERVER,
                             name=transaction_name,
                             source=transaction_source,
+                            origin=self.span_origin,
                         )
                         logger.debug(
                             "[ASGI] Created transaction (new): %s", transaction
@@ -205,7 +215,8 @@ async def _run_app(self, scope, receive, send, asgi_version):
                     )
 
                     with sentry_sdk.start_transaction(
-                        transaction, custom_sampling_context={"asgi_scope": scope}
+                        transaction,
+                        custom_sampling_context={"asgi_scope": scope},
                     ):
                         logger.debug("[ASGI] Started transaction: %s", transaction)
                         try:

sentry_sdk/integrations/asyncio.py

@@ -45,7 +45,9 @@ async def _coro_creating_hub_and_span():
 
                 with sentry_sdk.isolation_scope():
                     with sentry_sdk.start_span(
-                        op=OP.FUNCTION, description=get_name(coro)
+                        op=OP.FUNCTION,
+                        description=get_name(coro),
+                        origin=AsyncioIntegration.origin,
                     ):
                         try:
                             result = await coro
@@ -97,6 +99,7 @@ def _capture_exception():
 
 class AsyncioIntegration(Integration):
     identifier = "asyncio"
+    origin = f"auto.function.{identifier}"
 
     @staticmethod
     def setup_once():

sentry_sdk/integrations/asyncpg.py

@@ -29,6 +29,7 @@
 
 class AsyncPGIntegration(Integration):
     identifier = "asyncpg"
+    origin = f"auto.db.{identifier}"
     _record_params = False
 
     def __init__(self, *, record_params: bool = False):
@@ -154,7 +155,9 @@ async def _inner(*args: Any, **kwargs: Any) -> T:
         user = kwargs["params"].user
         database = kwargs["params"].database
 
-        with sentry_sdk.start_span(op=OP.DB, description="connect") as span:
+        with sentry_sdk.start_span(
+            op=OP.DB, description="connect", origin=AsyncPGIntegration.origin
+        ) as span:
             span.set_data(SPANDATA.DB_SYSTEM, "postgresql")
             addr = kwargs.get("addr")
             if addr:

sentry_sdk/integrations/aws_lambda.py

@@ -139,6 +139,7 @@ def sentry_handler(aws_event, aws_context, *args, **kwargs):
                 op=OP.FUNCTION_AWS,
                 name=aws_context.function_name,
                 source=TRANSACTION_SOURCE_COMPONENT,
+                origin=AwsLambdaIntegration.origin,
             )
             with sentry_sdk.start_transaction(
                 transaction,
@@ -178,6 +179,7 @@ def _drain_queue():
 
 class AwsLambdaIntegration(Integration):
     identifier = "aws_lambda"
+    origin = f"auto.function.{identifier}"
 
     def __init__(self, timeout_warning=False):
         # type: (bool) -> None

sentry_sdk/integrations/boto3.py

@@ -30,6 +30,7 @@
 
 class Boto3Integration(Integration):
     identifier = "boto3"
+    origin = f"auto.http.{identifier}"
 
     @staticmethod
     def setup_once():
@@ -69,6 +70,7 @@ def _sentry_request_created(service_id, request, operation_name, **kwargs):
     span = sentry_sdk.start_span(
         op=OP.HTTP_CLIENT,
         description=description,
+        origin=Boto3Integration.origin,
     )
 
     with capture_internal_exceptions():
@@ -106,6 +108,7 @@ def _sentry_after_call(context, parsed, **kwargs):
     streaming_span = span.start_child(
         op=OP.HTTP_CLIENT_STREAM,
         description=span.description,
+        origin=Boto3Integration.origin,
     )
 
     orig_read = body.read

sentry_sdk/integrations/bottle.py

@@ -40,6 +40,7 @@
 
 class BottleIntegration(Integration):
     identifier = "bottle"
+    origin = f"auto.http.{identifier}"
 
     transaction_style = ""
 
@@ -69,10 +70,13 @@ def setup_once():
         @ensure_integration_enabled(BottleIntegration, old_app)
         def sentry_patched_wsgi_app(self, environ, start_response):
             # type: (Any, Dict[str, str], Callable[..., Any]) -> _ScopedResponse
-            return SentryWsgiMiddleware(lambda *a, **kw: old_app(self, *a, **kw))(
-                environ, start_response
+            middleware = SentryWsgiMiddleware(
+                lambda *a, **kw: old_app(self, *a, **kw),
+                span_origin=BottleIntegration.origin,
             )
 
+            return middleware(environ, start_response)
+
         Bottle.__call__ = sentry_patched_wsgi_app
 
         old_handle = Bottle._handle

sentry_sdk/integrations/clickhouse_driver.py

@@ -41,6 +41,7 @@ def __getitem__(self, _):
 
 class ClickhouseDriverIntegration(Integration):
     identifier = "clickhouse_driver"
+    origin = f"auto.db.{identifier}"
 
     @staticmethod
     def setup_once() -> None:
@@ -81,7 +82,11 @@ def _inner(*args: P.args, **kwargs: P.kwargs) -> T:
         query_id = args[2] if len(args) > 2 else kwargs.get("query_id")
         params = args[3] if len(args) > 3 else kwargs.get("params")
 
-        span = sentry_sdk.start_span(op=OP.DB, description=query)
+        span = sentry_sdk.start_span(
+            op=OP.DB,
+            description=query,
+            origin=ClickhouseDriverIntegration.origin,
+        )
 
         connection._sentry_span = span  # type: ignore[attr-defined]
 

sentry_sdk/integrations/cohere.py

@@ -66,6 +66,7 @@
 
 class CohereIntegration(Integration):
     identifier = "cohere"
+    origin = f"auto.ai.{identifier}"
 
     def __init__(self, include_prompts=True):
         # type: (CohereIntegration, bool) -> None
@@ -141,6 +142,7 @@ def new_chat(*args, **kwargs):
         span = sentry_sdk.start_span(
             op=consts.OP.COHERE_CHAT_COMPLETIONS_CREATE,
             description="cohere.client.Chat",
+            origin=CohereIntegration.origin,
         )
         span.__enter__()
         try:
@@ -225,6 +227,7 @@ def new_embed(*args, **kwargs):
         with sentry_sdk.start_span(
             op=consts.OP.COHERE_EMBEDDINGS_CREATE,
             description="Cohere Embedding Creation",
+            origin=CohereIntegration.origin,
         ) as span:
             integration = sentry_sdk.get_client().get_integration(CohereIntegration)
             if "texts" in kwargs and (

sentry_sdk/integrations/django/__init__.py

@@ -115,6 +115,7 @@ class DjangoIntegration(Integration):
     """
 
     identifier = "django"
+    origin = f"auto.http.{identifier}"
 
     transaction_style = ""
     middleware_spans = None
@@ -171,9 +172,12 @@ def sentry_patched_wsgi_handler(self, environ, start_response):
 
             use_x_forwarded_for = settings.USE_X_FORWARDED_HOST
 
-            return SentryWsgiMiddleware(bound_old_app, use_x_forwarded_for)(
-                environ, start_response
+            middleware = SentryWsgiMiddleware(
+                bound_old_app,
+                use_x_forwarded_for,
+                span_origin=DjangoIntegration.origin,
             )
+            return middleware(environ, start_response)
 
         WSGIHandler.__call__ = sentry_patched_wsgi_handler
 
@@ -321,10 +325,14 @@ def sentry_patched_drf_initial(self, request, *args, **kwargs):
 def _patch_channels():
     # type: () -> None
     try:
+        # Django < 3.0
         from channels.http import AsgiHandler  # type: ignore
     except ImportError:
-        return
-
+        try:
+            # DJango 3.0+
+            from django.core.handlers.asgi import ASGIHandler as AsgiHandler
+        except ImportError:
+            return
     if not HAS_REAL_CONTEXTVARS:
         # We better have contextvars or we're going to leak state between
         # requests.
@@ -621,7 +629,12 @@ def install_sql_hook():
     def execute(self, sql, params=None):
         # type: (CursorWrapper, Any, Optional[Any]) -> Any
         with record_sql_queries(
-            self.cursor, sql, params, paramstyle="format", executemany=False
+            cursor=self.cursor,
+            query=sql,
+            params_list=params,
+            paramstyle="format",
+            executemany=False,
+            span_origin=DjangoIntegration.origin,
         ) as span:
             _set_db_data(span, self)
             options = (
@@ -649,7 +662,12 @@ def execute(self, sql, params=None):
     def executemany(self, sql, param_list):
         # type: (CursorWrapper, Any, List[Any]) -> Any
         with record_sql_queries(
-            self.cursor, sql, param_list, paramstyle="format", executemany=True
+            cursor=self.cursor,
+            query=sql,
+            params_list=param_list,
+            paramstyle="format",
+            executemany=True,
+            span_origin=DjangoIntegration.origin,
         ) as span:
             _set_db_data(span, self)
 
@@ -666,7 +684,11 @@ def connect(self):
         with capture_internal_exceptions():
             sentry_sdk.add_breadcrumb(message="connect", category="query")
 
-        with sentry_sdk.start_span(op=OP.DB, description="connect") as span:
+        with sentry_sdk.start_span(
+            op=OP.DB,
+            description="connect",
+            origin=DjangoIntegration.origin,
+        ) as span:
             _set_db_data(span, self)
             return real_connect(self)
 

sentry_sdk/integrations/django/asgi.py

@@ -95,7 +95,9 @@ async def sentry_patched_asgi_handler(self, scope, receive, send):
             return await old_app(self, scope, receive, send)
 
         middleware = SentryAsgiMiddleware(
-            old_app.__get__(self, cls), unsafe_context_data=True
+            old_app.__get__(self, cls),
+            unsafe_context_data=True,
+            span_origin=DjangoIntegration.origin,
         )._run_asgi3
 
         return await middleware(scope, receive, send)
@@ -145,7 +147,9 @@ async def sentry_patched_asgi_handler(self, receive, send):
                 return await old_app(self, receive, send)
 
             middleware = SentryAsgiMiddleware(
-                lambda _scope: old_app.__get__(self, cls), unsafe_context_data=True
+                lambda _scope: old_app.__get__(self, cls),
+                unsafe_context_data=True,
+                span_origin=DjangoIntegration.origin,
             )
 
             return await middleware(self.scope)(receive, send)
@@ -160,6 +164,8 @@ async def sentry_patched_asgi_handler(self, receive, send):
 
 def wrap_async_view(callback):
     # type: (Any) -> Any
+    from sentry_sdk.integrations.django import DjangoIntegration
+
     @functools.wraps(callback)
     async def sentry_wrapped_callback(request, *args, **kwargs):
         # type: (Any, *Any, **Any) -> Any
@@ -168,7 +174,9 @@ async def sentry_wrapped_callback(request, *args, **kwargs):
             sentry_scope.profile.update_active_thread_id()
 
         with sentry_sdk.start_span(
-            op=OP.VIEW_RENDER, description=request.resolver_match.view_name
+            op=OP.VIEW_RENDER,
+            description=request.resolver_match.view_name,
+            origin=DjangoIntegration.origin,
         ):
             return await callback(request, *args, **kwargs)