Use a specific client for supportability metrics.

Author: a-feld

newrelic/common/agent_http.py

@@ -96,28 +96,7 @@ def finalize(self):
 
     @staticmethod
     def _supportability_request(params, payload, body, compression_time):
-        # *********
-        # Used only for supportability metrics. Do not use to drive business
-        # logic!
-        agent_method = params and params.get("method")
-        # *********
-
-        if agent_method and body:
-            # Compression was applied
-            if compression_time is not None:
-                internal_metric(
-                    "Supportability/Python/Collector/ZLIB/Bytes/%s" % agent_method,
-                    len(payload),
-                )
-                internal_metric(
-                    "Supportability/Python/Collector/ZLIB/Compress/%s" % agent_method,
-                    compression_time,
-                )
-
-            internal_metric(
-                "Supportability/Python/Collector/Output/Bytes/%s" % agent_method,
-                len(body),
-            )
+        pass
 
     @classmethod
     def log_request(
@@ -166,22 +145,7 @@ def log_request(
 
     @staticmethod
     def _supportability_response(status, exc, connection="direct"):
-        if exc or not 200 <= status < 300:
-            internal_count_metric("Supportability/Python/Collector/Failures", 1)
-            internal_count_metric(
-                "Supportability/Python/Collector/Failures/%s" % connection, 1
-            )
-
-            if exc:
-                internal_count_metric(
-                    "Supportability/Python/Collector/Exception/"
-                    "%s" % callable_name(exc),
-                    1,
-                )
-            else:
-                internal_count_metric(
-                    "Supportability/Python/Collector/HTTPError/%d" % status, 1
-                )
+        pass
 
     @classmethod
     def log_response(cls, fp, log_id, status, headers, data, connection="direct"):
@@ -544,7 +508,57 @@ def __init__(
         )
 
 
-class DeveloperModeClient(BaseClient):
+class SupportabilityMixin(object):
+    @staticmethod
+    def _supportability_request(params, payload, body, compression_time):
+        # *********
+        # Used only for supportability metrics. Do not use to drive business
+        # logic!
+        agent_method = params and params.get("method")
+        # *********
+
+        if agent_method and body:
+            # Compression was applied
+            if compression_time is not None:
+                internal_metric(
+                    "Supportability/Python/Collector/ZLIB/Bytes/%s" % agent_method,
+                    len(payload),
+                )
+                internal_metric(
+                    "Supportability/Python/Collector/ZLIB/Compress/%s" % agent_method,
+                    compression_time,
+                )
+
+            internal_metric(
+                "Supportability/Python/Collector/Output/Bytes/%s" % agent_method,
+                len(body),
+            )
+
+    @staticmethod
+    def _supportability_response(status, exc, connection="direct"):
+        if exc or not 200 <= status < 300:
+            internal_count_metric("Supportability/Python/Collector/Failures", 1)
+            internal_count_metric(
+                "Supportability/Python/Collector/Failures/%s" % connection, 1
+            )
+
+            if exc:
+                internal_count_metric(
+                    "Supportability/Python/Collector/Exception/"
+                    "%s" % callable_name(exc),
+                    1,
+                )
+            else:
+                internal_count_metric(
+                    "Supportability/Python/Collector/HTTPError/%d" % status, 1
+                )
+
+
+class ApplicationModeClient(SupportabilityMixin, HttpClient):
+    pass
+
+
+class DeveloperModeClient(SupportabilityMixin, BaseClient):
     RESPONSES = {
         "preconnect": {u"redirect_host": u"fake-collector.newrelic.com"},
         "agent_settings": [],

newrelic/core/agent_protocol.py

@@ -3,7 +3,7 @@
 
 from newrelic import version
 from newrelic.common import system_info
-from newrelic.common.agent_http import HttpClient, ServerlessModeClient
+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,
@@ -138,7 +138,7 @@ class AgentProtocol(object):
         "VERBOSE": _logger.debug,
     }
 
-    def __init__(self, settings, host=None, client_cls=HttpClient):
+    def __init__(self, settings, host=None, client_cls=ApplicationModeClient):
         if settings.audit_log_file:
             audit_log_fp = open(settings.audit_log_file, "a")
         else:
@@ -417,7 +417,12 @@ def _apply_high_security_mode_fixups(cls, server_settings, local_settings):
 
     @classmethod
     def connect(
-        cls, app_name, linked_applications, environment, settings, client_cls=HttpClient
+        cls,
+        app_name,
+        linked_applications,
+        environment,
+        settings,
+        client_cls=ApplicationModeClient,
     ):
         with cls(settings, client_cls=client_cls) as preconnect:
             redirect_host = preconnect.send("preconnect")["redirect_host"]

newrelic/core/data_collector.py

@@ -21,8 +21,8 @@
 import logging
 
 from newrelic.common.agent_http import (
+    ApplicationModeClient,
     DeveloperModeClient,
-    HttpClient,
     ServerlessModeClient,
 )
 from newrelic.core.agent_protocol import AgentProtocol, ServerlessModeProtocol
@@ -34,7 +34,7 @@
 
 class Session(object):
     PROTOCOL = AgentProtocol
-    CLIENT = HttpClient
+    CLIENT = ApplicationModeClient
 
     def __init__(self, app_name, linked_applications, environment, settings):
         self._protocol = self.PROTOCOL.connect(