Merge branch 'potel-base' into potel-base-run-all-tests

Author: sl0thentr0py

sentry_sdk/integrations/arq.py

@@ -104,7 +104,8 @@ async def _sentry_run_job(self, job_id, score):
         with sentry_sdk.isolation_scope() as scope:
             scope._name = "arq"
             scope.set_transaction_name(
-                DEFAULT_TRANSACTION_NAME, source=TRANSACTION_SOURCE_TASK,
+                DEFAULT_TRANSACTION_NAME,
+                source=TRANSACTION_SOURCE_TASK,
             )
             scope.clear_breadcrumbs()
 

sentry_sdk/integrations/rq.py

@@ -32,6 +32,8 @@
 
     from rq.job import Job
 
+DEFAULT_TRANSACTION_NAME = "unknown RQ task"
+
 
 class RqIntegration(Integration):
     identifier = "rq"
@@ -55,22 +57,27 @@ def setup_once():
         def sentry_patched_perform_job(self, job, *args, **kwargs):
             # type: (Any, Job, *Queue, **Any) -> bool
             with sentry_sdk.new_scope() as scope:
+                try:
+                    transaction_name = job.func_name or DEFAULT_TRANSACTION_NAME
+                except AttributeError:
+                    transaction_name = DEFAULT_TRANSACTION_NAME
+
+                scope.set_transaction_name(
+                    transaction_name, source=TRANSACTION_SOURCE_TASK
+                )
                 scope.clear_breadcrumbs()
                 scope.add_event_processor(_make_event_processor(weakref.ref(job)))
 
                 with sentry_sdk.continue_trace(
                     job.meta.get("_sentry_trace_headers") or {}
                 ):
-                    with sentry_sdk.start_transaction(
+                    with sentry_sdk.start_span(
                         op=OP.QUEUE_TASK_RQ,
-                        name="unknown RQ task",
+                        name=transaction_name,
                         source=TRANSACTION_SOURCE_TASK,
                         origin=RqIntegration.origin,
                         custom_sampling_context={"rq_job": job},
-                    ) as transaction:
-                        with capture_internal_exceptions():
-                            transaction.name = job.func_name
-
+                    ):
                         rv = old_perform_job(self, job, *args, **kwargs)
 
             if self.is_horse:

tests/integrations/django/test_basic.py

@@ -415,7 +415,7 @@ def test_sql_dict_query_params(sentry_init, capture_events):
     assert crumb["message"] == (
         "SELECT count(*) FROM people_person WHERE foo = %(my_foo)s"
     )
-    assert crumb["data"]["db.params"] == '{"my_foo": 10}'
+    assert crumb["data"]["db.params"] == {"my_foo": 10}
 
 
 @pytest.mark.forked
@@ -477,7 +477,7 @@ def test_sql_psycopg2_string_composition(sentry_init, capture_events, query):
     (event,) = events
     crumb = event["breadcrumbs"]["values"][-1]
     assert crumb["message"] == ('SELECT %(my_param)s FROM "foobar"')
-    assert crumb["data"]["db.params"] == '{"my_param": 10}'
+    assert crumb["data"]["db.params"] == {"my_param": 10}
 
 
 @pytest.mark.forked
@@ -530,7 +530,7 @@ def test_sql_psycopg2_placeholders(sentry_init, capture_events):
         {
             "category": "query",
             "data": {
-                "db.params": '{"first_var": "fizz", "second_var": "not a date"}',
+                "db.params": {"first_var": "fizz", "second_var": "not a date"},
                 "db.paramstyle": "format",
             },
             "message": 'insert into my_test_table ("foo", "bar") values (%(first_var)s, '

tests/integrations/opentelemetry/test_utils.py

@@ -334,9 +334,7 @@ def test_span_data_for_db_query():
         ),
         (
             SpanKind.SERVER,
-            Status(
-                StatusCode.ERROR, "I'm a teapot"
-            ),
+            Status(StatusCode.ERROR, "I'm a teapot"),
             {
                 "http.method": "POST",
                 "http.route": "/some/route",

tests/integrations/rq/test_rq.py

@@ -5,7 +5,6 @@
 from fakeredis import FakeStrictRedis
 
 import sentry_sdk
-from sentry_sdk import start_transaction
 from sentry_sdk.integrations.rq import RqIntegration
 from sentry_sdk.utils import parse_version
 
@@ -46,6 +45,7 @@ def do_trick(dog, trick):
     return "{}, can you {}? Good dog!".format(dog, trick)
 
 
+@pytest.mark.forked
 def test_basic(sentry_init, capture_events):
     sentry_init(integrations=[RqIntegration()])
     events = capture_events()
@@ -78,6 +78,7 @@ def test_basic(sentry_init, capture_events):
         assert "started_at" in extra
 
 
+@pytest.mark.forked
 def test_transport_shutdown(sentry_init, capture_events_forksafe):
     sentry_init(integrations=[RqIntegration()])
 
@@ -96,6 +97,7 @@ def test_transport_shutdown(sentry_init, capture_events_forksafe):
     assert exception["type"] == "ZeroDivisionError"
 
 
+@pytest.mark.forked
 def test_transaction_with_error(
     sentry_init, capture_events, DictionaryContaining  # noqa:N803
 ):
@@ -131,6 +133,7 @@ def test_transaction_with_error(
     )
 
 
+@pytest.mark.forked
 def test_error_has_trace_context_if_tracing_disabled(
     sentry_init,
     capture_events,
@@ -149,6 +152,7 @@ def test_error_has_trace_context_if_tracing_disabled(
     assert error_event["contexts"]["trace"]
 
 
+@pytest.mark.forked
 def test_tracing_enabled(
     sentry_init,
     capture_events,
@@ -159,18 +163,17 @@ def test_tracing_enabled(
     queue = rq.Queue(connection=FakeStrictRedis())
     worker = rq.SimpleWorker([queue], connection=queue.connection)
 
-    with start_transaction(op="rq transaction") as transaction:
-        queue.enqueue(crashing_job, foo=None)
-        worker.work(burst=True)
+    queue.enqueue(crashing_job, foo=None)
+    worker.work(burst=True)
 
-    error_event, envelope, _ = events
+    error_event, transaction = events
 
     assert error_event["transaction"] == "tests.integrations.rq.test_rq.crashing_job"
-    assert error_event["contexts"]["trace"]["trace_id"] == transaction.trace_id
-
-    assert envelope["contexts"]["trace"] == error_event["contexts"]["trace"]
+    assert transaction["transaction"] == "tests.integrations.rq.test_rq.crashing_job"
+    assert transaction["contexts"]["trace"] == error_event["contexts"]["trace"]
 
 
+@pytest.mark.forked
 def test_tracing_disabled(
     sentry_init,
     capture_events,
@@ -251,6 +254,7 @@ def test_traces_sampler_gets_correct_values_in_sampling_context(
     )
 
 
+@pytest.mark.forked
 @pytest.mark.skipif(
     parse_version(rq.__version__) < (1, 5), reason="At least rq-1.5 required"
 )