Merge remote-tracking branch 'origin/main' into fix-linter-flake8-comprehensions

Author: TimPansino

newrelic/api/database_trace.py

@@ -249,7 +249,7 @@ def _nr_database_trace_wrapper_(wrapped, instance, args, kwargs):
 
         trace = DatabaseTrace(_sql, dbapi2_module, parent=parent, source=wrapped)
 
-        if wrapper:  # pylint: disable=W0125,W0126
+        if wrapper:
             return wrapper(wrapped, trace)(*args, **kwargs)
 
         with trace:

newrelic/api/datastore_trace.py

@@ -226,7 +226,7 @@ def _nr_datastore_trace_wrapper_(wrapped, instance, args, kwargs):
             _product, _target, _operation, _host, _port_path_or_id, _database_name, parent=parent, source=wrapped
         )
 
-        if wrapper:  # pylint: disable=W0125,W0126
+        if wrapper:
             return wrapper(wrapped, trace)(*args, **kwargs)
 
         with trace:

newrelic/api/external_trace.py

@@ -92,7 +92,7 @@ def dynamic_wrapper(wrapped, instance, args, kwargs):
 
         trace = ExternalTrace(library, _url, _method, parent=parent, source=wrapped)
 
-        if wrapper:  # pylint: disable=W0125,W0126
+        if wrapper:
             return wrapper(wrapped, trace)(*args, **kwargs)
 
         with trace:
@@ -109,7 +109,7 @@ def literal_wrapper(wrapped, instance, args, kwargs):
 
         trace = ExternalTrace(library, url, method, parent=parent, source=wrapped)
 
-        if wrapper:  # pylint: disable=W0125,W0126
+        if wrapper:
             return wrapper(wrapped, trace)(*args, **kwargs)
 
         with trace:

newrelic/api/function_trace.py

@@ -131,7 +131,7 @@ def dynamic_wrapper(wrapped, instance, args, kwargs):
 
         trace = FunctionTrace(_name, _group, _label, _params, terminal, rollup, parent=parent, source=wrapped)
 
-        if wrapper:  # pylint: disable=W0125,W0126
+        if wrapper:
             return wrapper(wrapped, trace)(*args, **kwargs)
 
         with trace:
@@ -150,7 +150,7 @@ def literal_wrapper(wrapped, instance, args, kwargs):
 
         trace = FunctionTrace(_name, group, label, params, terminal, rollup, parent=parent, source=wrapped)
 
-        if wrapper:  # pylint: disable=W0125,W0126
+        if wrapper:
             return wrapper(wrapped, trace)(*args, **kwargs)
 
         with trace:

newrelic/api/graphql_trace.py

@@ -112,7 +112,7 @@ def _nr_graphql_trace_wrapper_(wrapped, instance, args, kwargs):
 
         trace = GraphQLOperationTrace(parent=parent, source=wrapped)
 
-        if wrapper:  # pylint: disable=W0125,W0126
+        if wrapper:
             return wrapper(wrapped, trace)(*args, **kwargs)
 
         with trace:
@@ -202,7 +202,7 @@ def _nr_graphql_trace_wrapper_(wrapped, instance, args, kwargs):
 
         trace = GraphQLResolverTrace(parent=parent, source=wrapped)
 
-        if wrapper:  # pylint: disable=W0125,W0126
+        if wrapper:
             return wrapper(wrapped, trace)(*args, **kwargs)
 
         with trace:

newrelic/api/memcache_trace.py

@@ -71,7 +71,7 @@ def _nr_wrapper_memcache_trace_(wrapped, instance, args, kwargs):
 
         trace = MemcacheTrace(_command, parent=parent, source=wrapped)
 
-        if wrapper:  # pylint: disable=W0125,W0126
+        if wrapper:
             return wrapper(wrapped, trace)(*args, **kwargs)
 
         with trace:

newrelic/api/message_trace.py

@@ -145,7 +145,7 @@ def _nr_message_trace_wrapper_(wrapped, instance, args, kwargs):
             source=wrapped,
         )
 
-        if wrapper:  # pylint: disable=W0125,W0126
+        if wrapper:
             return wrapper(wrapped, trace)(*args, **kwargs)
 
         with trace:

newrelic/api/transaction.py

@@ -119,7 +119,7 @@ def complete_root(self):
             self.exited = True
 
     @staticmethod
-    def complete_trace():  # pylint: disable=arguments-differ
+    def complete_trace():
         pass
 
     @property

newrelic/api/web_transaction.py

@@ -468,7 +468,7 @@ def browser_timing_header(self, nonce=None):
 
             except UnicodeError:
                 if not WebTransaction.unicode_error_reported:
-                    _logger.error("ASCII encoding of js-agent-header failed.", header)
+                    _logger.error("ASCII encoding of js-agent-header failed: %s", header)
                     WebTransaction.unicode_error_reported = True
 
                 header = ""

newrelic/common/agent_http.py

@@ -18,14 +18,14 @@
 import zlib
 from pprint import pprint
 
-import newrelic.packages.urllib3 as urllib3
 from newrelic import version
 from newrelic.common import certs
 from newrelic.common.encoding_utils import json_decode, json_encode, obfuscate_license_key
 from newrelic.common.object_names import callable_name
 from newrelic.common.object_wrapper import patch_function_wrapper
 from newrelic.core.internal_metrics import internal_count_metric, internal_metric
 from newrelic.network.exceptions import NetworkInterfaceException
+from newrelic.packages import urllib3
 
 try:
     from ssl import get_default_verify_paths
@@ -239,7 +239,7 @@ def __init__(
         default_content_encoding_header="Identity",
     ):
         self._host = host
-        port = self._port = port
+        self._port = port
         self._compression_threshold = compression_threshold
         self._compression_level = compression_level
         self._compression_method = compression_method