Better naming (#1962)

Author: antonpirker

sentry_sdk/tracing_utils_py2.py

@@ -26,17 +26,17 @@ def start_child_span_decorator(func):
     def func_with_tracing(*args, **kwargs):
         # type: (*Any, **Any) -> Any
 
-        span_or_trx = get_current_span(sentry_sdk.Hub.current)
+        span = get_current_span(sentry_sdk.Hub.current)
 
-        if span_or_trx is None:
+        if span is None:
             logger.warning(
-                "No transaction found. Not creating a child span for %s. "
+                "Can not create a child span for %s. "
                 "Please start a Sentry transaction before calling this function.",
                 qualname_from_function(func),
             )
             return func(*args, **kwargs)
 
-        with span_or_trx.start_child(
+        with span.start_child(
             op=OP.FUNCTION,
             description=qualname_from_function(func),
         ):

sentry_sdk/tracing_utils_py3.py

@@ -30,17 +30,17 @@ def start_child_span_decorator(func):
         async def func_with_tracing(*args, **kwargs):
             # type: (*Any, **Any) -> Any
 
-            span_or_trx = get_current_span(sentry_sdk.Hub.current)
+            span = get_current_span(sentry_sdk.Hub.current)
 
-            if span_or_trx is None:
+            if span is None:
                 logger.warning(
-                    "No transaction found. Not creating a child span for %s. "
+                    "Can not create a child span for %s. "
                     "Please start a Sentry transaction before calling this function.",
                     qualname_from_function(func),
                 )
                 return await func(*args, **kwargs)
 
-            with span_or_trx.start_child(
+            with span.start_child(
                 op=OP.FUNCTION,
                 description=qualname_from_function(func),
             ):
@@ -53,17 +53,17 @@ async def func_with_tracing(*args, **kwargs):
         def func_with_tracing(*args, **kwargs):
             # type: (*Any, **Any) -> Any
 
-            span_or_trx = get_current_span(sentry_sdk.Hub.current)
+            span = get_current_span(sentry_sdk.Hub.current)
 
-            if span_or_trx is None:
+            if span is None:
                 logger.warning(
-                    "No transaction found. Not creating a child span for %s. "
+                    "Can not create a child span for %s. "
                     "Please start a Sentry transaction before calling this function.",
                     qualname_from_function(func),
                 )
                 return func(*args, **kwargs)
 
-            with span_or_trx.start_child(
+            with span.start_child(
                 op=OP.FUNCTION,
                 description=qualname_from_function(func),
             ):

tests/tracing/test_decorator_py2.py

@@ -44,7 +44,8 @@ def test_trace_decorator_py2_no_trx():
 
             result2 = start_child_span_decorator_py2(my_example_function)()
             fake_warning.assert_called_once_with(
-                "No transaction found. Not creating a child span for %s. Please start a Sentry transaction before calling this function.",
+                "Can not create a child span for %s. "
+                "Please start a Sentry transaction before calling this function.",
                 "test_decorator_py2.my_example_function",
             )
             assert result2 == "return_of_sync_function"

tests/tracing/test_decorator_py3.py

@@ -53,7 +53,8 @@ def test_trace_decorator_sync_py3_no_trx():
 
             result2 = start_child_span_decorator_py3(my_example_function)()
             fake_warning.assert_called_once_with(
-                "No transaction found. Not creating a child span for %s. Please start a Sentry transaction before calling this function.",
+                "Can not create a child span for %s. "
+                "Please start a Sentry transaction before calling this function.",
                 "test_decorator_py3.my_example_function",
             )
             assert result2 == "return_of_sync_function"
@@ -95,7 +96,8 @@ async def test_trace_decorator_async_py3_no_trx():
 
             result2 = await start_child_span_decorator_py3(my_async_example_function)()
             fake_warning.assert_called_once_with(
-                "No transaction found. Not creating a child span for %s. Please start a Sentry transaction before calling this function.",
+                "Can not create a child span for %s. "
+                "Please start a Sentry transaction before calling this function.",
                 "test_decorator_py3.my_async_example_function",
             )
             assert result2 == "return_of_async_function"