add rn

clean up send event args

Author: mabdinur

ddtrace/internal/telemetry/writer.py

@@ -84,7 +84,7 @@ def __init__(self, agentless):
     def url(self):
         return parse.urljoin(self._telemetry_url, self._endpoint)
 
-    def send_event(self, request: Dict) -> Optional[httplib.HTTPResponse]:
+    def send_event(self, request: Dict, payload_type: str) -> Optional[httplib.HTTPResponse]:
         """Sends a telemetry request to the trace agent"""
         resp = None
         conn = None
@@ -95,27 +95,29 @@ def send_event(self, request: Dict) -> Optional[httplib.HTTPResponse]:
                 conn = get_connection(self._telemetry_url)
                 conn.request("POST", self._endpoint, rb_json, headers)
                 resp = conn.getresponse()
-            request_types = request["request_type"]
-            if request_types == "message-batch":
-                request_types = ", ".join([event["request_type"] for event in request["payload"]])
             if resp.status < 300:
                 log.debug(
                     "Instrumentation Telemetry sent %d bytes in %.5fs to %s. Event(s): %s. Response: %s",
                     len(rb_json),
                     sw.elapsed(),
                     self.url,
-                    request_types,
+                    payload_type,
                     resp.status,
                 )
             else:
                 log.debug(
                     "Failed to send Instrumentation Telemetry to %s. Event(s): %s. Response: %s",
                     self.url,
-                    request_types,
+                    payload_type,
                     resp.status,
                 )
-        except Exception as e:
-            log.debug("Failed to send Instrumentation Telemetry to %s. Error: %s", self.url, str(e))
+        except Exception:
+            log.debug(
+                "Failed to send Instrumentation Telemetry to %s. Event(s): %s",
+                self.url,
+                payload_type,
+                exc_info=True,
+            )
         finally:
             if conn is not None:
                 conn.close()
@@ -744,6 +746,7 @@ def periodic(self, force_flush=False, shutting_down=False):
         if queued_events := self._flush_events_queue():
             events.extend(queued_events)
 
+        payload_types = ", ".join([event["request_type"] for event in events])
         # Prepare and send the final batch
         batch_event = {
             "tracer_time": int(time.time()),
@@ -756,7 +759,7 @@ def periodic(self, force_flush=False, shutting_down=False):
             "payload": events,
             "request_type": "message-batch",
         }
-        self._client.send_event(batch_event)
+        self._client.send_event(batch_event, payload_types)
 
     def app_shutdown(self):
         if self.started:

releasenotes/notes/batch-all-telemetry-requests-4d36c7f74b077dc0.yaml

@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    performance: Batch all telemetry requests within a single heartbeat interval, reducing network requests by 95% (from ~20 to 1 per minute per process).

tests/appsec/architectures/mini.py

@@ -25,7 +25,7 @@
 _send_event = _TelemetryClient.send_event
 
 
-def _send_event_wrapper(self, event):
+def _send_event_wrapper(self, event, payload_type):
     global _TELEMETRY_DEPENDENCIES
     print(f"Captured telemetry event: {event}", flush=True)
     if event:
@@ -36,7 +36,7 @@ def _send_event_wrapper(self, event):
         for lst in dependencies:
             _TELEMETRY_DEPENDENCIES.extend(lst)
         print(f"Captured dependencies: {dependencies}", flush=True)
-    return _send_event(self, event)
+    return _send_event(self, event, payload_type)
 
 
 _TelemetryClient.send_event = _send_event_wrapper

tests/telemetry/test_writer.py

@@ -757,7 +757,7 @@ def test_app_heartbeat_event_periodic(mock_time, telemetry_writer, test_agent_se
         assert test_agent_session.get_events(mock.ANY, filter_heartbeats=False) == []
 
     telemetry_writer.periodic()
-    heartbeat_events = test_agent_session.get_events(mock.ANY, filter_heartbeats=False)
+    heartbeat_events = test_agent_session.get_events("app-heartbeat", filter_heartbeats=False)
     assert len(heartbeat_events) == 1