Adjust Log Messages (#507)

* Tiny adjustments from support pairing

* [Mega-Linter] Apply linters fixes

* Fix type error

* [Mega-Linter] Apply linters fixes

* Trigger tests

Co-authored-by: TimPansino <[email protected]>
Co-authored-by: Uma Annamalai <[email protected]>

Author: TimPansino

newrelic/api/log.py

@@ -12,17 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import re
 import json
 import logging
-
+import re
 from logging import Formatter, LogRecord
 
-from newrelic.core.attribute import truncate
 from newrelic.api.time_trace import get_linking_metadata
 from newrelic.api.transaction import current_transaction
-from newrelic.common.object_names import parse_exc_info
 from newrelic.common import agent_http
+from newrelic.common.object_names import parse_exc_info
+from newrelic.core.attribute import truncate
 from newrelic.core.config import global_settings, is_expected_error
 
 
@@ -89,7 +88,7 @@ def safe_str(object, *args, **kwargs):
 class NewRelicLogHandler(logging.Handler):
     """This is an experimental log handler provided by the community. Use with caution."""
 
-    PATH="/log/v1"
+    PATH = "/log/v1"
 
     def __init__(
         self,
@@ -141,7 +140,13 @@ def emit(self, record):
                         "An unexpected HTTP response of %r was received for request made to https://%s:%d%s."
                         "The response payload for the request was %r. If this issue persists then please "
                         "report this problem to New Relic support for further investigation."
-                        % (status_code, self.client._host, self.client._port, self.PATH, truncate(response.decode("utf-8"), maxlen=1024))
+                        % (
+                            status_code,
+                            self.client._host,
+                            self.client._port,
+                            self.PATH,
+                            truncate(response.decode("utf-8"), 1024),
+                        )
                     )
 
         except Exception:

newrelic/core/agent_protocol.py

@@ -18,7 +18,6 @@
 from newrelic import version
 from newrelic.common import system_info
 from newrelic.common.agent_http import ApplicationModeClient, ServerlessModeClient
-from newrelic.core.internal_metrics import internal_count_metric
 from newrelic.common.encoding_utils import (
     json_decode,
     json_encode,
@@ -32,11 +31,13 @@
     KubernetesUtilization,
     PCFUtilization,
 )
+from newrelic.core.attribute import truncate
 from newrelic.core.config import (
     fetch_config_setting,
     finalize_application_settings,
     global_settings_dump,
 )
+from newrelic.core.internal_metrics import internal_count_metric
 from newrelic.network.exceptions import (
     DiscardDataForRequest,
     ForceAgentDisconnect,
@@ -135,9 +136,7 @@ class AgentProtocol(object):
             ),
         ),
     }
-    PARAMS_ALLOWLIST = frozenset(
-        ("method", "protocol_version", "marshal_format", "run_id")
-    )
+    PARAMS_ALLOWLIST = frozenset(("method", "protocol_version", "marshal_format", "run_id"))
 
     SECURITY_SETTINGS = (
         "capture_params",
@@ -219,9 +218,7 @@ def send(self, method, payload=()):
         params, headers, payload = self._to_http(method, payload)
 
         try:
-            response = self.client.send_request(
-                params=params, headers=headers, payload=payload
-            )
+            response = self.client.send_request(params=params, headers=headers, payload=payload)
         except NetworkInterfaceException:
             # All HTTP errors are currently retried
             raise RetryDataForRequest
@@ -245,10 +242,8 @@ def send(self, method, payload=()):
                     "method": method,
                     "status_code": status,
                     "headers": headers,
-                    "params": {
-                        k: v for k, v in params.items() if k in self.PARAMS_ALLOWLIST
-                    },
-                    "content": data,
+                    "params": {k: v for k, v in params.items() if k in self.PARAMS_ALLOWLIST},
+                    "content": truncate(data, 1024),
                     "agent_run_id": self._run_token,
                 },
             )
@@ -277,26 +272,18 @@ def _connect_payload(app_name, linked_applications, environment, settings):
         ip_address = system_info.getips()
 
         connect_settings = {}
-        connect_settings["browser_monitoring.loader"] = settings[
-            "browser_monitoring.loader"
-        ]
-        connect_settings["browser_monitoring.debug"] = settings[
-            "browser_monitoring.debug"
-        ]
+        connect_settings["browser_monitoring.loader"] = settings["browser_monitoring.loader"]
+        connect_settings["browser_monitoring.debug"] = settings["browser_monitoring.debug"]
 
         security_settings = {}
         security_settings["capture_params"] = settings["capture_params"]
         security_settings["transaction_tracer"] = {}
-        security_settings["transaction_tracer"]["record_sql"] = settings[
-            "transaction_tracer.record_sql"
-        ]
+        security_settings["transaction_tracer"]["record_sql"] = settings["transaction_tracer.record_sql"]
 
         utilization_settings = {}
         # metadata_version corresponds to the utilization spec being used.
         utilization_settings["metadata_version"] = 5
-        utilization_settings[
-            "logical_processors"
-        ] = system_info.logical_processor_count()
+        utilization_settings["logical_processors"] = system_info.logical_processor_count()
         utilization_settings["total_ram_mib"] = system_info.total_physical_memory()
         utilization_settings["hostname"] = hostname
         if ip_address:
@@ -451,9 +438,7 @@ def connect(
         with cls(settings, host=redirect_host, client_cls=client_cls) as protocol:
             configuration = protocol.send(
                 "connect",
-                cls._connect_payload(
-                    app_name, linked_applications, environment, settings
-                ),
+                cls._connect_payload(app_name, linked_applications, environment, settings),
             )
 
         # Apply High Security Mode to server_config, so the local
@@ -487,9 +472,7 @@ def finalize(self):
 
 class ServerlessModeProtocol(AgentProtocol):
     def __init__(self, settings, host=None, client_cls=ServerlessModeClient):
-        super(ServerlessModeProtocol, self).__init__(
-            settings, host=host, client_cls=client_cls
-        )
+        super(ServerlessModeProtocol, self).__init__(settings, host=host, client_cls=client_cls)
         self._metadata = {
             "protocol_version": self.VERSION,
             "execution_environment": os.environ.get("AWS_EXECUTION_ENV", None),
@@ -525,9 +508,7 @@ def connect(
         client_cls=ServerlessModeClient,
     ):
         aws_lambda_metadata = settings.aws_lambda_metadata
-        settings = finalize_application_settings(
-            {"cross_application_tracer.enabled": False}, settings
-        )
+        settings = finalize_application_settings({"cross_application_tracer.enabled": False}, settings)
         # Metadata must come from the original settings object since it
         # can be modified later
         settings.aws_lambda_metadata = aws_lambda_metadata

newrelic/core/config.py

@@ -1157,7 +1157,7 @@ def error_matches_rules(
 
             if not settings:
                 # Unable to find rules to match with
-                _logger.error(
+                _logger.debug(
                     "Failed to retrieve exception rules: No settings supplied, or found on transaction or trace."
                 )
                 return None