MegaLinter Format

Author: TimPansino

newrelic/hooks/application_celery.py

@@ -63,9 +63,11 @@ def task_info(instance, *args, **kwargs):
 
     return task_name, task_source
 
+
 # =============
 # Celery instrumentation for direct task calls (__call__ or run)
 
+
 def CeleryTaskWrapper(wrapped):
     def wrapper(wrapped, instance, args, kwargs):
         transaction = current_transaction(active_only=False)
@@ -180,11 +182,13 @@ def instrument_celery_local(module):
         # using `delay` or `apply_async`)
         module.Proxy.__call__ = CeleryTaskWrapper(module.Proxy.__call__)
 
+
 # =============
 
 # =============
 # Celery Instrumentation for delay/apply_async/apply:
 
+
 def wrap_task_call(wrapped, instance, args, kwargs):
     transaction = current_transaction(active_only=False)
 

tests/application_celery/_target_application.py

@@ -53,6 +53,7 @@ def __call__(self, *args, **kwargs):
             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()
@@ -68,4 +69,4 @@ def add_with_super(x, y):
 
 @app.task(base=CustomCeleryTaskWithRun)
 def add_with_run(x, y):
-    return x + y
+    return x + y

tests/application_celery/conftest.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import pytest
-from celery.app.trace import setup_worker_optimizations, reset_worker_optimizations
+from celery.app.trace import reset_worker_optimizations, setup_worker_optimizations
 from testing_support.fixtures import collector_agent_registration_fixture, collector_available_fixture
 
 _default_settings = {
@@ -29,6 +29,7 @@
     app_name="Python Agent Test (application_celery)", default_settings=_default_settings
 )
 
+
 @pytest.fixture(scope="session")
 def celery_config():
     # Used by celery pytest plugin to configure Celery instance

tests/application_celery/test_distributed_tracing.py

@@ -74,17 +74,14 @@ def _test():
 
     _test()
 
+
 @pytest.mark.parametrize("dt_enabled", [True, False])
 def test_DT_inside_transaction_apply(dt_enabled):
     @override_application_settings({"distributed_tracing.enabled": dt_enabled})
     @validate_transaction_metrics(
         name="test_distributed_tracing:test_DT_inside_transaction_apply.<locals>._test",
-        rollup_metrics=[
-            ("Function/_target_application.add", 1),
-        ],
-        scoped_metrics=[
-            ("Function/_target_application.add", 1),
-        ],
+        rollup_metrics=[("Function/_target_application.add", 1)],
+        scoped_metrics=[("Function/_target_application.add", 1)],
         background_task=True,
     )
     @validate_transaction_count(1)  # In the same process, so only one transaction
@@ -107,9 +104,7 @@ def test_DT_inside_transaction_apply_with_added_headers(dt_enabled):
             ("Supportability/TraceContext/Create/Success", 1 if dt_enabled else None),
             ("Supportability/DistributedTrace/CreatePayload/Success", 1 if dt_enabled else None),
         ],
-        scoped_metrics=[
-            ("Function/_target_application.add", 1),
-        ],
+        scoped_metrics=[("Function/_target_application.add", 1)],
         background_task=True,
     )
     @validate_transaction_count(1)  # In the same process, so only one transaction
@@ -150,12 +145,8 @@ def test_DT_inside_transaction__call__(dt_enabled):
     @override_application_settings({"distributed_tracing.enabled": dt_enabled})
     @validate_transaction_metrics(
         name="test_distributed_tracing:test_DT_inside_transaction__call__.<locals>._test",
-        rollup_metrics=[
-            ("Function/_target_application.add", 1),
-        ],
-        scoped_metrics=[
-            ("Function/_target_application.add", 1),
-        ],
+        rollup_metrics=[("Function/_target_application.add", 1)],
+        scoped_metrics=[("Function/_target_application.add", 1)],
         background_task=True,
     )
     @validate_transaction_count(1)  # In the same process, so only one transaction
@@ -165,16 +156,12 @@ def _test():
         assert result == 3
 
     _test()
-    
-    
+
+
 @pytest.mark.parametrize("dt_enabled", [True, False])
 def test_DT_outside_transaction__call__(dt_enabled):
     @override_application_settings({"distributed_tracing.enabled": dt_enabled})
-    @validate_transaction_metrics(
-        name="_target_application.add",
-        group="Celery",
-        background_task=True,
-    )
+    @validate_transaction_metrics(name="_target_application.add", group="Celery", background_task=True)
     @validate_transaction_count(1)  # In the same process, so only one transaction
     def _test():
         result = add(1, 2)

tests/application_celery/test_task_methods.py

@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from celery import chain, group, chord
-from _target_application import add, tsum, add_with_super, add_with_run
+from _target_application import add, add_with_run, add_with_super, tsum
+from celery import chain, chord, group
 from testing_support.validators.validate_code_level_metrics import validate_code_level_metrics
 from testing_support.validators.validate_custom_parameters import validate_custom_parameters
 from testing_support.validators.validate_transaction_count import validate_transaction_count
 from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
