Merge master into potel-base (#4093)

Co-authored-by: Andrew Liu <[email protected]>
Co-authored-by: Marcelo Galigniana <[email protected]>

Author: 3 people

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

@@ -55,7 +55,8 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
-      - uses: getsentry/[email protected]
+      - name: "Setup ClickHouse Server"
+        uses: getsentry/[email protected]
       - name: Setup Test Env
         run: |
           pip install "coverage[toml]" tox
@@ -140,7 +141,8 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
-      - uses: getsentry/[email protected]
+      - name: "Setup ClickHouse Server"
+        uses: getsentry/[email protected]
       - name: Setup Test Env
         run: |
           pip install "coverage[toml]" tox

CHANGELOG.md

@@ -2328,7 +2328,7 @@ By: @mgaligniana (#1773)
 
   import sentry_sdk
   from sentry_sdk.integrations.arq import ArqIntegration
-  from sentry_sdk.tracing import TRANSACTION_SOURCE_COMPONENT
+  from sentry_sdk.tracing import TransactionSource
 
   sentry_sdk.init(
       dsn="...",
@@ -2348,7 +2348,7 @@ By: @mgaligniana (#1773)
       await ctx['session'].aclose()
 
   async def main():
-      with sentry_sdk.start_transaction(name="testing_arq_tasks", source=TRANSACTION_SOURCE_COMPONENT):
+      with sentry_sdk.start_transaction(name="testing_arq_tasks", source=TransactionSource.COMPONENT):
           redis = await create_pool(RedisSettings())
           for url in ('https://facebook.com', 'https://microsoft.com', 'https://github.com', "asdf"
                       ):
@@ -2422,7 +2422,7 @@ By: @mgaligniana (#1773)
 
   import sentry_sdk
   from sentry_sdk.integrations.huey import HueyIntegration
-  from sentry_sdk.tracing import TRANSACTION_SOURCE_COMPONENT, Transaction
+  from sentry_sdk.tracing import TransactionSource, Transaction
 
 
   def main():
@@ -2434,7 +2434,7 @@ By: @mgaligniana (#1773)
           traces_sample_rate=1.0,
       )
 
-      with sentry_sdk.start_transaction(name="testing_huey_tasks", source=TRANSACTION_SOURCE_COMPONENT):
+      with sentry_sdk.start_transaction(name="testing_huey_tasks", source=TransactionSource.COMPONENT):
           r = add_numbers(1, 2)
 
   if __name__ == "__main__":

scripts/split_tox_gh_actions/templates/test_group.jinja

@@ -47,7 +47,8 @@
           python-version: {% raw %}${{ matrix.python-version }}{% endraw %}
           allow-prereleases: true
       {% if needs_clickhouse %}
-      - uses: getsentry/[email protected]
+      - name: "Setup ClickHouse Server"
+        uses: getsentry/[email protected]
       {% endif %}
 
       {% if needs_redis %}

sentry_sdk/integrations/aiohttp.py

@@ -20,7 +20,7 @@
 from sentry_sdk.tracing import (
     BAGGAGE_HEADER_NAME,
     SOURCE_FOR_STYLE,
-    TRANSACTION_SOURCE_ROUTE,
+    TransactionSource,
 )
 from sentry_sdk.tracing_utils import should_propagate_trace
 from sentry_sdk.utils import (
@@ -136,7 +136,7 @@ async def sentry_app_handle(self, request, *args, **kwargs):
                             # If this transaction name makes it to the UI, AIOHTTP's
                             # URL resolver did not find a route or died trying.
                             name="generic AIOHTTP request",
-                            source=TRANSACTION_SOURCE_ROUTE,
+                            source=TransactionSource.ROUTE,
                             origin=AioHttpIntegration.origin,
                             attributes=_prepopulate_attributes(request),
                         ) as span:

sentry_sdk/integrations/arq.py

@@ -5,7 +5,7 @@
 from sentry_sdk.integrations import _check_minimum_version, DidNotEnable, Integration
 from sentry_sdk.integrations.logging import ignore_logger
 from sentry_sdk.scope import should_send_default_pii
-from sentry_sdk.tracing import TRANSACTION_SOURCE_TASK
+from sentry_sdk.tracing import TransactionSource
 from sentry_sdk.utils import (
     capture_internal_exceptions,
     ensure_integration_enabled,
@@ -103,14 +103,14 @@ async def _sentry_run_job(self, job_id, score):
             scope._name = "arq"
             scope.set_transaction_name(
                 DEFAULT_TRANSACTION_NAME,
-                source=TRANSACTION_SOURCE_TASK,
+                source=TransactionSource.TASK,
             )
             scope.clear_breadcrumbs()
 
             with sentry_sdk.start_span(
                 op=OP.QUEUE_TASK_ARQ,
                 name=DEFAULT_TRANSACTION_NAME,
-                source=TRANSACTION_SOURCE_TASK,
+                source=TransactionSource.TASK,
                 origin=ArqIntegration.origin,
             ) as span:
                 return_value = await old_run_job(self, job_id, score)

sentry_sdk/integrations/asgi.py

@@ -25,10 +25,7 @@
 from sentry_sdk.sessions import track_session
 from sentry_sdk.tracing import (
     SOURCE_FOR_STYLE,
-    TRANSACTION_SOURCE_ROUTE,
-    TRANSACTION_SOURCE_URL,
-    TRANSACTION_SOURCE_COMPONENT,
-    TRANSACTION_SOURCE_CUSTOM,
+    TransactionSource,
 )
 from sentry_sdk.utils import (
     ContextVar,
@@ -265,9 +262,9 @@ def event_processor(self, event, hint, asgi_scope):
             and "source" in event["transaction_info"]
             and event["transaction_info"]["source"]
             in [
-                TRANSACTION_SOURCE_COMPONENT,
-                TRANSACTION_SOURCE_ROUTE,
-                TRANSACTION_SOURCE_CUSTOM,
+                TransactionSource.COMPONENT,
+                TransactionSource.ROUTE,
+                TransactionSource.CUSTOM,
             ]
         )
         if not already_set:
@@ -306,7 +303,7 @@ def _get_transaction_name_and_source(self, transaction_style, asgi_scope):
                 name = transaction_from_function(endpoint) or ""
             else:
                 name = _get_url(asgi_scope, "http" if ty == "http" else "ws", host=None)
-                source = TRANSACTION_SOURCE_URL
+                source = TransactionSource.URL
 
         elif transaction_style == "url":
             # FastAPI includes the route object in the scope to let Sentry extract the
@@ -318,11 +315,11 @@ def _get_transaction_name_and_source(self, transaction_style, asgi_scope):
                     name = path
             else:
                 name = _get_url(asgi_scope, "http" if ty == "http" else "ws", host=None)
-                source = TRANSACTION_SOURCE_URL
+                source = TransactionSource.URL
 
         if name is None:
             name = _DEFAULT_TRANSACTION_NAME
-            source = TRANSACTION_SOURCE_ROUTE
+            source = TransactionSource.ROUTE
             return name, source
 
         return name, source

sentry_sdk/integrations/aws_lambda.py

@@ -10,7 +10,7 @@
 import sentry_sdk
 from sentry_sdk.consts import OP
 from sentry_sdk.scope import should_send_default_pii
-from sentry_sdk.tracing import TRANSACTION_SOURCE_COMPONENT
+from sentry_sdk.tracing import TransactionSource
 from sentry_sdk.utils import (
     AnnotatedValue,
     capture_internal_exceptions,
@@ -125,7 +125,7 @@ def sentry_handler(aws_event, aws_context, *args, **kwargs):
 
         with sentry_sdk.isolation_scope() as scope:
             scope.set_transaction_name(
-                aws_context.function_name, source=TRANSACTION_SOURCE_COMPONENT
+                aws_context.function_name, source=TransactionSource.COMPONENT
             )
             timeout_thread = None
             with capture_internal_exceptions():
@@ -170,7 +170,7 @@ def sentry_handler(aws_event, aws_context, *args, **kwargs):
                 with sentry_sdk.start_span(
                     op=OP.FUNCTION_AWS,
                     name=aws_context.function_name,
-                    source=TRANSACTION_SOURCE_COMPONENT,
+                    source=TransactionSource.COMPONENT,
                     origin=AwsLambdaIntegration.origin,
                     attributes=_prepopulate_attributes(request_data, aws_context),
                 ):

sentry_sdk/integrations/celery/__init__.py

@@ -13,7 +13,7 @@
 )
 from sentry_sdk.integrations.celery.utils import _now_seconds_since_epoch
 from sentry_sdk.integrations.logging import ignore_logger
-from sentry_sdk.tracing import BAGGAGE_HEADER_NAME, TRANSACTION_SOURCE_TASK
+from sentry_sdk.tracing import BAGGAGE_HEADER_NAME, TransactionSource
 from sentry_sdk.tracing_utils import Baggage
 from sentry_sdk.utils import (
     capture_internal_exceptions,
@@ -306,7 +306,7 @@ def _inner(*args, **kwargs):
         with isolation_scope() as scope:
             scope._name = "celery"
             scope.clear_breadcrumbs()
-            scope.set_transaction_name(task.name, source=TRANSACTION_SOURCE_TASK)
+            scope.set_transaction_name(task.name, source=TransactionSource.TASK)
             scope.add_event_processor(_make_event_processor(task, *args, **kwargs))
 
             # Celery task objects are not a thing to be trusted. Even
@@ -317,7 +317,7 @@ def _inner(*args, **kwargs):
                 with sentry_sdk.start_span(
                     op=OP.QUEUE_TASK_CELERY,
                     name=task.name,
-                    source=TRANSACTION_SOURCE_TASK,
+                    source=TransactionSource.TASK,
                     origin=CeleryIntegration.origin,
                     # for some reason, args[1] is a list if non-empty but a
                     # tuple if empty

sentry_sdk/integrations/chalice.py

@@ -4,7 +4,7 @@
 import sentry_sdk
 from sentry_sdk.integrations import Integration, DidNotEnable
 from sentry_sdk.integrations.aws_lambda import _make_request_event_processor
-from sentry_sdk.tracing import TRANSACTION_SOURCE_COMPONENT
+from sentry_sdk.tracing import TransactionSource
 from sentry_sdk.utils import (
     capture_internal_exceptions,
     event_from_exception,
@@ -67,7 +67,7 @@ def wrapped_view_function(**function_args):
                 configured_time = app.lambda_context.get_remaining_time_in_millis()
                 scope.set_transaction_name(
                     app.lambda_context.function_name,
-                    source=TRANSACTION_SOURCE_COMPONENT,
+                    source=TransactionSource.COMPONENT,
                 )
 
                 scope.add_event_processor(

sentry_sdk/integrations/django/__init__.py

@@ -8,7 +8,7 @@
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.scope import add_global_event_processor, should_send_default_pii
 from sentry_sdk.serializer import add_global_repr_processor
-from sentry_sdk.tracing import SOURCE_FOR_STYLE, TRANSACTION_SOURCE_URL
+from sentry_sdk.tracing import SOURCE_FOR_STYLE, TransactionSource
 from sentry_sdk.tracing_utils import add_query_source, record_sql_queries
 from sentry_sdk.utils import (
     AnnotatedValue,
@@ -398,7 +398,7 @@ def _set_transaction_name_and_source(scope, transaction_style, request):
 
         if transaction_name is None:
             transaction_name = request.path_info
-            source = TRANSACTION_SOURCE_URL
+            source = TransactionSource.URL
         else:
             source = SOURCE_FOR_STYLE[transaction_style]