Fix transaction name setting and forked some tests to make them work in potel

Author: antonpirker

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/rq/test_rq.py

@@ -46,6 +46,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 +79,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 +98,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 +134,7 @@ def test_transaction_with_error(
     )
 
 
+@pytest.mark.forked
 def test_error_has_trace_context_if_tracing_disabled(
     sentry_init,
     capture_events,
@@ -149,6 +153,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,
@@ -171,6 +176,7 @@ def test_tracing_enabled(
     assert envelope["contexts"]["trace"] == error_event["contexts"]["trace"]
 
 
+@pytest.mark.forked
 def test_tracing_disabled(
     sentry_init,
     capture_events,
@@ -251,6 +257,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"
 )