Revert "[DBMON-2989] report sql obfuscation error count (#15990)" (#1…

…6439)
DataDog · Dec 21, 2023 · c0492e4 · c0492e4
1 parent 6ba77bb
commit c0492e4
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 39 deletions.
diff --git a/mysql/changelog.d/16439.fixed b/mysql/changelog.d/16439.fixed
@@ -0,0 +1 @@
+Revert "[DBMON-2989] report sql obfuscation error count (#15990)"
diff --git a/mysql/datadog_checks/mysql/activity.py b/mysql/datadog_checks/mysql/activity.py
@@ -96,6 +96,7 @@ def agent_check_getter(self):
 
 
 class MySQLActivity(DBMAsyncJob):
+
     DEFAULT_COLLECTION_INTERVAL = 10
     MAX_PAYLOAD_BYTES = 19e6
 
@@ -212,12 +213,6 @@ def _obfuscate_and_sanitize_row(self, row):
             else:
                 self._log.debug("Failed to obfuscate query | err=[%s]", e)
             row["sql_text"] = "ERROR: failed to obfuscate"
-            self._check.count(
-                "dd.mysql.obfuscation.error",
-                1,
-                tags=self.tags + ["error:{}".format(type(e)), "error_msg:{}".format(e)] + self._check._get_debug_tags(),
-                hostname=self._check.resolved_hostname,
-            )
         return row
 
     @staticmethod

diff --git a/mysql/datadog_checks/mysql/statements.py b/mysql/datadog_checks/mysql/statements.py
@@ -210,14 +210,6 @@ def _normalize_queries(self, rows):
                 obfuscated_statement = statement['query'] if row['digest_text'] is not None else None
             except Exception as e:
                 self.log.warning("Failed to obfuscate query=[%s] | err=[%s]", row['digest_text'], e)
-                self._check.count(
-                    "dd.mysql.obfuscation.error",
-                    1,
-                    tags=self.tags
-                    + ["error:{}".format(type(e)), "error_msg:{}".format(e)]
-                    + self._check._get_debug_tags(),
-                    hostname=self._check.resolved_hostname,
-                )
                 continue
 
             normalized_row['digest_text'] = obfuscated_statement

diff --git a/postgres/changelog.d/16439.fixed b/postgres/changelog.d/16439.fixed
@@ -0,0 +1 @@
+Revert "[DBMON-2989] report sql obfuscation error count (#15990)"
diff --git a/postgres/datadog_checks/postgres/statement_samples.py b/postgres/datadog_checks/postgres/statement_samples.py
@@ -401,13 +401,6 @@ def _normalize_row(self, row):
                 tags=self._dbtags(row['datname'], "error:sql-obfuscate") + self._check._get_debug_tags(),
                 hostname=self._check.resolved_hostname,
             )
-            self._check.count(
-                "dd.postgres.obfuscation.error",
-                1,
-                tags=self._dbtags(row['datname'], "error:{}".format(type(e)), "error_msg:{}".format(e))
-                + self._check._get_debug_tags(),
-                hostname=self._check.resolved_hostname,
-            )
         normalized_row['statement'] = obfuscated_query
         return normalized_row
 

diff --git a/postgres/datadog_checks/postgres/statements.py b/postgres/datadog_checks/postgres/statements.py
@@ -429,14 +429,6 @@ def _normalize_queries(self, rows):
                     self._log.warning("Failed to obfuscate query=[%s] | err=[%s]", row['query'], e)
                 else:
                     self._log.debug("Failed to obfuscate query | err=[%s]", e)
-                self._check.count(
-                    "dd.postgres.obfuscation.error",
-                    1,
-                    tags=self.tags
-                    + ["error:{}".format(type(e)), "error_msg:{}".format(e)]
-                    + self._check._get_debug_tags(),
-                    hostname=self._check.resolved_hostname,
-                )
                 continue
 
             obfuscated_query = statement['query']

diff --git a/sqlserver/changelog.d/16439.fixed b/sqlserver/changelog.d/16439.fixed
@@ -0,0 +1 @@
+Revert "[DBMON-2989] report sql obfuscation error count (#15990)"
diff --git a/sqlserver/datadog_checks/sqlserver/activity.py b/sqlserver/datadog_checks/sqlserver/activity.py
@@ -300,11 +300,6 @@ def _obfuscate_and_sanitize_row(self, row):
             else:
                 self.log.debug("Failed to obfuscate query | err=[%s]", e)
             obfuscated_statement = "ERROR: failed to obfuscate"
-            self._check.count(
-                "dd.sqlserver.obfuscation.error",
-                1,
-                **self._check.debug_stats_kwargs(tags=["error:{}".format(type(e)), "error_msg:{}".format(e)])
-            )
         row = self._sanitize_row(row, obfuscated_statement)
         return row
 

diff --git a/sqlserver/datadog_checks/sqlserver/statements.py b/sqlserver/datadog_checks/sqlserver/statements.py
@@ -328,11 +328,6 @@ def _normalize_queries(self, rows):
                     1,
                     **self._check.debug_stats_kwargs(tags=["error:obfuscate-query-{}".format(type(e))])
                 )
-                self._check.count(
-                    "dd.sqlserver.obfuscation.error",
-                    1,
-                    **self._check.debug_stats_kwargs(tags=["error:{}".format(type(e)), "error_msg:{}".format(e)])
-                )
                 continue
 
             # Extract obfuscated statement and update row fields