Revert "Allow multiple dogstatsd instances, record precise timing distributions (#97662)"

This reverts commit 6a7c58d.

Co-authored-by: untitaker <[email protected]>

Author: 2 people

src/sentry/metrics/base.py

@@ -52,7 +52,6 @@ def timing(
         tags: Tags | None = None,
         sample_rate: float = 1,
         stacklevel: int = 0,
-        precise: bool = False,
     ) -> None:
         raise NotImplementedError
 

src/sentry/metrics/datadog.py

@@ -64,7 +64,6 @@ def timing(
         tags: Tags | None = None,
         sample_rate: float = 1,
         stacklevel: int = 0,
-        precise: bool = False,
     ) -> None:
         tags = dict(tags or ())
 
@@ -74,14 +73,9 @@ def timing(
             tags["instance"] = instance
 
         tags_list = [f"{k}:{v}" for k, v in tags.items()]
-        if not precise:
-            self.stats.timing(
-                self._get_key(key), value, sample_rate=sample_rate, tags=tags_list, host=self.host
-            )
-        else:
-            self.stats.distribution(
-                self._get_key(key), value, sample_rate=sample_rate, tags=tags_list, host=self.host
-            )
+        self.stats.timing(
+            self._get_key(key), value, sample_rate=sample_rate, tags=tags_list, host=self.host
+        )
 
     def gauge(
         self,

src/sentry/metrics/dogstatsd.py

@@ -1,41 +1,45 @@
 import atexit
 from typing import Any
 
-from datadog.dogstatsd.base import DogStatsd
+from datadog import initialize
+from datadog.dogstatsd.base import statsd
 
 from .base import MetricsBackend, Tags
 
 __all__ = ["DogStatsdMetricsBackend"]
 
+# Set the maximum number of packets to queue for the sender.
+# How may packets to queue before blocking or dropping the packet if the packet queue is already full.
+# 0 means unlimited.
+SENDER_QUEUE_SIZE = 0
+
+# Set timeout for packet queue operations, in seconds
+# How long the application thread is willing to wait for the queue clear up before dropping the metric packet.
+# If set to None, wait forever.
+# If set to zero drop the packet immediately if the queue is full.
+SENDER_QUEUE_TIMEOUT = 0
+
 
 class DogStatsdMetricsBackend(MetricsBackend):
     def __init__(self, prefix: str | None = None, **kwargs: Any) -> None:
+        # TODO(dcramer): it'd be nice if the initialize call wasn't a global
         self.tags = kwargs.pop("tags", None)
+        kwargs["statsd_disable_buffering"] = False
+
+        initialize(**kwargs)
+        statsd.disable_telemetry()
 
-        instance_kwargs: dict[str, Any] = {
-            "disable_telemetry": True,
-            "disable_buffering": False,
-            # When enabled, a background thread will be used to send metric payloads to the Agent.
-            "disable_background_sender": False,
-        }
-        if socket_path := kwargs.get("statsd_socket_path"):
-            instance_kwargs["socket_path"] = socket_path
-        else:
-            if host := kwargs.get("statsd_host"):
-                instance_kwargs["host"] = host
-            if port := kwargs.get("statsd_port"):
-                instance_kwargs["port"] = int(port)
-
-        self.statsd = DogStatsd(**instance_kwargs)
+        # When enabled, a background thread will be used to send metric payloads to the Agent.
+        statsd.enable_background_sender(
+            sender_queue_size=SENDER_QUEUE_SIZE, sender_queue_timeout=SENDER_QUEUE_TIMEOUT
+        )
+        # Applications should call wait_for_pending() before exiting to make sure all pending payloads are sent.
+        atexit.register(statsd.wait_for_pending)
 
         # Origin detection is enabled after 0.45 by default.
         # Disable it since it silently fails.
         # Ref: https://github.com/DataDog/datadogpy/issues/764
-        self.statsd._container_id = None
-
-        # Applications should call wait_for_pending() before exiting to make sure all pending payloads are sent.
-        atexit.register(self.statsd.wait_for_pending)
-
+        statsd._container_id = None
         super().__init__(prefix=prefix)
 
     def incr(
@@ -56,7 +60,7 @@ def incr(
             tags["instance"] = instance
 
         tags_list = [f"{k}:{v}" for k, v in tags.items()]
-        self.statsd.increment(self._get_key(key), amount, sample_rate=sample_rate, tags=tags_list)
+        statsd.increment(self._get_key(key), amount, sample_rate=sample_rate, tags=tags_list)
 
     def timing(
         self,
@@ -66,7 +70,6 @@ def timing(
         tags: Tags | None = None,
         sample_rate: float = 1,
         stacklevel: int = 0,
-        precise: bool = False,
     ) -> None:
         tags = dict(tags or ())
 
@@ -76,12 +79,7 @@ def timing(
             tags["instance"] = instance
 
         tags_list = [f"{k}:{v}" for k, v in tags.items()]
-        if not precise:
-            self.statsd.timing(self._get_key(key), value, sample_rate=sample_rate, tags=tags_list)
-        else:
-            self.statsd.distribution(
-                self._get_key(key), value, sample_rate=sample_rate, tags=tags_list
-            )
+        statsd.timing(self._get_key(key), value, sample_rate=sample_rate, tags=tags_list)
 
     def gauge(
         self,
@@ -101,7 +99,7 @@ def gauge(
             tags["instance"] = instance
 
         tags_list = [f"{k}:{v}" for k, v in tags.items()]
-        self.statsd.gauge(self._get_key(key), value, sample_rate=sample_rate, tags=tags_list)
+        statsd.gauge(self._get_key(key), value, sample_rate=sample_rate, tags=tags_list)
 
     def distribution(
         self,
@@ -126,7 +124,7 @@ def distribution(
             tags["instance"] = instance
 
         tags_list = [f"{k}:{v}" for k, v in tags.items()]
-        self.statsd.distribution(self._get_key(key), value, sample_rate=sample_rate, tags=tags_list)
+        statsd.distribution(self._get_key(key), value, sample_rate=sample_rate, tags=tags_list)
 
     def event(
         self,
@@ -148,7 +146,7 @@ def event(
             tags["instance"] = instance
 
         tags_list = [f"{k}:{v}" for k, v in tags.items()]
-        self.statsd.event(
+        statsd.event(
             title=title,
             message=message,
             alert_type=alert_type,

src/sentry/metrics/dummy.py

@@ -24,7 +24,6 @@ def timing(
         tags: Tags | None = None,
         sample_rate: float = 1,
         stacklevel: int = 0,
-        precise: bool = False,
     ) -> None:
         pass
 

src/sentry/metrics/logging.py

@@ -26,7 +26,6 @@ def timing(
         tags: Tags | None = None,
         sample_rate: float = 1,
         stacklevel: int = 0,
-        precise: bool = False,
     ) -> None:
         logger.debug(
             "%r: %g ms", key, value * 1000, extra={"instance": instance, "tags": tags or {}}

src/sentry/metrics/middleware.py

@@ -144,16 +144,13 @@ def timing(
         tags: Tags | None = None,
         sample_rate: float = 1,
         stacklevel: int = 0,
-        precise: bool = False,
     ) -> None:
         current_tags = get_current_global_tags()
         if tags is not None:
             current_tags.update(tags)
         current_tags = _filter_tags(key, current_tags)
 
-        return self.inner.timing(
-            key, value, instance, current_tags, sample_rate, stacklevel + 1, precise
-        )
+        return self.inner.timing(key, value, instance, current_tags, sample_rate, stacklevel + 1)
 
     def gauge(
         self,

src/sentry/metrics/statsd.py

@@ -37,7 +37,6 @@ def timing(
         tags: Tags | None = None,
         sample_rate: float = 1,
         stacklevel: int = 0,
-        precise: bool = False,
     ) -> None:
         self.client.timing(self._full_key(self._get_key(key)), value, sample_rate)
 

src/sentry/utils/metrics.py

@@ -178,9 +178,7 @@ def timing(
 
     if precise and precise_backend:
         try:
-            precise_backend.timing(
-                key, value, instance, tags, sample_rate, stacklevel + 1, precise=True
-            )
+            precise_backend.timing(key, value, instance, tags, sample_rate, stacklevel + 1)
         except Exception:
             logger = logging.getLogger("sentry.errors")
             logger.exception("Unable to record precise metric")