datadog-checks-base 37.9.0__py2.py3-none-any.whl → 37.10.0__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.9.0"
+__version__ = "37.10.0"

datadog_checks/base/checks/openmetrics/v2/scraper.py

@@ -230,13 +230,13 @@ class OpenMetricsScraper:
         self.use_process_start_time = is_affirmative(config.get('use_process_start_time'))
 
         # Used for monotonic counts
-        self.flush_first_value = False
+        self.flush_first_value = None
 
-    def scrape(self):
+    def _scrape(self):
         """
         Execute a scrape, and for each metric collected, transform the metric.
         """
-        runtime_data = {'flush_first_value': self.flush_first_value, 'static_tags': self.static_tags}
+        runtime_data = {'flush_first_value': bool(self.flush_first_value), 'static_tags': self.static_tags}
 
         # Determine which consume method to use based on target_info config
         if self.target_info:
@@ -251,7 +251,18 @@ class OpenMetricsScraper:
 
             transformer(metric, self.generate_sample_data(metric), runtime_data)
 
-        self.flush_first_value = True
+    def scrape(self):
+        try:
+            self._scrape()
+            self.flush_first_value = True
+        except:
+            # Don't flush new monotonic counts on next scrape:
+            # 1. Previous value may have expired in the aggregator, causing a spike
+            # 2. New counter itself may be too old and large when we discover it next time.
+            # If we didn't have a successful scrape yet, keep the initial value (use process_start_time to decide).
+            if self.flush_first_value:
+                self.flush_first_value = False
+            raise
 
     def consume_metrics(self, runtime_data):
         """
@@ -260,7 +271,7 @@ class OpenMetricsScraper:
 
         metric_parser = self.parse_metrics()
 
-        if not self.flush_first_value and self.use_process_start_time:
+        if self.flush_first_value is None and self.use_process_start_time:
             metric_parser = first_scrape_handler(metric_parser, runtime_data, datadog_agent.get_process_start_time())
         if self.label_aggregator.configured:
             metric_parser = self.label_aggregator(metric_parser)
@@ -283,7 +294,7 @@ class OpenMetricsScraper:
 
         metric_parser = self.parse_metrics()
 
-        if not self.flush_first_value and self.use_process_start_time:
+        if self.flush_first_value is None and self.use_process_start_time:
             metric_parser = first_scrape_handler(metric_parser, runtime_data, datadog_agent.get_process_start_time())
         if self.label_aggregator.configured:
             metric_parser = self.label_aggregator(metric_parser)

datadog_checks/base/utils/db/statement_metrics.py

@@ -13,9 +13,7 @@ class StatementMetrics:
 
         - Postgres: pg_stat_statements
         - MySQL: performance_schema.events_statements_summary_by_digest
-        - Oracle: V$SQLAREA
         - SQL Server: sys.dm_exec_query_stats
-        - DB2: mon_db_summary
 
     These tables are monotonically increasing, so the metrics are computed from the difference
     in values between check runs.
@@ -24,7 +22,7 @@ class StatementMetrics:
     def __init__(self):
         self._previous_statements = {}
 
-    def compute_derivative_rows(self, rows, metrics, key):
+    def compute_derivative_rows(self, rows, metrics, key, execution_indicators=None):
         """
         Compute the first derivative of column-based metrics for a given set of rows. This function
         takes the difference of the previous check run's values and the current check run's values
@@ -41,10 +39,20 @@ class StatementMetrics:
         :params rows (_List[dict]_): rows from current check run
         :params metrics (_List[str]_): the metrics to compute for each row
         :params key (_callable_): function for an ID which uniquely identifies a row across runs
