Ruff format

Author: TimPansino

newrelic/hooks/application_celery.py

@@ -28,13 +28,14 @@
 from newrelic.api.message_trace import MessageTrace
 from newrelic.api.pre_function import wrap_pre_function
 from newrelic.api.transaction import current_transaction
-from newrelic.common.object_wrapper import FunctionWrapper, _NRBoundFunctionWrapper, wrap_function_wrapper
+from newrelic.common.object_wrapper import FunctionWrapper, wrap_function_wrapper
 from newrelic.common.signature import bind_args
 from newrelic.core.agent import shutdown_agent
 
 UNKNOWN_TASK_NAME = "<Unknown Task>"
 MAPPING_TASK_NAMES = {"celery.starmap", "celery.map"}
 
+
 def task_info(instance, *args, **kwargs):
     # Grab the current task, which can be located in either place
     if instance:
@@ -129,22 +130,22 @@ def wrap_task_call(wrapped, instance, args, kwargs):
             except Exception:
                 pass
 
-            return wrapped(*args, **kwargs) 
+            return wrapped(*args, **kwargs)
 
 
 def wrap_build_tracer(wrapped, instance, args, kwargs):
     class TaskWrapper(FunctionWrapper):
         def run(self, *args, **kwargs):
             return self.__call__(*args, **kwargs)
-        
+
     try:
         bound_args = bind_args(wrapped, args, kwargs)
         task = bound_args.get("task", None)
 
         task = TaskWrapper(task, wrap_task_call)
         task.__module__ = wrapped.__module__  # Ensure module is set for monkeypatching detection
         bound_args["task"] = task
-            
+
         return wrapped(**bound_args)
     except:
         # If we can't bind the args, we just call the wrapped function
@@ -259,15 +260,15 @@ def run(self, *args, **kwargs):
 
 def instrument_celery_local(module):
     if hasattr(module, "Proxy"):
-        # This is used in the case where the function is 
-        # called directly on the Proxy object (rather than 
+        # This is used in the case where the function is
+        # called directly on the Proxy object (rather than
         # using "delay" or "apply_async")
         module.Proxy.__call__ = CeleryTaskWrapper(module.Proxy.__call__)
 
 
 def instrument_celery_worker(module):
     if hasattr(module, "process_initializer"):
-        # We try and force activation of the agent before 
+        # We try and force activation of the agent before
         # the worker process starts.
         _process_initializer = module.process_initializer
 
@@ -277,8 +278,7 @@ def process_initializer(*args, **kwargs):
             return _process_initializer(*args, **kwargs)
 
         module.process_initializer = process_initializer
-        
-    
+
     if hasattr(module, "process_destructor"):
         # We try and force shutdown of the agent before
         # the worker process exits.
@@ -305,10 +305,8 @@ def force_agent_shutdown(*args, **kwargs):
 
     if hasattr(module, "Worker") and hasattr(module.Worker, "_do_exit"):
         wrap_pre_function(module, "Worker._do_exit", force_agent_shutdown)
-    
+
 
 def instrument_celery_app_trace(module):
     if hasattr(module, "build_tracer"):
         wrap_function_wrapper(module, "build_tracer", wrap_build_tracer)
-        
-

tests/application_celery/_target_application.py

@@ -25,13 +25,15 @@
     broker_heartbeat=0,
 )
 
+
 class CustomCeleryTaskWithSuper(Task):
     def __call__(self, *args, **kwargs):
         transaction = current_transaction()
         if transaction:
             transaction.add_custom_attribute("custom_task_attribute", "Called with super")
         return super().__call__(*args, **kwargs)
 
+
 class CustomCeleryTaskWithRun(Task):
     def __call__(self, *args, **kwargs):
         transaction = current_transaction()

tests/application_celery/test_distributed_tracing.py

@@ -42,16 +42,17 @@ def test_celery_task_distributed_tracing_inside_background_task(dt_enabled):
         ],
         background_task=True,
     )
-    @validate_transaction_count(2)  # One for the background task, one for the Celery task.  Runs in different processes.
+    @validate_transaction_count(2)
+    # One for the background task, one for the Celery task.  Runs in different processes.
     @background_task()
     def _test():
         result = add.apply_async((1, 2))
         result = result.get()
         assert result == 3
 
     _test()
-    
-    
+
+
 @pytest.mark.parametrize("dt_enabled", [True, False])
 def test_celery_task_distributed_tracing_outside_background_task(dt_enabled):
     @override_application_settings({"distributed_tracing.enabled": dt_enabled})
@@ -71,10 +72,10 @@ def _test():
         assert result == 3
 
     _test()
-    
 
-# In this case, the background task creating the transaction 
-# has not generated a distributed trace header, so the Celery 
+
+# In this case, the background task creating the transaction
+# has not generated a distributed trace header, so the Celery
 # task will not have a distributed trace header to accept.
 @pytest.mark.parametrize("dt_enabled", [True, False])
 def test_celery_task_distributed_tracing_inside_background_task_apply(dt_enabled):
@@ -91,8 +92,8 @@ def _test():
         assert result == 3
 
     _test()
-    
-    
+
+
 @pytest.mark.parametrize("dt_enabled", [True, False])
 def test_celery_task_distributed_tracing_outside_background_task_apply(dt_enabled):
     @override_application_settings({"distributed_tracing.enabled": dt_enabled})
@@ -111,4 +112,4 @@ def _test():
         result = result.get()
         assert result == 3
 
-    _test()
+    _test()