-from testing_support.validators.validate_custom_parameters import validate_custom_parameters
+
 from newrelic.api.background_task import background_task
 
 
@@ -311,9 +311,7 @@ def test_celery_task_chunks():
     assert result == [[7], [3]]
 
 
-@validate_custom_parameters(
-    required_params=[("custom_task_attribute", "Called with super")],
-)
+@validate_custom_parameters(required_params=[("custom_task_attribute", "Called with super")])
 @validate_transaction_metrics(
     name="_target_application.add_with_super",
     group="Celery",
@@ -331,9 +329,7 @@ def test_celery_task_call_custom_super():
     assert result == 7
 
 
-@validate_custom_parameters(
-    required_params=[("custom_task_attribute", "Called with super")],
-)
+@validate_custom_parameters(required_params=[("custom_task_attribute", "Called with super")])
 @validate_transaction_metrics(
     name="_target_application.add_with_super",
     group="Celery",
@@ -352,9 +348,7 @@ def test_celery_task_apply_custom_super():
     assert result == 7
 
 
-@validate_custom_parameters(
-    required_params=[("custom_task_attribute", "Called with super")],
-)
+@validate_custom_parameters(required_params=[("custom_task_attribute", "Called with super")])
 @validate_transaction_metrics(
     name="_target_application.add_with_super",
     group="Celery",
@@ -373,9 +367,7 @@ def test_celery_task_delay_custom_super():
     assert result == 7
 
 
-@validate_custom_parameters(
-    required_params=[("custom_task_attribute", "Called with super")],
-)
+@validate_custom_parameters(required_params=[("custom_task_attribute", "Called with super")])
 @validate_transaction_metrics(
     name="_target_application.add_with_super",
     group="Celery",
@@ -394,9 +386,7 @@ def test_celery_task_apply_async_custom_super():
     assert result == 7
 
 
-@validate_custom_parameters(
-    required_params=[("custom_task_attribute", "Called with run")],
-)
+@validate_custom_parameters(required_params=[("custom_task_attribute", "Called with run")])
 @validate_transaction_metrics(
     name="_target_application.add_with_run",
     group="Celery",
@@ -414,9 +404,7 @@ def test_celery_task_call_custom_run():
     assert result == 7
 
 
-@validate_custom_parameters(
-    required_params=[("custom_task_attribute", "Called with run")],
-)
+@validate_custom_parameters(required_params=[("custom_task_attribute", "Called with run")])
 @validate_transaction_metrics(
     name="_target_application.add_with_run",
     group="Celery",
@@ -435,9 +423,7 @@ def test_celery_task_apply_custom_run():
     assert result == 7
 
 
-@validate_custom_parameters(
-    required_params=[("custom_task_attribute", "Called with run")],
-)
+@validate_custom_parameters(required_params=[("custom_task_attribute", "Called with run")])
 @validate_transaction_metrics(
     name="_target_application.add_with_run",
     group="Celery",
@@ -456,9 +442,7 @@ def test_celery_task_delay_custom_run():
     assert result == 7
 
 
-@validate_custom_parameters(
-    required_params=[("custom_task_attribute", "Called with run")],
-)
+@validate_custom_parameters(required_params=[("custom_task_attribute", "Called with run")])
 @validate_transaction_metrics(
     name="_target_application.add_with_run",
     group="Celery",
@@ -502,7 +486,7 @@ def test_celery_task_different_processes():
     result = add_with_run.delay(3, 4)
     result = result.get()
     assert result == 7
-    
+
     result = add.apply((3, 4))
     result = result.get()
     assert result == 7
@@ -544,8 +528,7 @@ def test_celery_task_in_transaction_different_processes():
     result = add_with_run.delay(3, 4)
     result = result.get()
     assert result == 7
-    
+
     result = add.apply((3, 4))
     result = result.get()
     assert result == 7
-

tests/application_celery/test_wrappers.py

@@ -13,10 +13,11 @@
 # limitations under the License.
 
 from _target_application import add, add_with_super
-from celery.app.trace import setup_worker_optimizations, reset_worker_optimizations
+from celery.app.trace import reset_worker_optimizations, setup_worker_optimizations
 
 from newrelic.common.object_wrapper import _NRBoundFunctionWrapper
 
+
 def test_worker_optimizations_preserve_instrumentation(celery_worker_available):
     """
     Tests that worker optimizations do not remove New Relic instrumentation.
@@ -41,7 +42,7 @@ def test_worker_optimizations_preserve_instrumentation(celery_worker_available):
 
     reset_worker_optimizations()
     assert is_instrumented(), "reset_worker_optimizations removed instrumentation."
-    
+
 
 def test_task_wrapping_detection():
     """