chore(telemetry): remove skipped and remove some logs from telemetry

Author: dubloom

ddtrace/internal/telemetry/logging.py

@@ -1,5 +1,6 @@
 import logging
 import os
+import re
 
 
 class DDTelemetryErrorHandler(logging.Handler):
@@ -15,4 +16,6 @@ def emit(self, record: logging.LogRecord) -> None:
         """
         if record.levelno >= logging.ERROR:
             if getattr(record, "send_to_telemetry", None) in (None, True):
-                self.telemetry_writer.add_error_log(record.msg, record.exc_info)
+                # we do not want to send the [x skipped] part to telemetry
+                msg = re.sub(r"\s*\[\d+ skipped\]$", "", record.msg)
+                self.telemetry_writer.add_error_log(msg, record.exc_info)

ddtrace/internal/writer/writer.py

@@ -448,6 +448,7 @@ def _flush_single_payload(
                     self._intake_endpoint(client),
                     self.RETRY_ATTEMPTS,
                     exc_info=True,
+                    extra={"send_to_telemetry": False},
                 )
         finally:
             self._metrics_dist("http.sent.bytes", len(encoded))

ddtrace/llmobs/_log_writer.py

@@ -104,10 +104,17 @@ def periodic(self):
                     self._url,
                     resp.status,
                     resp.read(),
+                    extra={"send_to_telemetry": False},
                 )
             else:
                 logger.debug("sent %d logs to %r", num_logs, self._url)
         except Exception:
-            logger.error("failed to send %d logs to %r", num_logs, self._intake, exc_info=True)
+            logger.error(
+                "failed to send %d logs to %r",
+                num_logs,
+                self._intake,
+                exc_info=True,
+                extra={"send_to_telemetry": False},
+            )
         finally:
             conn.close()

ddtrace/llmobs/_writer.py

@@ -246,7 +246,12 @@ def periodic(self) -> None:
         except Exception:
             telemetry.record_dropped_payload(len(events), event_type=self.EVENT_TYPE, error="connection_error")
             logger.error(
-                "failed to send %d LLMObs %s events to %s", len(events), self.EVENT_TYPE, self._intake, exc_info=True
+                "failed to send %d LLMObs %s events to %s",
+                len(events),
+                self.EVENT_TYPE,
+                self._intake,
+                exc_info=True,
+                extra={"send_to_telemetry": False},
             )
 
     def _send_payload(self, payload: bytes, num_events: int):
@@ -262,14 +267,20 @@ def _send_payload(self, payload: bytes, num_events: int):
                     self._url,
                     resp.status,
                     resp.read(),
+                    extra={"send_to_telemetry": False},
                 )
                 telemetry.record_dropped_payload(num_events, event_type=self.EVENT_TYPE, error="http_error")
             else:
                 logger.debug("sent %d LLMObs %s events to %s", num_events, self.EVENT_TYPE, self._url)
             return Response.from_http_response(resp)
         except Exception:
             logger.error(
-                "failed to send %d LLMObs %s events to %s", num_events, self.EVENT_TYPE, self._intake, exc_info=True
+                "failed to send %d LLMObs %s events to %s",
+                num_events,
+                self.EVENT_TYPE,
+                self._intake,
+                exc_info=True,
+                extra={"send_to_telemetry": False},
             )
             raise
         finally:

ddtrace/propagation/http.py

@@ -826,7 +826,7 @@ def _extract(headers):
                 return None
             trace_id, span_id, trace_flag = _TraceContext._get_traceparent_values(tp)
         except (ValueError, AssertionError):
-            log.exception("received invalid w3c traceparent: %s ", tp)
+            log.exception("received invalid w3c traceparent: %s ", tp, extra={"send_to_telemetry": False})
             return None
 
         meta = {W3C_TRACEPARENT_KEY: tp}  # type: _MetaDictType

tests/telemetry/test_writer.py

@@ -1102,6 +1102,35 @@ def test_add_integration_error_log_with_log_collection_disabled(mock_time, telem
         telemetry_config.LOG_COLLECTION_ENABLED = original_value
 
 
+def test_error_log_handler_strips_skipped_suffix(mock_time, telemetry_writer, test_agent_session):
+    """Test that DDTelemetryErrorHandler strips [x skipped] suffix from error messages"""
+    import logging
+
+    ddtrace_logger = logging.getLogger("ddtrace")
+
+    ddtrace_logger.error("Error message [123 skipped]")
+    telemetry_writer.periodic(force_flush=True)
+
+    log_events = test_agent_session.get_events("logs")
+    assert len(log_events) == 1
+
+    logs = log_events[0]["payload"]["logs"]
+    assert len(logs) == 1
+    assert logs[0]["message"] == "Error message"
+
+    test_agent_session.clear()
+
+    ddtrace_logger.error("Normal error message [something]")
+    telemetry_writer.periodic(force_flush=True)
+
+    log_events = test_agent_session.get_events("logs")
+    assert len(log_events) == 1
+
+    logs = log_events[0]["payload"]["logs"]
+    assert len(logs) == 1
+    assert logs[0]["message"] == "Normal error message [something]"
+
+
 @pytest.mark.parametrize(
     "filename, result",
     [