Merge branch 'main' into fix-action-linting

Author: mergify[bot]

.github/workflows/get-envs.py

@@ -25,7 +25,7 @@ def main(f):
     filtered_envs = environments[GROUP_NUMBER::TOTAL_GROUPS]
     joined_envs = ",".join(filtered_envs)
 
-    assert joined_envs, (
+    assert joined_envs, (  # noqa: S101
         f"No environments found.\nenvironments = {str(environments)}\nGROUP_NUMBER = {GROUP_NUMBER + 1}\nTOTAL_GROUPS = {TOTAL_GROUPS}"
     )
     print(joined_envs)

newrelic/admin/run_program.py

@@ -107,4 +107,4 @@ def log_message(text, *args):
     log_message("program_exe_path = %r", program_exe_path)
     log_message("execl_arguments = %r", [program_exe_path] + args)
 
-    os.execl(program_exe_path, *args)
+    os.execl(program_exe_path, *args)  # noqa: S606

newrelic/admin/run_python.py

@@ -105,4 +105,4 @@ def log_message(text, *args):
     log_message("python_exe_path = %r", python_exe_path)
     log_message("execl_arguments = %r", [python_exe_path, python_exe_path] + args)
 
-    os.execl(python_exe_path, python_exe_path, *args)
+    os.execl(python_exe_path, python_exe_path, *args)  # noqa: S606

newrelic/admin/validate_config.py

@@ -37,7 +37,7 @@ def _function1():
 
     @function_trace()
     def _function2():
-        for i in range(10):
+        for _ in range(10):
             _function1()
 
     @error_trace()
@@ -68,7 +68,7 @@ def _wsgi_application(environ, start_response):
         response_headers = [("Content-type", "text/plain"), ("Content-Length", str(len(output)))]
         start_response(status, response_headers)
 
-        for i in range(10):
+        for _ in range(10):
             _function1()
 
         _function2()
@@ -84,7 +84,7 @@ def _wsgi_application(environ, start_response):
 
     @background_task()
     def _background_task():
-        for i in range(10):
+        for _ in range(10):
             _function1()
 
         _function2()
@@ -154,7 +154,7 @@ def validate_config(args):
     if len(args) >= 2:
         log_file = args[1]
     else:
-        log_file = "/tmp/python-agent-test.log"  # nosec
+        log_file = "/tmp/python-agent-test.log"
 
     log_level = logging.DEBUG
 

newrelic/api/application.py

@@ -115,6 +115,7 @@ def record_exception(self, exc=None, value=None, tb=None, params=None, ignore_er
         warnings.warn(
             ("The record_exception function is deprecated. Please use the new api named notice_error instead."),
             DeprecationWarning,
+            stacklevel=2,
         )
 
         self.notice_error(error=(exc, value, tb), attributes=params, ignore=ignore_errors)

newrelic/api/asgi_application.py

@@ -156,7 +156,7 @@ async def send_inject_browser_agent(self, message):
                     # check to see if we have to modify the content-length
                     # header
                     headers = self.initial_message["headers"]
-                    for header_index, header_data in enumerate(headers):
+                    for header_index, header_data in enumerate(headers):  # noqa: B007
                         header_name, header_value = header_data
                         if header_name.lower() == b"content-length":
                             break

newrelic/api/database_trace.py

@@ -25,8 +25,11 @@
 
 
 def register_database_client(
-    dbapi2_module, database_product, quoting_style="single", explain_query=None, explain_stmts=[], instance_info=None
+    dbapi2_module, database_product, quoting_style="single", explain_query=None, explain_stmts=None, instance_info=None
 ):
+    if explain_stmts is None:
+        explain_stmts = []
+
     _logger.debug(
         "Registering database client module %r where database "
         "is %r, quoting style is %r, explain query statement is %r and "

newrelic/api/error_trace.py

@@ -20,7 +20,9 @@
 
 
 class ErrorTrace:
-    def __init__(self, ignore_errors=[], ignore=None, expected=None, status_code=None, parent=None):
+    def __init__(self, ignore_errors=None, ignore=None, expected=None, status_code=None, parent=None):
+        if ignore_errors is None:
+            ignore_errors = []
         if parent is None:
             parent = current_trace()
 
@@ -33,6 +35,7 @@ def __init__(self, ignore_errors=[], ignore=None, expected=None, status_code=Non
             warnings.warn(
                 ("The ignore_errors argument is deprecated. Please use the new ignore argument instead."),
                 DeprecationWarning,
+                stacklevel=2,
             )
 
     def __enter__(self):
@@ -50,7 +53,10 @@ def __exit__(self, exc, value, tb):
         )
 
 
-def ErrorTraceWrapper(wrapped, ignore_errors=[], ignore=None, expected=None, status_code=None):
+def ErrorTraceWrapper(wrapped, ignore_errors=None, ignore=None, expected=None, status_code=None):
+    if ignore_errors is None:
+        ignore_errors = []
+
     def wrapper(wrapped, instance, args, kwargs):
         parent = current_trace()
 
@@ -63,11 +69,17 @@ def wrapper(wrapped, instance, args, kwargs):
     return FunctionWrapper(wrapped, wrapper)
 
 
-def error_trace(ignore_errors=[], ignore=None, expected=None, status_code=None):
+def error_trace(ignore_errors=None, ignore=None, expected=None, status_code=None):
+    if ignore_errors is None:
+        ignore_errors = []
+
     return functools.partial(
         ErrorTraceWrapper, ignore_errors=ignore_errors, ignore=ignore, expected=expected, status_code=status_code
     )
 
 
-def wrap_error_trace(module, object_path, ignore_errors=[], ignore=None, expected=None, status_code=None):
+def wrap_error_trace(module, object_path, ignore_errors=None, ignore=None, expected=None, status_code=None):
+    if ignore_errors is None:
+        ignore_errors = []
+
     wrap_object(module, object_path, ErrorTraceWrapper, (ignore_errors, ignore, expected, status_code))

newrelic/api/lambda_handler.py

@@ -155,6 +155,7 @@ def LambdaHandlerWrapper(*args, **kwargs):
             "APIs provided in the newrelic-lambda package."
         ),
         DeprecationWarning,
+        stacklevel=2,
     )
 
     return _LambdaHandlerWrapper(*args, **kwargs)
@@ -164,6 +165,7 @@ def lambda_handler(application=None, name=None, group=None):
     warnings.warn(
         ("The lambda_handler API has been deprecated. Please use the APIs provided in the newrelic-lambda package."),
         DeprecationWarning,
+        stacklevel=2,
     )
 
     return functools.partial(_LambdaHandlerWrapper, application=application, name=name, group=group)

newrelic/api/log.py

@@ -216,6 +216,7 @@ def __init__(
             "please use newrelic.api.log.NewRelicLogForwardingHandler to take advantage of all the "
             "features included in application log forwarding such as proper batching.",
             DeprecationWarning,
+            stacklevel=2,
         )
         super(NewRelicLogHandler, self).__init__(level=level)
         self.license_key = license_key or self.settings.license_key