Browse Source

ref: upgrade datadog to 0.39 (#60995)

a hop between the old version and the one that I know broke things...
this time with monitoring in place to catch the breakage to hopefully
pin down the change which causes it
anthony sottile 1 year ago
parent
commit
70761b541d

+ 1 - 1
requirements-base.txt

@@ -9,7 +9,7 @@ click>=8.1
 confluent-kafka>=2.1.1
 croniter>=1.3.10
 cssselect>=1.0.3
-datadog>=0.31.0
+datadog>=0.39.0
 django-crispy-forms>=1.14.0
 django-csp>=3.7
 django-pg-zero-downtime-migrations>=0.13

+ 1 - 1
requirements-dev-frozen.txt

@@ -37,7 +37,7 @@ croniter==1.3.10
 cryptography==39.0.1
 cssselect==1.0.3
 cssutils==2.4.0
-datadog==0.31.0
+datadog==0.39.0
 decorator==5.1.1
 dictpath==0.1.3
 distlib==0.3.4

+ 1 - 1
requirements-frozen.txt

@@ -31,7 +31,7 @@ croniter==1.3.10
 cryptography==39.0.1
 cssselect==1.0.3
 cssutils==2.4.0
-datadog==0.31.0
+datadog==0.39.0
 decorator==5.1.1
 distro==1.8.0
 django==3.2.23

+ 2 - 1
src/sentry/metrics/datadog.py

@@ -2,7 +2,8 @@ __all__ = ["DatadogMetricsBackend"]
 
 from typing import Any, Optional, Union
 
-from datadog import ThreadStats, initialize
+from datadog import initialize
+from datadog.threadstats.base import ThreadStats
 from datadog.util.hostname import get_hostname
 
 from sentry.utils.cache import memoize

+ 3 - 1
src/sentry/metrics/dogstatsd.py

@@ -1,6 +1,7 @@
 from typing import Any, Optional, Union
 
-from datadog import initialize, statsd
+from datadog import initialize
+from datadog.dogstatsd.base import statsd
 
 from .base import MetricsBackend, Tags
 
@@ -12,6 +13,7 @@ class DogStatsdMetricsBackend(MetricsBackend):
         # TODO(dcramer): it'd be nice if the initialize call wasn't a global
         self.tags = kwargs.pop("tags", None)
         initialize(**kwargs)
+        statsd.disable_telemetry()
         super().__init__(prefix=prefix)
 
     def incr(