Merge branch 'potel-base' into antonpirker/potel/deprecate-set-data

Author: antonpirker

MIGRATION_GUIDE.md

@@ -9,6 +9,7 @@ Looking to upgrade from Sentry SDK 2.x to 3.x? Here's a comprehensive list of wh
 ### Changed
 
 - The SDK now supports Python 3.7 and higher.
+- The default of `traces_sample_rate` changed to `0`. Meaning: Incoming traces will be continued by default. For example, if your frontend sends a `sentry-trace/baggage` headers pair, your SDK will create Spans and send them to Sentry. (The default used to be `None` meaning by default no Spans where created, no matter what headers the frontend sent to your project.) See also: https://docs.sentry.io/platforms/python/configuration/options/#traces_sample_rate
 - `sentry_sdk.start_span` now only takes keyword arguments.
 - `sentry_sdk.start_transaction`/`sentry_sdk.start_span` no longer takes the following arguments: `span`, `parent_sampled`, `trace_id`, `span_id` or `parent_span_id`.
 - You can no longer change the sampled status of a span with `span.sampled = False` after starting it.
@@ -131,7 +132,6 @@ Looking to upgrade from Sentry SDK 2.x to 3.x? Here's a comprehensive list of wh
 
 ### Removed
 
-- Spans no longer have a `description`. Use `name` instead.
 - Dropped support for Python 3.6.
 - The `enable_tracing` `init` option has been removed. Configure `traces_sample_rate` directly.
 - The `propagate_traces` `init` option has been removed. Use `trace_propagation_targets` instead.
@@ -157,11 +157,15 @@ Looking to upgrade from Sentry SDK 2.x to 3.x? Here's a comprehensive list of wh
 - `profiles_sample_rate` and `profiler_mode` were removed from options available via `_experiments`. Use the top-level `profiles_sample_rate` and `profiler_mode` options instead.
 - `Transport.capture_event` has been removed. Use `Transport.capture_envelope` instead.
 - Function transports are no longer supported. Subclass the `Transport` instead.
+- `start_transaction` (`start_span`) no longer takes the following arguments:
+  - `trace_id`, `baggage`: use `continue_trace` for propagation from headers or environment variables
+  - `same_process_as_parent`
+  - `span_id`
+  - `parent_span_id`: you can supply a `parent_span` instead
 - Setting `Scope.transaction` directly is no longer supported. Use `Scope.set_transaction_name()` instead.
 - Passing a list or `None` for `failed_request_status_codes` in the Starlette integration is no longer supported. Pass a set of integers instead.
 - The `span` argument of `Scope.trace_propagation_meta` is no longer supported.
 - Setting `Scope.user` directly is no longer supported. Use `Scope.set_user()` instead.
-- `start_transaction` (`start_span`) no longer takes a `baggage` argument. Use the `continue_trace()` context manager instead to propagate baggage.
 - Dropped support for Django versions below 2.0.
 - Dropped support for trytond versions below 5.0.
 - Dropped support for Falcon versions below 3.0.

sentry_sdk/consts.py

