Double write metrics to new datadog

snuba/settings/__init__.py

@@ -130,6 +130,9 @@
 }
 DDM_METRICS_SAMPLE_RATE = float(os.environ.get("SNUBA_DDM_METRICS_SAMPLE_RATE", 0.01))
 
+NEW_DOGSTATSD_HOST: str | None = os.environ.get("SNUBA_NEW_STATSD_HOST") or None
+NEW_DOGSTATSD_PORT: int | None = int(os.environ.get("SNUBA_NEW_STATSD_PORT") or 0) or None
+
 CLICKHOUSE_READONLY_USER = os.environ.get("CLICKHOUSE_READONLY_USER", "default")
 CLICKHOUSE_READONLY_PASSWORD = os.environ.get("CLICKHOUSE_READONLY_PASSWORD", "")
 

snuba/utils/metrics/backends/dualwrite.py

@@ -15,10 +15,14 @@ class SentryDatadogMetricsBackend(MetricsBackend):
     """
 
     def __init__(
-        self, datadog: DatadogMetricsBackend, sentry: SentryMetricsBackend
+        self,
+        datadog: DatadogMetricsBackend,
+        sentry: SentryMetricsBackend,
+        new_datadog: DatadogMetricsBackend | None = None,
     ) -> None:
         self.datadog = datadog
         self.sentry = sentry
+        self.new_datadog = new_datadog
 
     def _use_sentry(self) -> bool:
         from snuba import state
@@ -27,6 +31,11 @@ def _use_sentry(self) -> bool:
             return bool(random.random() < settings.DDM_METRICS_SAMPLE_RATE)
         return False
 
+    def _use_new_datadog(self) -> bool:
+        from snuba import state
+
+        return str(state.get_config("use_new_datadog_metrics", "0")) == "1"
+
     def increment(
         self,
         name: str,
@@ -37,6 +46,8 @@ def increment(
         self.datadog.increment(name, value, tags, unit)
         if self._use_sentry():
             self.sentry.increment(name, value, tags, unit)
+        if self._use_new_datadog() and self.new_datadog is not None:
+            self.new_datadog.increment(name, value, tags, unit)
 
     def gauge(
         self,
@@ -48,6 +59,8 @@ def gauge(
         self.datadog.gauge(name, value, tags, unit)
         if self._use_sentry():
             self.sentry.gauge(name, value, tags, unit)
+        if self._use_new_datadog() and self.new_datadog is not None:
+            self.new_datadog.gauge(name, value, tags, unit)
 
     def timing(
         self,
@@ -59,6 +72,8 @@ def timing(
         self.datadog.timing(name, value, tags, unit)
         if self._use_sentry():
             self.sentry.timing(name, value, tags, unit)
+        if self._use_new_datadog() and self.new_datadog is not None:
+            self.new_datadog.timing(name, value, tags, unit)
 
     def distribution(
         self,
@@ -70,6 +85,8 @@ def distribution(
         self.datadog.distribution(name, value, tags, unit)
         if self._use_sentry():
             self.sentry.distribution(name, value, tags, unit)
+        if self._use_new_datadog() and self.new_datadog is not None:
+            self.new_datadog.distribution(name, value, tags, unit)
 
     def events(
         self,
@@ -80,3 +97,5 @@ def events(
         tags: Tags | None = None,
     ) -> None:
         self.datadog.events(title, text, alert_type, priority, tags)
+        if self._use_new_datadog() and self.new_datadog is not None:
+            self.new_datadog.events(title, text, alert_type, priority, tags)

snuba/utils/metrics/util.py

@@ -41,20 +41,39 @@ def create_metrics(
     from snuba.utils.metrics.backends.dualwrite import SentryDatadogMetricsBackend
     from snuba.utils.metrics.backends.sentry import SentryMetricsBackend
 
+    new_datadog_host: Optional[str] = settings.NEW_DOGSTATSD_HOST
+    new_datadog_port: Optional[int] = settings.NEW_DOGSTATSD_PORT
+    new_datadog_backend: Optional[DatadogMetricsBackend] = None
+
+    if new_datadog_host and new_datadog_port:
+        new_datadog_backend = DatadogMetricsBackend(
+            partial(
+                DogStatsd,
+                host=host,
+                port=port,
+                namespace=prefix,
+                constant_tags=(
+                    [f"{key}:{value}" for key, value in tags.items()] if tags is not None else None
+                ),
+            ),
+            sample_rates,
+        )
+
     return SentryDatadogMetricsBackend(
         DatadogMetricsBackend(
             partial(
                 DogStatsd,
                 host=host,
                 port=port,
                 namespace=prefix,
-                constant_tags=[f"{key}:{value}" for key, value in tags.items()]
-                if tags is not None
-                else None,
+                constant_tags=(
+                    [f"{key}:{value}" for key, value in tags.items()] if tags is not None else None
+                ),
             ),
             sample_rates,
         ),
         SentryMetricsBackend(),
+        new_datadog_backend,
     )