datadog-checks-base 37.22.0__py2.py3-none-any.whl → 37.22.1__py2.py3-none-any.whl

datadog_checks/base/__about__.py

@@ -1,4 +1,4 @@
 # (C) Datadog, Inc. 2018-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-__version__ = "37.22.0"
+__version__ = "37.22.1"

datadog_checks/base/utils/db/utils.py

@@ -110,7 +110,7 @@ class ConstantRateLimiter:
 
     def __init__(self, rate_limit_s, max_sleep_chunk_s=5):
         """
-        :param rate_limit_s: rate limit in seconds
+        :param rate_limit_s: rate limit in executions per second
         :param max_sleep_chunk_s: maximum size of each sleep chunk while waiting for the next period
         """
         self.rate_limit_s = max(rate_limit_s, 0)
@@ -305,7 +305,9 @@ class DBMAsyncJob(object):
     ):
         self._check = check
         self._config_host = config_host
+        # The min_collection_interval is the expected collection interval for the main check
         self._min_collection_interval = min_collection_interval
+        self._expected_collection_interval = 1 / rate_limit if rate_limit > 0 else 0
         # map[dbname -> psycopg connection]
         self._log = get_check_logger()
         self._job_loop_future = None
@@ -358,12 +360,12 @@ class DBMAsyncJob(object):
             if (
                 hasattr(self._check, 'health')
                 and self._enable_missed_collection_event
-                and self._min_collection_interval >= 1
+                and self._expected_collection_interval >= 1
                 and self._last_run_start
             ):
                 # Assume a collection interval of less than 1 second is an attempt to run the job in a loop
                 elapsed_time = time.time() - self._last_run_start
-                if elapsed_time > self._min_collection_interval:
+                if elapsed_time > self._expected_collection_interval:
                     # Missed a collection interval, submit a health event for each feature that depends on this job
                     for feature in self._features:
                         self._check.health.submit_health_event(
@@ -377,8 +379,10 @@ class DBMAsyncJob(object):
                             data={
                                 "dbms": self._dbms,
                                 "job_name": self._job_name,
-                                "last_run_start": self._last_run_start,
-                                "elapsed_time": (time.time() - self._last_run_start) * 1000,
+                                # send in ms for consistency with other metrics
+                                "last_run_start": self._last_run_start * 1000,
+                                "elapsed_time": elapsed_time * 1000,
+                                "expected_collection_interval": self._expected_collection_interval * 1000,
                                 "feature": feature,
                             },
                         )

{datadog_checks_base-37.22.0.dist-info → datadog_checks_base-37.22.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datadog-checks-base
-Version: 37.22.0
+Version: 37.22.1
 Summary: The Datadog Check Toolkit
 Project-URL: Source, https://github.com/DataDog/integrations-core
 Author-email: Datadog <packages@datadoghq.com>

{datadog_checks_base-37.22.0.dist-info → datadog_checks_base-37.22.1.dist-info}/RECORD

@@ -3,7 +3,7 @@ datadog_checks/config.py,sha256=PrAXGdlLnoV2VMQff_noSaSJJ0wg4BAiGnw7jCQLSik,196
 datadog_checks/errors.py,sha256=eFwmnrX-batIgbu-iJyseqAPNO_4rk1UuaKK89evLhg,155
 datadog_checks/log.py,sha256=orvOgMKGNEsqSTLalCAQpWP-ouorpG1A7Gn-j2mRD80,301
 datadog_checks/py.typed,sha256=la67KBlbjXN-_-DfGNcdOcjYumVpKG_Tkw-8n5dnGB4,8
-datadog_checks/base/__about__.py,sha256=JP31zlaMNXd1vaMqwEefR96nAQreufUfXwUgr65aLNU,139
+datadog_checks/base/__about__.py,sha256=LHTbj6b1TjdvOrdvo82IsglGOmoTwkDhLPngNctW7FA,139
 datadog_checks/base/__init__.py,sha256=yWegSLE-TZWIGSvAiJj9PSrUxzlOo_UVJLt2zORZ8Ek,363
 datadog_checks/base/__init__.pyi,sha256=a4Y1JIcPJ8pz9tRkBAvjWdtvSQwZxbMZBuRmIiSs_4E,1031
 datadog_checks/base/agent.py,sha256=nX9x_BYYizRKGNYfXq5z7S0FZ9xcX_wd2tuxpGe3_8k,350
@@ -149,7 +149,7 @@ datadog_checks/base/utils/db/statement_metrics.py,sha256=U7EtERkmFzfCtfyd3094fBa
 datadog_checks/base/utils/db/timed_cache.py,sha256=a9Ks5KKUvExB6GOATXTSCLamVtLD919Dn6HpweGKtFw,2114
 datadog_checks/base/utils/db/transform.py,sha256=H3JN8_MF0Pk0HaXvIZeX1A8iQrP8KBgS741MPeBiWDo,23969
 datadog_checks/base/utils/db/types.py,sha256=OLX2Oq58JQPFBD4oqUpCLkAP7ovRGN_i1vFk1E0N8Lg,267
-datadog_checks/base/utils/db/utils.py,sha256=GhfrWmuVTOhNtBvPjLLM5t2nOW7HwtpLqBPpWOMV9vU,26092
+datadog_checks/base/utils/db/utils.py,sha256=fJZrf2YcAbWmX4IRqLf4r0Rt8tGLDwgdIVmSMSft1co,26464
 datadog_checks/base/utils/discovery/__init__.py,sha256=vPCOdsThBcBjFJRPhDm6IsZGOwk8HlvciwCe_l8dKLk,211
 datadog_checks/base/utils/discovery/__init__.pyi,sha256=ScVLU1Njj9ekZmewltb0cULI6BylssVHfn4CcPNeyr8,173
 datadog_checks/base/utils/discovery/cache.py,sha256=f9L3A7YZpZ-mpZpFIwjsa5ab9cZMGkqdetdr9EpalbI,887
@@ -223,6 +223,6 @@ datadog_checks/utils/tracing.py,sha256=HQbQakKM-Lw75MDkItaYJYipS6YO24Z_ymDVxDsx5
 datadog_checks/utils/prometheus/__init__.py,sha256=8WwXnM9g1sfS5267QYCJX_hd8MZl5kRgBgQ_SzdNdXs,161
 datadog_checks/utils/prometheus/functions.py,sha256=4vWsTGLgujHwdYZo0tlAQkqDPHofqUJM3k9eItJqERQ,197
 datadog_checks/utils/prometheus/metrics_pb2.py,sha256=xg3UdUHe4TjeR4s13LUKZ2U1WVSt6U6zjsVRG6lX6dc,173
-datadog_checks_base-37.22.0.dist-info/METADATA,sha256=KkZTTQeulKtyL6BaH_OnKuBa0IH9qdE2jRHBPVUylSs,4245
-datadog_checks_base-37.22.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-datadog_checks_base-37.22.0.dist-info/RECORD,,
+datadog_checks_base-37.22.1.dist-info/METADATA,sha256=93hddxC1RfHZzTr2DIbxWE5_78AWLYmqasrpxbej7ng,4245
+datadog_checks_base-37.22.1.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+datadog_checks_base-37.22.1.dist-info/RECORD,,