Merge branch 'main' into fix-linter-pyteststyle

mergify[bot] · web-flow · commit 7e6dda824386 · 2025-05-23T22:23:53.000Z
diff --git a/newrelic/admin/record_deploy.py b/newrelic/admin/record_deploy.py
@@ -16,7 +16,7 @@
 import pwd
 
 from newrelic.admin import command, usage
-from newrelic.common import agent_http, certs, encoding_utils
+from newrelic.common import agent_http, encoding_utils
 from newrelic.config import initialize
 from newrelic.core.config import global_settings
 
diff --git a/newrelic/admin/run_python.py b/newrelic/admin/run_python.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from newrelic.admin import command, usage
+from newrelic.admin import command
 
 
 @command(
@@ -62,7 +62,6 @@ def log_message(text, *args):
             log_message("%s = %r", name, os.environ.get(name))
 
     from newrelic import __file__ as root_directory
-    from newrelic import version
 
     root_directory = os.path.dirname(root_directory)
     boot_directory = os.path.join(root_directory, "bootstrap")
diff --git a/newrelic/api/in_function.py b/newrelic/api/in_function.py
@@ -14,4 +14,4 @@
 
 # Use of these from this module will be deprecated.
 
-from newrelic.common.object_wrapper import InFunctionWrapper, in_function, wrap_in_function
+from newrelic.common.object_wrapper import InFunctionWrapper, in_function, wrap_in_function  # noqa: F401
diff --git a/newrelic/api/object_wrapper.py b/newrelic/api/object_wrapper.py
@@ -12,13 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
 # These have been moved. They are retained here until all references to
 # them are moved at which point will mark as deprecated to ensure users
 # weren't using them directly.
-from newrelic.common.object_names import callable_name
-from newrelic.common.object_wrapper import ObjectWrapper, wrap_object
+from newrelic.common.object_names import callable_name  # noqa: F401
+from newrelic.common.object_wrapper import ObjectWrapper, wrap_object  # noqa: F401
 
 # From Python 3.X. In older Python versions it fails if attributes do
 # not exist and don't maintain a __wrapped__ attribute.
diff --git a/newrelic/api/out_function.py b/newrelic/api/out_function.py
@@ -14,4 +14,4 @@
 
 # Use of these from this module will be deprecated.
 
-from newrelic.common.object_wrapper import OutFunctionWrapper, out_function, wrap_out_function
+from newrelic.common.object_wrapper import OutFunctionWrapper, out_function, wrap_out_function  # noqa: F401
diff --git a/newrelic/api/post_function.py b/newrelic/api/post_function.py
@@ -14,4 +14,4 @@
 
 # Use of these from this module will be deprecated.
 
-from newrelic.common.object_wrapper import PostFunctionWrapper, post_function, wrap_post_function
+from newrelic.common.object_wrapper import PostFunctionWrapper, post_function, wrap_post_function  # noqa: F401
diff --git a/newrelic/api/pre_function.py b/newrelic/api/pre_function.py
@@ -14,4 +14,4 @@
 
 # Use of these from this module will be deprecated.
 
-from newrelic.common.object_wrapper import PreFunctionWrapper, pre_function, wrap_pre_function
+from newrelic.common.object_wrapper import PreFunctionWrapper, pre_function, wrap_pre_function  # noqa: F401
diff --git a/newrelic/common/async_wrapper.py b/newrelic/common/async_wrapper.py
@@ -64,7 +64,7 @@ async def wrapper(*args, **kwargs):
                 while True:
                     try:
                         sent = yield yielded
-                    except GeneratorExit as e:
+                    except GeneratorExit:
                         await g.aclose()
                         raise
                     except BaseException as e:
diff --git a/newrelic/common/object_names.py b/newrelic/common/object_names.py
@@ -18,7 +18,6 @@
 import functools
 import inspect
 import sys
-import types
 
 # Object model terminology for quick reference.
 #
diff --git a/newrelic/console.py b/newrelic/console.py
@@ -366,8 +366,6 @@ def do_interpreter(self):
         interactive Python interpreter. Invoke 'exit()' or 'quit()' to
         escape the interpreter session."""
 
-        enabled = False
-
         _settings = global_settings()
 
         if not _settings.console.allow_interpreter_cmd:
diff --git a/newrelic/core/agent_control_health.py b/newrelic/core/agent_control_health.py
@@ -96,7 +96,7 @@ def is_valid_file_delivery_location(file_uri):
 
         return True
 
-    except Exception as e:
+    except Exception:
         _logger.warning(
             "Configured Agent Control health delivery location is not valid. Health check will not be enabled."
         )
diff --git a/newrelic/core/internal_metrics.py b/newrelic/core/internal_metrics.py
@@ -12,11 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import functools
-import sys
 import threading
 import time
-import types
 
 import newrelic.common.object_wrapper
 
diff --git a/newrelic/hooks/database_aiomysql.py b/newrelic/hooks/database_aiomysql.py
@@ -47,7 +47,7 @@ def __await__(self):
             while True:
                 try:
                     sent = yield yielded
-                except GeneratorExit as e:
+                except GeneratorExit:
                     g.close()
                     raise
                 except BaseException as e:
diff --git a/newrelic/hooks/database_psycopg2.py b/newrelic/hooks/database_psycopg2.py
@@ -63,6 +63,10 @@ class ConnectionSaveParamsWrapper(DBAPI2ConnectionWrapper):
 
     def __enter__(self):
         transaction = current_transaction()
+        if not transaction:
+            # Return unwrapped connection if there is no transaction
+            return self.__wrapped__.__enter__()
+
         name = callable_name(self.__wrapped__.__enter__)
         with FunctionTrace(name, source=self.__wrapped__.__enter__):
             self.__wrapped__.__enter__()
@@ -77,6 +81,9 @@ def __enter__(self):
 
     def __exit__(self, exc, value, tb):
         transaction = current_transaction()
+        if not transaction:
+            return self.__wrapped__.__exit__(exc, value, tb)
+
         name = callable_name(self.__wrapped__.__exit__)
         with FunctionTrace(name, source=self.__wrapped__.__exit__):
             if exc is None:
diff --git a/newrelic/hooks/external_botocore.py b/newrelic/hooks/external_botocore.py
@@ -82,7 +82,7 @@ def extract_sqs_agent_attrs(instance, *args, **kwargs):
                 agent_attrs["cloud.region"] = m.group(1)
                 agent_attrs["cloud.account.id"] = m.group(2)
                 agent_attrs["messaging.destination.name"] = m.group(3)
-    except Exception as e:
+    except Exception:
         _logger.debug("Failed to capture AWS SQS info.", exc_info=True)
     return agent_attrs
 
@@ -117,7 +117,7 @@ def extract_kinesis_agent_attrs(instance, *args, **kwargs):
             agent_attrs["cloud.platform"] = "aws_kinesis_data_streams"
             return agent_attrs
 
-    except Exception as e:
+    except Exception:
         _logger.debug("Failed to capture AWS Kinesis info.", exc_info=True)
     return agent_attrs
 
@@ -140,7 +140,7 @@ def extract_firehose_agent_attrs(instance, *args, **kwargs):
                 agent_attrs["cloud.resource_id"] = (
                     f"arn:aws:firehose:{region}:{account_id}:deliverystream/{stream_name}"
                 )
-    except Exception as e:
+    except Exception:
         _logger.debug("Failed to capture AWS Kinesis Delivery Stream (Firehose) info.", exc_info=True)
     return agent_attrs
 
@@ -786,7 +786,7 @@ async def __anext__(self):
         try:
             return_val = await self.__wrapped__.__anext__()
             record_stream_chunk(self, return_val, transaction)
-        except StopAsyncIteration as e:
+        except StopAsyncIteration:
             record_events_on_stop_iteration(self, transaction)
             raise
         except Exception as exc:
@@ -919,8 +919,6 @@ def handle_chat_completion_event(transaction, bedrock_attrs):
     response_id = bedrock_attrs.get("response_id", None)
     model = bedrock_attrs.get("model", None)
 
-    settings = transaction.settings if transaction.settings is not None else global_settings()
-
     input_message_list = bedrock_attrs.get("input_message_list", [])
     output_message_list = bedrock_attrs.get("output_message_list", [])
     number_of_messages = (
@@ -1055,7 +1053,7 @@ def _nr_dynamodb_datastore_trace_wrapper_(wrapped, instance, args, kwargs):
                     f"arn:{partition}:dynamodb:{region}:{account_id:012d}:table/{_target}"
                 )
 
-        except Exception as e:
+        except Exception:
             _logger.debug("Failed to capture AWS DynamoDB info.", exc_info=True)
         trace.agent_attributes.update(agent_attrs)
 
diff --git a/newrelic/hooks/external_feedparser.py b/newrelic/hooks/external_feedparser.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import sys
-import types
 
 import newrelic.api.external_trace
 import newrelic.api.object_wrapper
diff --git a/newrelic/hooks/external_httpx.py b/newrelic/hooks/external_httpx.py
@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from collections import abc
-
 from newrelic.api.external_trace import ExternalTrace
 from newrelic.common.object_wrapper import wrap_function_wrapper
 
diff --git a/newrelic/hooks/framework_graphql.py b/newrelic/hooks/framework_graphql.py
@@ -453,7 +453,7 @@ def wrap_graphql_impl(wrapped, instance, args, kwargs):
     try:
         with ErrorTrace(ignore=ignore_graphql_duplicate_exception):
             result = wrapped(*args, **kwargs)
-    except Exception as e:
+    except Exception:
         # Execution finished synchronously, exit immediately.
         trace.__exit__(*sys.exc_info())
         raise
diff --git a/newrelic/hooks/framework_graphql_py3.py b/newrelic/hooks/framework_graphql_py3.py
@@ -15,7 +15,6 @@
 import sys
 
 from newrelic.api.error_trace import ErrorTrace
-from newrelic.api.function_trace import FunctionTrace
 
 
 def nr_coro_execute_name_wrapper(wrapped, result, set_name):
diff --git a/newrelic/hooks/framework_sanic.py b/newrelic/hooks/framework_sanic.py
@@ -245,7 +245,7 @@ def _nr_sanic_register_middleware_(wrapped, instance, args, kwargs):
     callable_name(middleware)
     middleware_func = middleware
     if hasattr(middleware, "func"):
-        name = callable_name(middleware.func)
+        callable_name(middleware.func)
         middleware_func = middleware.func
 
     wrapped_middleware = _nr_wrapper_middleware_(attach_to)(middleware_func)
diff --git a/newrelic/hooks/framework_tornado.py b/newrelic/hooks/framework_tornado.py
@@ -15,7 +15,6 @@
 import functools
 import inspect
 import sys
-import textwrap
 import time
 
 from newrelic.api.application import application_instance
@@ -46,7 +45,10 @@ def _store_version_info():
     return tornado.version_info
 
 
-def convert_yielded(*args, **kwargs):
+def convert_yielded(*args, **kwargs):  # noqa: F811
+    # Delays import of convert_yielded until this function is called to avoid
+    # import ordering issues.
+
     global convert_yielded
     from tornado.gen import convert_yielded as _convert_yielded
 
diff --git a/newrelic/hooks/logger_loguru.py b/newrelic/hooks/logger_loguru.py
@@ -18,7 +18,6 @@
 from newrelic.api.application import application_instance
 from newrelic.api.transaction import current_transaction, record_log_event
 from newrelic.common.object_wrapper import wrap_function_wrapper
-from newrelic.common.package_version_utils import get_package_version_tuple
 from newrelic.common.signature import bind_args
 from newrelic.core.config import global_settings
 from newrelic.hooks.logger_logging import add_nr_linking_metadata
diff --git a/newrelic/hooks/messagebroker_confluentkafka.py b/newrelic/hooks/messagebroker_confluentkafka.py
@@ -120,7 +120,7 @@ def wrap_Consumer_poll(wrapped, instance, args, kwargs):
     # Step 2: Poll for records
     try:
         record = wrapped(*args, **kwargs)
-    except Exception as e:
+    except Exception:
         if current_transaction():
             notice_error()
         else:
diff --git a/newrelic/hooks/messagebroker_kombu.py b/newrelic/hooks/messagebroker_kombu.py
@@ -103,8 +103,6 @@ def wrap_Producer_publish(wrapped, instance, args, kwargs):
 
     headers = bound_args["headers"]
     headers = headers if headers else {}
-    value = bound_args["body"]
-    key = bound_args["routing_key"]
     exchange = getattr(bound_args["exchange"], "name", None) or "Default"
 
     transaction.add_messagebroker_info("Kombu", get_package_version("kombu"))
@@ -257,7 +255,7 @@ def wrap_serialize(wrapped, instance, args, kwargs):
     group = "MessageBroker/Kombu/Exchange"
     name = f"Named/{exchange}/Serialization/Value"
 
-    with FunctionTrace(name=name, group=group) as ft:
+    with FunctionTrace(name=name, group=group):
         return wrapped(*args, **kwargs)
 
 
diff --git a/newrelic/hooks/mlmodel_langchain.py b/newrelic/hooks/mlmodel_langchain.py
@@ -188,7 +188,7 @@ async def wrap_asimilarity_search(wrapped, instance, args, kwargs):
     linking_metadata = get_trace_linking_metadata()
     try:
         response = await wrapped(*args, **kwargs)
-    except Exception as exc:
+    except Exception:
         ft.notice_error(attributes={"vector_store_id": search_id})
         ft.__exit__(*sys.exc_info())
         _create_error_vectorstore_events(transaction, search_id, args, kwargs, linking_metadata, wrapped)
@@ -221,7 +221,7 @@ def wrap_similarity_search(wrapped, instance, args, kwargs):
     linking_metadata = get_trace_linking_metadata()
     try:
         response = wrapped(*args, **kwargs)
-    except Exception as exc:
+    except Exception:
         ft.notice_error(attributes={"vector_store_id": search_id})
         ft.__exit__(*sys.exc_info())
         _create_error_vectorstore_events(transaction, search_id, args, kwargs, linking_metadata, wrapped)
@@ -309,7 +309,7 @@ def wrap_tool_sync_run(wrapped, instance, args, kwargs):
     linking_metadata = get_trace_linking_metadata()
     try:
         return_val = wrapped(**run_args)
-    except Exception as exc:
+    except Exception:
         _record_tool_error(
             instance,
             transaction,
@@ -366,7 +366,7 @@ async def wrap_tool_async_run(wrapped, instance, args, kwargs):
     linking_metadata = get_trace_linking_metadata()
     try:
         return_val = await wrapped(**run_args)
-    except Exception as exc:
+    except Exception:
         _record_tool_error(
             instance,
             transaction,
@@ -561,7 +561,7 @@ async def wrap_chain_async_run(wrapped, instance, args, kwargs):
     linking_metadata = get_trace_linking_metadata()
     try:
         response = await wrapped(input=run_args["input"], config=run_args["config"], **run_args.get("kwargs", {}))
-    except Exception as exc:
+    except Exception:
         ft.notice_error(attributes={"completion_id": completion_id})
         ft.__exit__(*sys.exc_info())
         _create_error_chain_run_events(
@@ -605,7 +605,7 @@ def wrap_chain_sync_run(wrapped, instance, args, kwargs):
     linking_metadata = get_trace_linking_metadata()
     try:
         response = wrapped(input=run_args["input"], config=run_args["config"], **run_args.get("kwargs", {}))
-    except Exception as exc:
+    except Exception:
         ft.notice_error(attributes={"completion_id": completion_id})
         ft.__exit__(*sys.exc_info())
         _create_error_chain_run_events(
@@ -708,7 +708,7 @@ def _create_successful_chain_run_events(
         except:
             try:
                 output_message_list = [str(response)]
-            except Exception as e:
+            except Exception:
                 _logger.warning(
                     "Unable to capture response inside langchain chain instrumentation. No response message event will be captured. Report this issue to New Relic Support.\n%s",
                     traceback.format_exception(*sys.exc_info()),
diff --git a/newrelic/hooks/mlmodel_openai.py b/newrelic/hooks/mlmodel_openai.py
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/tests/agent_features/test_agent_control_health_check.py b/tests/agent_features/test_agent_control_health_check.py
diff --git a/tests/agent_features/test_coroutine_transaction.py b/tests/agent_features/test_coroutine_transaction.py
diff --git a/tests/agent_unittests/test_agent_connect.py b/tests/agent_unittests/test_agent_connect.py
diff --git a/tests/component_tastypie/api.py b/tests/component_tastypie/api.py
diff --git a/tests/external_aiobotocore/test_bedrock_chat_completion.py b/tests/external_aiobotocore/test_bedrock_chat_completion.py
diff --git a/tests/external_aiobotocore/test_bedrock_embeddings.py b/tests/external_aiobotocore/test_bedrock_embeddings.py
diff --git a/tests/external_botocore/test_boto3_firehose.py b/tests/external_botocore/test_boto3_firehose.py
diff --git a/tests/framework_ariadne/test_application.py b/tests/framework_ariadne/test_application.py
diff --git a/tests/framework_graphene/test_application.py b/tests/framework_graphene/test_application.py
diff --git a/tests/framework_strawberry/test_application.py b/tests/framework_strawberry/test_application.py

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@`
`14`	`14`
`15`	`15`	`# Use of these from this module will be deprecated.`
`16`	`16`
`17`		`-from newrelic.common.object_wrapper import InFunctionWrapper, in_function, wrap_in_function`
	`17`	`+from newrelic.common.object_wrapper import InFunctionWrapper, in_function, wrap_in_function # noqa: F401`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`import functools`
`19`	`19`	`import inspect`
`20`	`20`	`import sys`
`21`		`-import types`
`22`	`21`
`23`	`22`	`# Object model terminology for quick reference.`
`24`	`23`	`#`