Merge branch 'main' into fix-ruff-lint

Author: TimPansino

.github/workflows/mega-linter.yml

@@ -41,7 +41,7 @@ jobs:
         id: ml
         # You can override MegaLinter flavor used to have faster performances
         # More info at https://megalinter.io/flavors/
-        uses: oxsecurity/megalinter/flavors/python@ec124f7998718d79379a3c5b39f5359952baf21d # 8.4.2
+        uses: oxsecurity/megalinter/flavors/python@146333030da68e2e58c6ff826633824fabe01eaf # 8.5.0
         env:
           # All available variables are described in documentation
           # https://megalinter.io/configuration/

.mega-linter.yml

@@ -19,6 +19,7 @@ ENABLE_LINTERS: # If you use ENABLE_LINTERS variable, all other linters will be
   - YAML_V8R
   - YAML_YAMLLINT
 
+PYTHON_DEFAULT_STYLE: ruff
 PYTHON_RUFF_CONFIG_FILE: pyproject.toml
 PYTHON_RUFF_FORMAT_CONFIG_FILE: pyproject.toml
 MARKDOWN_MARKDOWN_LINK_CHECK_FILTER_REGEX_EXCLUDE: "tests/.*"

newrelic/config.py

@@ -3983,7 +3983,9 @@ def _process_module_builtin_defaults():
     )
     _process_module_definition("gearman.worker", "newrelic.hooks.application_gearman", "instrument_gearman_worker")
 
-    _process_module_definition("aiobotocore.client", "newrelic.hooks.external_aiobotocore", "instrument_aiobotocore_client")
+    _process_module_definition(
+        "aiobotocore.client", "newrelic.hooks.external_aiobotocore", "instrument_aiobotocore_client"
+    )
 
     _process_module_definition(
         "aiobotocore.endpoint", "newrelic.hooks.external_aiobotocore", "instrument_aiobotocore_endpoint"

newrelic/hooks/external_aiobotocore.py

@@ -1,4 +1,3 @@
-
 # Copyright 2010 New Relic, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

newrelic/hooks/external_botocore.py

@@ -137,9 +137,9 @@ def extract_firehose_agent_attrs(instance, *args, **kwargs):
                 region = instance._client_config.region_name
             if account_id and region:
                 agent_attrs["cloud.platform"] = "aws_kinesis_delivery_streams"
-                agent_attrs[
-                    "cloud.resource_id"
-                ] = f"arn:aws:firehose:{region}:{account_id}:deliverystream/{stream_name}"
+                agent_attrs["cloud.resource_id"] = (
+                    f"arn:aws:firehose:{region}:{account_id}:deliverystream/{stream_name}"
+                )
     except Exception as e:
         _logger.debug("Failed to capture AWS Kinesis Delivery Stream (Firehose) info.", exc_info=True)
     return agent_attrs
@@ -497,18 +497,8 @@ def extract_bedrock_cohere_model_streaming_response(response_body, bedrock_attrs
 
 NULL_EXTRACTOR = lambda *args: {}  # Empty extractor that returns nothing
 MODEL_EXTRACTORS = [  # Order is important here, avoiding dictionaries
-    (
-        "amazon.titan-embed",
-        extract_bedrock_titan_embedding_model_request,
-        NULL_EXTRACTOR,
-        NULL_EXTRACTOR,
-    ),
-    (
-        "cohere.embed",
-        extract_bedrock_cohere_embedding_model_request,
-        NULL_EXTRACTOR,
-        NULL_EXTRACTOR,
-    ),
+    ("amazon.titan-embed", extract_bedrock_titan_embedding_model_request, NULL_EXTRACTOR, NULL_EXTRACTOR),
+    ("cohere.embed", extract_bedrock_cohere_embedding_model_request, NULL_EXTRACTOR, NULL_EXTRACTOR),
     (
         "amazon.titan",
         extract_bedrock_titan_text_model_request,
@@ -547,11 +537,7 @@ def handle_bedrock_exception(
     exc, is_embedding, model, span_id, trace_id, request_extractor, request_body, ft, transaction
 ):
     try:
-        bedrock_attrs = {
-            "model": model,
-            "span_id": span_id,
-            "trace_id": trace_id,
-        }
+        bedrock_attrs = {"model": model, "span_id": span_id, "trace_id": trace_id}
         try:
             request_extractor(request_body, bedrock_attrs)
         except json.decoder.JSONDecodeError:
@@ -572,9 +558,7 @@ def handle_bedrock_exception(
             notice_error_attributes.update({"completion_id": str(uuid.uuid4())})
 
         if ft:
-            ft.notice_error(
-                attributes=notice_error_attributes,
-            )
+            ft.notice_error(attributes=notice_error_attributes)
 
             ft.__exit__(*sys.exc_info())
             error_attributes["duration"] = ft.duration * 1000
@@ -866,9 +850,7 @@ def record_error(self, transaction, exc):
             }
             notice_error_attributes.update({"completion_id": str(uuid.uuid4())})
 
-            ft.notice_error(
-                attributes=notice_error_attributes,
-            )
+            ft.notice_error(attributes=notice_error_attributes)
 
             ft.__exit__(*sys.exc_info())
             error_attributes["duration"] = ft.duration * 1000
@@ -983,13 +965,7 @@ def handle_chat_completion_event(transaction, bedrock_attrs):
 
 
 def dynamodb_datastore_trace(
-    product,
-    target,
-    operation,
-    host=None,
-    port_path_or_id=None,
-    database_name=None,
-    async_wrapper=None,
+    product, target, operation, host=None, port_path_or_id=None, database_name=None, async_wrapper=None
 ):
     @function_wrapper
     def _nr_dynamodb_datastore_trace_wrapper_(wrapped, instance, args, kwargs):
@@ -1076,9 +1052,9 @@ def _nr_dynamodb_datastore_trace_wrapper_(wrapped, instance, args, kwargs):
                     partition = "aws-us-gov"
 
             if partition and region and account_id and _target:
-                agent_attrs[
-                    "cloud.resource_id"
-                ] = f"arn:{partition}:dynamodb:{region}:{account_id:012d}:table/{_target}"
+                agent_attrs["cloud.resource_id"] = (
+                    f"arn:{partition}:dynamodb:{region}:{account_id:012d}:table/{_target}"
+                )
                 agent_attrs["db.system"] = "DynamoDB"
 
         except Exception as e:
@@ -1119,14 +1095,7 @@ def _nr_aws_function_trace_wrapper_(wrapped, instance, args, kwargs):
         _destination_name = destination_name(*args, **kwargs) if destination_name is not None else None
         name = f"{operation}/{_destination_name}" if _destination_name else operation
 
-        trace = FunctionTrace(
-            name=name,
-            group=library,
-            params=params,
-            terminal=terminal,
-            parent=parent,
-            source=wrapped,
-        )
+        trace = FunctionTrace(name=name, group=library, params=params, terminal=terminal, parent=parent, source=wrapped)
 
         # Attach extracted agent attributes.
         _agent_attrs = extract_agent_attrs(instance, *args, **kwargs) if extract_agent_attrs is not None else {}

tests/datastore_aiomysql/test_sqlalchemy.py

@@ -56,7 +56,6 @@ async def exercise(engine):
             cursor = await conn.execute(ABCTable.select())
 
             rows = [row async for row in cursor]
-
             assert rows == input_rows, f"Expected: {input_rows}, Got: {rows}"
 
             await conn.execute(ABCTable.update().where(ABCTable.columns.a == 1).values((4, 4.0, "4.0")))