Merge branch 'master' into szokeasaurusrex/recursion-depth

Author: antonpirker

sentry_sdk/integrations/dramatiq.py

@@ -95,7 +95,7 @@ def before_process_message(self, broker, message):
         message._scope_manager.__enter__()
 
         scope = sentry_sdk.get_current_scope()
-        scope.transaction = message.actor_name
+        scope.set_transaction_name(message.actor_name)
         scope.set_extra("dramatiq_message_id", message.message_id)
         scope.add_event_processor(_make_message_event_processor(message, integration))
 

sentry_sdk/scope.py

@@ -794,6 +794,11 @@ def set_transaction_name(self, name, source=None):
     def user(self, value):
         # type: (Optional[Dict[str, Any]]) -> None
         """When set a specific user is bound to the scope. Deprecated in favor of set_user."""
+        warnings.warn(
+            "The `Scope.user` setter is deprecated in favor of `Scope.set_user()`.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
         self.set_user(value)
 
     def set_user(self, value):

tests/test_utils.py

@@ -7,6 +7,7 @@
 import pytest
 
 import sentry_sdk
+from sentry_sdk._compat import PY38
 from sentry_sdk.integrations import Integration
 from sentry_sdk._queue import Queue
 from sentry_sdk.utils import (
@@ -901,6 +902,7 @@ def target():
     assert (main_thread.ident, main_thread.name) == results.get(timeout=1)
 
 
+@pytest.mark.skipif(PY38, reason="Flakes a lot on 3.8 in CI.")
 def test_get_current_thread_meta_failed_to_get_main_thread():
     results = Queue(maxsize=1)