.

Author: sentrivana

tests/integrations/asyncpg/test_asyncpg.py

@@ -480,7 +480,7 @@ async def test_query_source_disabled(sentry_init, capture_events):
 
     events = capture_events()
 
-    with start_transaction(name="test_transaction", sampled=True):
+    with start_transaction(name="test_transaction"):
         conn: Connection = await connect(PG_CONNECTION_URI)
 
         await conn.execute(
@@ -519,7 +519,7 @@ async def test_query_source_enabled(
 
     events = capture_events()
 
-    with start_transaction(name="test_transaction", sampled=True):
+    with start_transaction(name="test_transaction"):
         conn: Connection = await connect(PG_CONNECTION_URI)
 
         await conn.execute(
@@ -552,7 +552,7 @@ async def test_query_source(sentry_init, capture_events):
 
     events = capture_events()
 
-    with start_transaction(name="test_transaction", sampled=True):
+    with start_transaction(name="test_transaction"):
         conn: Connection = await connect(PG_CONNECTION_URI)
 
         await conn.execute(
@@ -604,7 +604,7 @@ async def test_query_source_with_module_in_search_path(sentry_init, capture_even
 
     from asyncpg_helpers.helpers import execute_query_in_connection
 
-    with start_transaction(name="test_transaction", sampled=True):
+    with start_transaction(name="test_transaction"):
         conn: Connection = await connect(PG_CONNECTION_URI)
 
         await execute_query_in_connection(
@@ -648,7 +648,7 @@ async def test_no_query_source_if_duration_too_short(sentry_init, capture_events
 
     events = capture_events()
 
-    with start_transaction(name="test_transaction", sampled=True):
+    with start_transaction(name="test_transaction"):
         conn: Connection = await connect(PG_CONNECTION_URI)
 
         @contextmanager
@@ -693,7 +693,7 @@ async def test_query_source_if_duration_over_threshold(sentry_init, capture_even
 
     events = capture_events()
 
-    with start_transaction(name="test_transaction", sampled=True):
+    with start_transaction(name="test_transaction"):
         conn: Connection = await connect(PG_CONNECTION_URI)
 
         @contextmanager

tests/integrations/sqlalchemy/test_sqlalchemy.py

@@ -110,7 +110,7 @@ class Address(Base):
     Session = sessionmaker(bind=engine)  # noqa: N806
     session = Session()
 
-    with start_transaction(name="test_transaction", sampled=True):
+    with start_transaction(name="test_transaction"):
         with session.begin_nested():
             session.query(Person).first()
 
@@ -184,7 +184,7 @@ class Address(Base):
     Session = sessionmaker(bind=engine)  # noqa: N806
     session = Session()
 
-    with start_transaction(name="test_transaction", sampled=True):
+    with start_transaction(name="test_transaction"):
         with session.begin_nested():
             session.query(Person).first()
 
@@ -305,7 +305,7 @@ def test_query_source_disabled(sentry_init, capture_events):
 
     events = capture_events()
 
-    with start_transaction(name="test_transaction", sampled=True):
+    with start_transaction(name="test_transaction"):
         Base = declarative_base()  # noqa: N806
 
         class Person(Base):
@@ -357,7 +357,7 @@ def test_query_source_enabled(sentry_init, capture_events, enable_db_query_sourc
 
     events = capture_events()
 
-    with start_transaction(name="test_transaction", sampled=True):
+    with start_transaction(name="test_transaction"):
         Base = declarative_base()  # noqa: N806
 
         class Person(Base):
@@ -404,7 +404,7 @@ def test_query_source(sentry_init, capture_events):
     )
     events = capture_events()
 
-    with start_transaction(name="test_transaction", sampled=True):
+    with start_transaction(name="test_transaction"):
         Base = declarative_base()  # noqa: N806
 
         class Person(Base):
@@ -474,7 +474,7 @@ def test_query_source_with_module_in_search_path(sentry_init, capture_events):
         query_first_model_from_session,
     )
 
-    with start_transaction(name="test_transaction", sampled=True):
+    with start_transaction(name="test_transaction"):
         Base = declarative_base()  # noqa: N806
 
         class Person(Base):
@@ -532,7 +532,7 @@ def test_no_query_source_if_duration_too_short(sentry_init, capture_events):
     )
     events = capture_events()
 
-    with start_transaction(name="test_transaction", sampled=True):
+    with start_transaction(name="test_transaction"):
         Base = declarative_base()  # noqa: N806
 
         class Person(Base):
@@ -598,7 +598,7 @@ def test_query_source_if_duration_over_threshold(sentry_init, capture_events):
     )
     events = capture_events()
 
-    with start_transaction(name="test_transaction", sampled=True):
+    with start_transaction(name="test_transaction"):
         Base = declarative_base()  # noqa: N806
 
         class Person(Base):

tests/tracing/test_http_headers.py

@@ -8,12 +8,13 @@
 
 @pytest.mark.parametrize("sampled", [True, False, None])
 def test_to_traceparent(sampled):
-    transaction = Transaction(
-        name="/interactions/other-dogs/new-dog",
-        op="greeting.sniff",
-        trace_id="12312012123120121231201212312012",
-        sampled=sampled,
-    )
+    with pytest.warns(DeprecationWarning):
+        transaction = Transaction(
+            name="/interactions/other-dogs/new-dog",
+            op="greeting.sniff",
+            trace_id="12312012123120121231201212312012",
+            sampled=sampled,
+        )
 
     traceparent = transaction.to_traceparent()
 

tests/tracing/test_integration_tests.py

@@ -65,20 +65,23 @@ def test_continue_from_headers(
     sentry_init(traces_sample_rate=sample_rate)
     envelopes = capture_envelopes()
 
-    # make a parent transaction (normally this would be in a different service)
-    with start_transaction(name="hi", sampled=True if sample_rate == 0 else None):
-        with start_span() as old_span:
-            old_span.sampled = parent_sampled
-            headers = dict(
-                sentry_sdk.get_current_scope().iter_trace_propagation_headers(old_span)
-            )
-            headers["baggage"] = (
-                "other-vendor-value-1=foo;bar;baz, "
-                "sentry-trace_id=771a43a4192642f0b136d5159a501700, "
-                "sentry-public_key=49d0f7386ad645858ae85020e393bef3, "
-                "sentry-sample_rate=0.01337, sentry-user_id=Amelie, "
-                "other-vendor-value-2=foo;bar;"
-            )
+    with pytest.warns(DeprecationWarning):
+        # make a parent transaction (normally this would be in a different service)
+        with start_transaction(name="hi", sampled=True if sample_rate == 0 else None):
+            with start_span() as old_span:
+                old_span.sampled = parent_sampled
+                headers = dict(
+                    sentry_sdk.get_current_scope().iter_trace_propagation_headers(
+                        old_span
+                    )
+                )
+                headers["baggage"] = (
+                    "other-vendor-value-1=foo;bar;baz, "
+                    "sentry-trace_id=771a43a4192642f0b136d5159a501700, "
+                    "sentry-public_key=49d0f7386ad645858ae85020e393bef3, "
+                    "sentry-sample_rate=0.01337, sentry-user_id=Amelie, "
+                    "other-vendor-value-2=foo;bar;"
+                )
 
     # child transaction, to prove that we can read 'sentry-trace' header data correctly
     child_transaction = Transaction.continue_from_headers(headers, name="WRONG")

tests/tracing/test_misc.py

@@ -418,7 +418,8 @@ def test_start_transaction_updates_scope_name_source(sentry_init):
 def test_transaction_dropped_debug_not_started(sentry_init, sampled):
     sentry_init(enable_tracing=True)
 
-    tx = Transaction(sampled=sampled)
+    with pytest.warns(DeprecationWarning):
+        tx = Transaction(sampled=sampled)
 
     with mock.patch("sentry_sdk.tracing.logger") as mock_logger:
         with tx:
@@ -438,7 +439,8 @@ def test_transaction_dropped_debug_not_started(sentry_init, sampled):
 def test_transaction_dropeed_sampled_false(sentry_init):
     sentry_init(enable_tracing=True)
 
-    tx = Transaction(sampled=False)
+    with pytest.warns(DeprecationWarning):
+        tx = Transaction(sampled=False)
 
     with mock.patch("sentry_sdk.tracing.logger") as mock_logger:
         with sentry_sdk.start_transaction(tx):

tests/tracing/test_sampling.py

@@ -28,13 +28,14 @@ def test_sampling_decided_only_for_transactions(sentry_init, capture_events):
 def test_nested_transaction_sampling_override(sentry_init, sampled):
     sentry_init(traces_sample_rate=1.0)
 
-    with start_transaction(name="outer", sampled=sampled) as outer_transaction:
-        assert outer_transaction.sampled is sampled
-        with start_transaction(
-            name="inner", sampled=(not sampled)
-        ) as inner_transaction:
-            assert inner_transaction.sampled is not sampled
-        assert outer_transaction.sampled is sampled
+    with pytest.warns(DeprecationWarning):
+        with start_transaction(name="outer", sampled=sampled) as outer_transaction:
+            assert outer_transaction.sampled is sampled
+            with start_transaction(
+                name="inner", sampled=(not sampled)
+            ) as inner_transaction:
+                assert inner_transaction.sampled is not sampled
+            assert outer_transaction.sampled is sampled
 
 
 def test_no_double_sampling(sentry_init, capture_events):
@@ -55,12 +56,13 @@ def test_get_transaction_and_span_from_scope_regardless_of_sampling_decision(
 ):
     sentry_init(traces_sample_rate=1.0)
 
-    with start_transaction(name="/", sampled=sampling_decision):
-        with start_span(op="child-span"):
-            with start_span(op="child-child-span"):
-                scope = sentry_sdk.get_current_scope()
-                assert scope.span.op == "child-child-span"
-                assert scope.transaction.name == "/"
+    with pytest.warns(DeprecationWarning):
+        with start_transaction(name="/", sampled=sampling_decision):
+            with start_span(op="child-span"):
+                with start_span(op="child-child-span"):
+                    scope = sentry_sdk.get_current_scope()
+                    assert scope.span.op == "child-child-span"
+                    assert scope.transaction.name == "/"
 
 
 @pytest.mark.parametrize(
@@ -163,8 +165,9 @@ def test_traces_sampler_doesnt_overwrite_explicitly_passed_sampling_decision(
     traces_sampler = mock.Mock(return_value=not explicit_decision)
     sentry_init(traces_sampler=traces_sampler)
 
-    transaction = start_transaction(name="dogpark", sampled=explicit_decision)
-    assert transaction.sampled is explicit_decision
+    with pytest.warns(DeprecationWarning):
+        transaction = start_transaction(name="dogpark", sampled=explicit_decision)
+        assert transaction.sampled is explicit_decision
 
 
 @pytest.mark.parametrize("parent_sampling_decision", [True, False])