@@ -511,7 +511,7 @@ def __init__(
         debug=None,  # type: Optional[bool]
         attach_stacktrace=False,  # type: bool
         ca_certs=None,  # type: Optional[str]
-        traces_sample_rate=None,  # type: Optional[float]
+        traces_sample_rate=0,  # type: Optional[float]
         traces_sampler=None,  # type: Optional[TracesSampler]
         profiles_sample_rate=None,  # type: Optional[float]
         profiles_sampler=None,  # type: Optional[TracesSampler]

sentry_sdk/tracing.py

@@ -239,14 +239,9 @@ def __init__(
         only_if_parent=False,  # type: bool
         parent_span=None,  # type: Optional[Span]
         otel_span=None,  # type: Optional[OtelSpan]
-        **_,  # type: dict[str, object]
     ):
         # type: (...) -> None
         """
-        For backwards compatibility with old the old Span interface, this class
-        accepts arbitrary keyword arguments, in addition to the ones explicitly
-        listed in the signature. These additional arguments are ignored.
-
         If otel_span is passed explicitly, just acts as a proxy.
 
         If only_if_parent is True, just return an INVALID_SPAN
@@ -284,6 +279,8 @@ def __init__(
                     attributes[SentrySpanAttribute.OP] = op
                 if source is not None:
                     attributes[SentrySpanAttribute.SOURCE] = source
+                if description is not None:
+                    attributes[SentrySpanAttribute.DESCRIPTION] = description
                 if sampled is not None:
                     attributes[SentrySpanAttribute.CUSTOM_SAMPLED] = sampled
 
@@ -543,7 +540,7 @@ def timestamp(self):
 
     def start_child(self, **kwargs):
         # type: (**Any) -> Span
-        return Span(sampled=self.sampled, parent_span=self, **kwargs)
+        return Span(parent_span=self, **kwargs)
 
     def iter_headers(self):
         # type: () -> Iterator[Tuple[str, str]]

tests/integrations/aiohttp/test_aiohttp.py

@@ -448,7 +448,10 @@ async def hello(request):
 async def test_trace_from_headers_if_performance_disabled(
     sentry_init, aiohttp_client, capture_events
 ):
-    sentry_init(integrations=[AioHttpIntegration()])
+    sentry_init(
+        integrations=[AioHttpIntegration()],
+        traces_sample_rate=None,  # disable all performance monitoring
+    )
 
     async def hello(request):
         capture_message("It's a good day to try dividing by 0")

tests/integrations/asgi/test_asgi.py

@@ -269,7 +269,9 @@ async def test_has_trace_if_performance_disabled(
     asgi3_app_with_error_and_msg,
     capture_events,
 ):
-    sentry_init()
+    sentry_init(
+        traces_sample_rate=None,  # disable all performance monitoring
+    )
     app = SentryAsgiMiddleware(asgi3_app_with_error_and_msg)
 
     with pytest.raises(ZeroDivisionError):
@@ -325,7 +327,9 @@ async def test_trace_from_headers_if_performance_disabled(
     asgi3_app_with_error_and_msg,
     capture_events,
 ):
-    sentry_init()
+    sentry_init(
+        traces_sample_rate=None,  # disable all performance monitoring
+    )
     app = SentryAsgiMiddleware(asgi3_app_with_error_and_msg)
 
     trace_id = "582b43a4192642f0b136d5159a501701"

tests/integrations/django/asgi/test_asgi.py

@@ -321,6 +321,7 @@ async def test_has_trace_if_performance_enabled(sentry_init, capture_events):
 async def test_has_trace_if_performance_disabled(sentry_init, capture_events):
     sentry_init(
         integrations=[DjangoIntegration()],
+        traces_sample_rate=None,  # disable all performance monitoring
     )
 
     events = capture_events()
@@ -386,6 +387,7 @@ async def test_trace_from_headers_if_performance_enabled(sentry_init, capture_ev
 async def test_trace_from_headers_if_performance_disabled(sentry_init, capture_events):
     sentry_init(
         integrations=[DjangoIntegration()],
+        traces_sample_rate=None,  # disable all performance monitoring
     )
 
     events = capture_events()

tests/integrations/django/test_basic.py

@@ -241,6 +241,7 @@ def test_trace_from_headers_if_performance_disabled(
                 http_methods_to_capture=("HEAD",),
             )
         ],
+        traces_sample_rate=None,  # disable all performance monitoring
     )
 
     events = capture_events()

tests/integrations/opentelemetry/test_sampler.py

@@ -6,14 +6,16 @@
 import sentry_sdk
 
 
+USE_DEFAULT_TRACES_SAMPLE_RATE = -1
+
 tracer = trace.get_tracer(__name__)
 
 
 @pytest.mark.parametrize(
     "traces_sample_rate, expected_num_of_envelopes",
     [
-        # special case for testing, do not pass any traces_sample_rate to init() (the default traces_sample_rate=None will be used)
-        (-1, 0),
+        # special case for testing, do not pass any traces_sample_rate to init() (the default traces_sample_rate=0 will be used)
+        (USE_DEFAULT_TRACES_SAMPLE_RATE, 0),
         # traces_sample_rate=None means do not create new traces, and also do not continue incoming traces. So, no envelopes at all.
         (None, 0),
         # traces_sample_rate=0 means do not create new traces (0% of the requests), but continue incoming traces. So envelopes will be created only if there is an incoming trace.
@@ -29,7 +31,7 @@ def test_sampling_traces_sample_rate_0_or_100(
     expected_num_of_envelopes,
 ):
     kwargs = {}
-    if traces_sample_rate != -1:
+    if traces_sample_rate != USE_DEFAULT_TRACES_SAMPLE_RATE:
         kwargs["traces_sample_rate"] = traces_sample_rate
 
     sentry_init(**kwargs)
@@ -176,8 +178,8 @@ def keep_only_a(sampling_context):
 @pytest.mark.parametrize(
     "traces_sample_rate, expected_num_of_envelopes",
     [
-        # special case for testing, do not pass any traces_sample_rate to init() (the default traces_sample_rate=None will be used)
-        (-1, 0),
+        # special case for testing, do not pass any traces_sample_rate to init() (the default traces_sample_rate=0 will be used)
+        (USE_DEFAULT_TRACES_SAMPLE_RATE, 1),
         # traces_sample_rate=None means do not create new traces, and also do not continue incoming traces. So, no envelopes at all.
         (None, 0),
         # traces_sample_rate=0 means do not create new traces (0% of the requests), but continue incoming traces. So envelopes will be created only if there is an incoming trace.
@@ -193,7 +195,7 @@ def test_sampling_parent_sampled(
     capture_envelopes,
 ):
     kwargs = {}
-    if traces_sample_rate != -1:
+    if traces_sample_rate != USE_DEFAULT_TRACES_SAMPLE_RATE:
         kwargs["traces_sample_rate"] = traces_sample_rate
 
     sentry_init(**kwargs)
@@ -227,9 +229,11 @@ def test_sampling_parent_sampled(
 @pytest.mark.parametrize(
     "traces_sample_rate, upstream_sampled, expected_num_of_envelopes",
     [
-        # special case for testing, do not pass any traces_sample_rate to init() (the default traces_sample_rate=None will be used)
-        (-1, 0, 0),
+        # special case for testing, do not pass any traces_sample_rate to init() (the default traces_sample_rate=0 will be used)
+        (USE_DEFAULT_TRACES_SAMPLE_RATE, 0, 0),
+        (USE_DEFAULT_TRACES_SAMPLE_RATE, 1, 1),
         # traces_sample_rate=None means do not create new traces, and also do not continue incoming traces. So, no envelopes at all.
+        (None, 0, 0),
         (None, 1, 0),
         # traces_sample_rate=0 means do not create new traces (0% of the requests), but continue incoming traces. So envelopes will be created only if there is an incoming trace.
         (0, 0, 0),
@@ -247,7 +251,7 @@ def test_sampling_parent_dropped(
     capture_envelopes,
 ):
     kwargs = {}
-    if traces_sample_rate != -1:
+    if traces_sample_rate != USE_DEFAULT_TRACES_SAMPLE_RATE:
         kwargs["traces_sample_rate"] = traces_sample_rate
 
     sentry_init(**kwargs)
@@ -281,8 +285,8 @@ def test_sampling_parent_dropped(
 @pytest.mark.parametrize(
     "traces_sample_rate, expected_num_of_envelopes",
     [
-        # special case for testing, do not pass any traces_sample_rate to init() (the default traces_sample_rate=None will be used)
-        (-1, 0),
+        # special case for testing, do not pass any traces_sample_rate to init() (the default traces_sample_rate=0 will be used)
+        (USE_DEFAULT_TRACES_SAMPLE_RATE, 0),
         # traces_sample_rate=None means do not create new traces, and also do not continue incoming traces. So, no envelopes at all.
         (None, 0),
         # traces_sample_rate=0 means do not create new traces (0% of the requests), but continue incoming traces. So envelopes will be created only if there is an incoming trace.
@@ -298,7 +302,7 @@ def test_sampling_parent_deferred(
     capture_envelopes,
 ):
     kwargs = {}
-    if traces_sample_rate != -1:
+    if traces_sample_rate != USE_DEFAULT_TRACES_SAMPLE_RATE:
         kwargs["traces_sample_rate"] = traces_sample_rate
 
     sentry_init(**kwargs)

tests/integrations/wsgi/test_wsgi.py

@@ -238,7 +238,9 @@ def dogpark(environ, start_response):
         capture_message("Attempting to fetch the ball")
         raise ValueError("Fetch aborted. The ball was not returned.")
 
-    sentry_init()
+    sentry_init(
+        traces_sample_rate=None,  # disable all performance monitoring
+    )
     app = SentryWsgiMiddleware(dogpark)
     client = Client(app)
     events = capture_events()
@@ -301,7 +303,9 @@ def dogpark(environ, start_response):
         capture_message("Attempting to fetch the ball")
         raise ValueError("Fetch aborted. The ball was not returned.")
 
-    sentry_init()
+    sentry_init(
+        traces_sample_rate=None,  # disable all performance monitoring
+    )
     app = SentryWsgiMiddleware(dogpark)
     client = Client(app)
     events = capture_events()

tests/test_dsc.py

@@ -287,8 +287,8 @@ def my_traces_sampler(sampling_context):
                 "local_traces_sampler_result": None,
                 "local_traces_sample_rate": None,
             },
-            None,  # expected_sample_rate
-            "tracing-disabled-no-transactions-should-be-sent",  # expected_sampled (traces_sample_rate=None disables all transaction creation)
+            1.0,  # expected_sample_rate
+            "true",  # expected_sampled
         ),
         (  # 6 traces_sampler overrides incoming  (traces_sample_rate not set)
             {