+        :params execution_indicators (_List[str]_): list of metrics that must change to consider a query as executed.
+            These are typically metrics that increment only when a query actually executes, such as:
+            - PostgreSQL: 'calls' from pg_stat_statements
+            - MySQL: 'exec_count' from performance_schema.events_statements_summary_by_digest
+            - SQL Server: 'execution_count' from sys.dm_exec_query_stats
+            This helps filter out cases where a normalized query was evicted then re-inserted with same call count
+            (usually 1) and slight duration change. In this case, the new normalized query entry should be treated
+            as the baseline for future diffs.
         :return (_List[dict]_): a list of rows with the first derivative of the metrics
         """
         result = []
         metrics = set(metrics)
+        if execution_indicators:
+            execution_indicators = set(execution_indicators)
 
         merged_rows, dropped_metrics = _merge_duplicate_rows(rows, metrics, key)
         if dropped_metrics:
@@ -69,6 +77,12 @@ class StatementMetrics:
             # 2. No changes since the previous run: There is no need to store metrics of 0, since that is implied by
             #    the absence of metrics. On any given check run, most rows will have no difference so this optimization
             #    avoids having to send a lot of unnecessary metrics.
+            #
+            # 3. Execution indicators: If execution_indicators is specified, only consider a query as changed if at
+            #    least one of the execution indicator metrics has changed. This helps filter out cases where an old or
+            #    less frequently executed normalized query was evicted due to the stats table being full, and then
+            #    re-inserted to the stats table with a small call count and slight duration change. In this case,
+            #    the new normalized query entry should be treated as the baseline for future diffs.
 
             diffed_row = {k: row[k] - prev[k] if k in metric_columns else row[k] for k in row.keys()}
 
@@ -79,6 +93,12 @@ class StatementMetrics:
                 # of potentially including truncated rows that exceed previous run counts.
                 continue
 
+            # If execution_indicators is specified, check if any of the execution indicator metrics have changed
+            if execution_indicators:
+                indicator_columns = execution_indicators & metric_columns
+                if not any(diffed_row[k] > 0 for k in indicator_columns):
+                    continue
+
             # No changes to the query; no metric needed
             if all(diffed_row[k] == 0 for k in metric_columns):
                 continue

{datadog_checks_base-37.9.0.dist-info → datadog_checks_base-37.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datadog-checks-base
-Version: 37.9.0
+Version: 37.10.0
 Summary: The Datadog Check Toolkit
 Project-URL: Source, https://github.com/DataDog/integrations-core
 Author-email: Datadog <packages@datadoghq.com>
@@ -17,33 +17,34 @@ Requires-Dist: mmh3==5.1.0; extra == 'db'
 Provides-Extra: deps
 Requires-Dist: binary==1.0.1; extra == 'deps'
 Requires-Dist: cachetools==5.5.2; extra == 'deps'
-Requires-Dist: cryptography==44.0.1; extra == 'deps'
-Requires-Dist: ddtrace==2.10.6; extra == 'deps'
+Requires-Dist: cryptography==44.0.2; extra == 'deps'
+Requires-Dist: ddtrace==2.21.4; extra == 'deps'
 Requires-Dist: jellyfish==1.1.3; extra == 'deps'
 Requires-Dist: lazy-loader==0.4; extra == 'deps'
 Requires-Dist: prometheus-client==0.21.1; extra == 'deps'
-Requires-Dist: protobuf==5.29.3; extra == 'deps'
-Requires-Dist: pydantic==2.10.6; extra == 'deps'
+Requires-Dist: protobuf==6.30.2; extra == 'deps'
+Requires-Dist: pydantic==2.11.1; extra == 'deps'
 Requires-Dist: python-dateutil==2.9.0.post0; extra == 'deps'
-Requires-Dist: pywin32==308; (sys_platform == 'win32') and extra == 'deps'
+Requires-Dist: pywin32==310; (sys_platform == 'win32') and extra == 'deps'
 Requires-Dist: pyyaml==6.0.2; extra == 'deps'
 Requires-Dist: requests-toolbelt==1.0.0; extra == 'deps'
 Requires-Dist: requests-unixsocket2==0.4.2; extra == 'deps'
 Requires-Dist: requests==2.32.3; extra == 'deps'
 Requires-Dist: simplejson==3.20.1; extra == 'deps'
+Requires-Dist: urllib3==2.3.0; extra == 'deps'
 Requires-Dist: wrapt==1.17.2; extra == 'deps'
 Provides-Extra: http
 Requires-Dist: aws-requests-auth==0.4.3; extra == 'http'
-Requires-Dist: botocore==1.36.26; extra == 'http'
+Requires-Dist: botocore==1.37.23; extra == 'http'
 Requires-Dist: oauthlib==3.2.2; extra == 'http'
 Requires-Dist: pyjwt==2.10.1; extra == 'http'
-Requires-Dist: pyopenssl==24.3.0; extra == 'http'
+Requires-Dist: pyopenssl==25.0.0; extra == 'http'
 Requires-Dist: pysocks==1.7.1; extra == 'http'
 Requires-Dist: requests-kerberos==0.15.0; extra == 'http'
 Requires-Dist: requests-ntlm==1.3.0; extra == 'http'
 Requires-Dist: requests-oauthlib==2.0.0; extra == 'http'
 Provides-Extra: json
-Requires-Dist: orjson==3.10.15; extra == 'json'
+Requires-Dist: orjson==3.10.16; extra == 'json'
 Provides-Extra: kube
 Requires-Dist: kubernetes==32.0.1; extra == 'kube'
 Requires-Dist: requests-oauthlib==2.0.0; extra == 'kube'

{datadog_checks_base-37.9.0.dist-info → datadog_checks_base-37.10.0.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=iGqq-S-VDNzq-lXJgI6gEsOyXzbc8iNlsKUM6mQR6Do,138
+datadog_checks/base/__about__.py,sha256=eaRgo1wpoLueTRCL1MT8Qbkyi7huHv28bFzrJ1RIWcU,139
 datadog_checks/base/__init__.py,sha256=yWegSLE-TZWIGSvAiJj9PSrUxzlOo_UVJLt2zORZ8Ek,363
 datadog_checks/base/__init__.pyi,sha256=eH8XhrtvnD6uE6FWfEyCmKwOaaLJxNolS08D6IRHZuU,995
 datadog_checks/base/agent.py,sha256=nX9x_BYYizRKGNYfXq5z7S0FZ9xcX_wd2tuxpGe3_8k,350
@@ -44,7 +44,7 @@ datadog_checks/base/checks/openmetrics/v2/base.py,sha256=UXytG0ze00rXU13VB0BM_ZK
 datadog_checks/base/checks/openmetrics/v2/first_scrape_handler.py,sha256=In-tZXMzieSdL2OXJlIAFi78KbQVwuJnGP0iaLH9974,941
 datadog_checks/base/checks/openmetrics/v2/labels.py,sha256=JAIlxAtzQAFoEj1d9IYLZCGt-2M3-ClyyGjZ-VzKNQY,8907
 datadog_checks/base/checks/openmetrics/v2/metrics.py,sha256=uDVZOHHRWMW8YUQZBY9jCLzecN5DueRNjImxBm1K82k,2189
-datadog_checks/base/checks/openmetrics/v2/scraper.py,sha256=PgZzohf1X1MdbzD3e1Q_tLYDAgK6l7I6bV7_4AFljtw,24731
+datadog_checks/base/checks/openmetrics/v2/scraper.py,sha256=17DV_gS0Lks7EnPYpE30cV4gzvAF1Koppc2_nuFPKEQ,25286
 datadog_checks/base/checks/openmetrics/v2/transform.py,sha256=qv7Y1yvqWm-269mGU7Oq0it8x3VkWUZU2m2d3q-VJZ0,8377
 datadog_checks/base/checks/openmetrics/v2/utils.py,sha256=tpk3htJAz_KwCRqFs2CTjajHkLCs_2TbGdBp514rWOQ,3565
 datadog_checks/base/checks/openmetrics/v2/transformers/__init__.py,sha256=bqHxA7SxvyJzSyLdNfISOPtJKyF132bHkzdrMaKbjoA,211
@@ -139,7 +139,7 @@ datadog_checks/base/utils/db/core.py,sha256=sVHdY5Z0dx6UM6IWZwB70HxiWDITNE26Rjff
 datadog_checks/base/utils/db/query.py,sha256=TjyVNjxjNIB21bcIft6f-5b3algDPtdttHcAS2BdUuc,14462
 datadog_checks/base/utils/db/sql.py,sha256=oiEzQa_vC_w3U65VFrFCoQHWj5GQLLRlSO0CfiSlp4A,2490
 datadog_checks/base/utils/db/sql_commenter.py,sha256=r_efK6TGRQxM_-Qj-ndEJdECk47J4nCFjkVyxu1XmvU,1522
-datadog_checks/base/utils/db/statement_metrics.py,sha256=S0kHPoFqCZtRTZoTI6Pi-Zul6Iue8Y3j1_ksNH-zEo8,5398
+datadog_checks/base/utils/db/statement_metrics.py,sha256=U7EtERkmFzfCtfyd3094fBaKQ-CuJxoRt-3AcDBCkIA,7087
 datadog_checks/base/utils/db/timed_cache.py,sha256=a9Ks5KKUvExB6GOATXTSCLamVtLD919Dn6HpweGKtFw,2114
 datadog_checks/base/utils/db/transform.py,sha256=kNdiBZVoZm1oNRNWIatrAfgORjbkRKhs1AgW_aQCj3I,23879
 datadog_checks/base/utils/db/types.py,sha256=OLX2Oq58JQPFBD4oqUpCLkAP7ovRGN_i1vFk1E0N8Lg,267
@@ -217,6 +217,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.9.0.dist-info/METADATA,sha256=9XzjIX_1_haGzFBTjX5ZUNFvw36z_f2g2HaTvOErW5I,4198
-datadog_checks_base-37.9.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-datadog_checks_base-37.9.0.dist-info/RECORD,,
+datadog_checks_base-37.10.0.dist-info/METADATA,sha256=X3o_eQIQVR5O5Seeb9jsmrHQU63xXTUxMbOiXkUhg6E,4246
+datadog_checks_base-37.10.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+datadog_checks_base-37.10.0.dist-info/RECORD,,