datadog-checks-base 37.8.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.8.0"
+__version__ = "37.10.0"

datadog_checks/base/checks/base.py

@@ -57,11 +57,6 @@ else:
 
 init_logging()
 
-if datadog_agent.get_config('disable_unsafe_yaml'):
-    from ..ddyaml import monkey_patch_pyyaml
-
-    monkey_patch_pyyaml()
-
 if datadog_agent.get_config('integration_tracing'):
     from ddtrace import patch
 
@@ -386,17 +381,6 @@ class AgentCheck(object):
 
         return limit
 
-    @staticmethod
-    def load_config(yaml_str):
-        # type: (str) -> Any
-        """
-        Convenience wrapper to ease programmatic use of this class from the C API.
-        """
-        # See Performance Optimizations in this package's README.md.
-        import yaml
-
-        return yaml.safe_load(yaml_str)
-
     @property
     def http(self) -> RequestsWrapper:
         """
@@ -1485,3 +1469,28 @@ class AgentCheck(object):
 
         for m in metrics:
             self.gauge(m.name, m.value, tags=tags, raw=True)
+
+    @staticmethod
+    def load_config(yaml_str: str) -> Any:
+        """
+        Convenience wrapper to ease programmatic use of this class from the C API.
+        """
+        import subprocess
+        import sys
+
+        process = subprocess.Popen(
+            [sys.executable, '-c', 'import sys, yaml; print(yaml.safe_load(sys.stdin.read()))'],
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+        )
+        stdout, stderr = process.communicate(yaml_str.encode())
+        if process.returncode != 0:
+            raise ValueError(f'Failed to load config: {stderr.decode()}')
+
+        decoded = stdout.strip().decode()
+        try:
+            return eval(decoded)
+        # a single, literal unquoted string
+        except Exception:
+            return decoded

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/stubs/aggregator.py

@@ -341,6 +341,8 @@ class AggregatorStub(object):
             if expected_tags and expected_tags != sorted(metric.tags):
                 continue
 
+            # to assert hostname is None, pass in hostname as '':
+            # https://github.com/DataDog/integrations-core/blob/7.65.x/datadog_checks_base/datadog_checks/base/checks/base.py#L760
             if hostname is not None and hostname != metric.hostname:
                 continue
 

datadog_checks/base/stubs/datadog_agent.py

@@ -29,7 +29,7 @@ class DatadogAgentStub(object):
         self._sent_telemetry = defaultdict(list)
 
     def get_default_config(self):
-        return {'enable_metadata_collection': True, 'disable_unsafe_yaml': True}
+        return {'enable_metadata_collection': True}
 
     def reset(self):
         self._sent_logs.clear()

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.8.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.8.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.8.0.dist-info → datadog_checks_base-37.10.0.dist-info}/RECORD

@@ -3,19 +3,18 @@ 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=EVn4WsAzbfPpRVpwALFOT9m4PEQOjW2rVwoZ2myUaqw,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
 datadog_checks/base/config.py,sha256=qcAA4X9sXQZRdwQe8DgiGd2980VBp1SQA0d695tX_tU,604
 datadog_checks/base/constants.py,sha256=cR19tAqVysMFbdBWqIGZoHIKk1kGTyqRsCn9FfFQOnw,197
-datadog_checks/base/ddyaml.py,sha256=ZYhEQ9RUA3PvyX4Z7PLVlRVLlY658CSEckI7n0vRZJg,4898
 datadog_checks/base/errors.py,sha256=fPcFaR3zHpSkMo8epvF3lRe9KrEnS8g4J0dXM_nvzsw,1896
 datadog_checks/base/log.py,sha256=gSfzYimmg0z3Dgmn8NpXuyMNjgXwmTbn0NcyUX8B1ls,6283
 datadog_checks/base/types.py,sha256=anajZS0W0TsxUHJQw-JHOP2NSeuC9BisXSy9mAStlxQ,1623
 datadog_checks/base/checks/__init__.py,sha256=q7V6v-FwQWkQC1QWaVzKaPjZMaxPJHJcLd71C0uM7bA,211
 datadog_checks/base/checks/__init__.pyi,sha256=LASfm-daLNQIYe6-w0NPqBw4cl83nYIX5_B-VhV6ARo,262
-datadog_checks/base/checks/base.py,sha256=7W4dK8s7h5FGh1mv_MIapDXvHlpHMMeZj-z3aO5QAeI,59556
+datadog_checks/base/checks/base.py,sha256=zvGdvk45y7Ye3hYTCroulla4sTm78W0xPkYmN0w-nQk,59940
 datadog_checks/base/checks/network.py,sha256=UijP1OVBCpCNKMy6bVkNazHgy6Sdm8qCvCYGPaWuTDo,1968
 datadog_checks/base/checks/kube_leader/__init__.py,sha256=q7V6v-FwQWkQC1QWaVzKaPjZMaxPJHJcLd71C0uM7bA,211
 datadog_checks/base/checks/kube_leader/__init__.pyi,sha256=UGDywoRwmCIz3Zii1uHsp7jiFGWRdn5fFMZZxgGGlQs,398
@@ -45,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
@@ -95,9 +94,9 @@ datadog_checks/base/checks/windows/perf_counters/transformers/temporal_percent.p
 datadog_checks/base/checks/windows/perf_counters/transformers/time_elapsed.py,sha256=hWM8CHYSqFnFYrNdr1NFY464nMAVFOiN8jhlhZTOb78,513
 datadog_checks/base/stubs/__init__.py,sha256=wpWAR9v7BiTbbmTO6pVpshqa_z-PWaYTr33wSTZLz3c,272
 datadog_checks/base/stubs/_util.py,sha256=ZDGtQa8F3cHf8-QvSVHMB4BGI3C9VgC7sGcGGvO0apI,1268
-datadog_checks/base/stubs/aggregator.py,sha256=Px4JgZNjh-vMHibfGR452ZiA3kUiHA02ZUIDK70d62A,24448
+datadog_checks/base/stubs/aggregator.py,sha256=iPEnNAsFeQ1_i6RwyjWKKGUGj2aoRccWJ9UEw28lsiU,24645
 datadog_checks/base/stubs/common.py,sha256=ZGzF2dXy1uVFQGdG_bvz_pMMiULaBcpzra_k9wo9f04,1088
-datadog_checks/base/stubs/datadog_agent.py,sha256=RBV6416XG7EDgfiQj3deYEytSo6UVs7r5Bw2diKgRsg,5971
+datadog_checks/base/stubs/datadog_agent.py,sha256=zhKqluf_0WPIAm_GxJyz6A9JFw9Aoe1OsrjIAcEWdrg,5942
 datadog_checks/base/stubs/log.py,sha256=A-eWnzY5gTpTW41Zch-W5CVclzldlmhMTW-vDNFdT1o,836
 datadog_checks/base/stubs/similar.py,sha256=3HO9htx9LV6pRaE1ZGKsPExavTbjPHPK6ZMM2BPYj3Y,8045
 datadog_checks/base/stubs/tagging.py,sha256=zxLdPC4EqHxGiS_HEhbaOsL_s5nZIhN8BDkx2BATOqs,1439
@@ -140,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
@@ -218,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.8.0.dist-info/METADATA,sha256=NSq6Uu3waSa82zIecfozrZZ40CoY7g3WlNL2Rf6f1oU,4198
-datadog_checks_base-37.8.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-datadog_checks_base-37.8.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,,

datadog_checks/base/ddyaml.py

@@ -1,171 +0,0 @@
-# (C) Datadog, Inc. 2011-present
-# All rights reserved
-# Licensed under Simplified BSD License (see LICENSE)
-import logging
-from os.path import realpath
-
-import yaml
-
-try:
-    from yaml import CSafeDumper as yDumper
-    from yaml import CSafeLoader as yLoader
-except ImportError:
-    # On source install C Extensions might have not been built
-    from yaml import SafeDumper as yDumper  # noqa, imported from here elsewhere
-    from yaml import SafeLoader as yLoader  # noqa, imported from here elsewhere
-
-log = logging.getLogger(__name__)
-
-pyyaml_load = None
-pyyaml_load_all = None
-pyyaml_dump_all = None
-
-
-def safe_yaml_dump_all(
-    documents,
-    stream=None,
-    Dumper=yDumper,
-    default_style=None,
-    default_flow_style=None,
-    canonical=None,
-    indent=None,
-    width=None,
-    allow_unicode=None,
-    line_break=None,
-    encoding='utf-8',
-    explicit_start=None,
-    explicit_end=None,
-    version=None,
-    tags=None,
-):
-    if Dumper != yDumper:
-        stream_name = get_stream_name(stream)
-        log.debug("Unsafe dumping of YAML has been disabled - using safe dumper instead in %s", stream_name)
-
-    if pyyaml_dump_all:
-        return pyyaml_dump_all(
-            documents,
-            stream,
-            yDumper,
-            default_style,
-            default_flow_style,
-            canonical,
-            indent,
-            width,
-            allow_unicode,
-            line_break,
-            encoding,
-            explicit_start,
-            explicit_end,
-            version,
-            tags,
-        )
-
-    return yaml.dump_all(
-        documents,
-        stream,
-        yDumper,
-        default_style,
-        default_flow_style,
-        canonical,
-        indent,
-        width,
-        allow_unicode,
-        line_break,
-        encoding,
-        explicit_start,
-        explicit_end,
-        version,
-        tags,
-    )
-
-
-def safe_yaml_load(stream, Loader=yLoader):
-    if Loader != yLoader:
-        stream_name = get_stream_name(stream)
-        log.debug("Unsafe loading of YAML has been disabled - using safe loader instead in %s", stream_name)
-
-    if pyyaml_load:
-        return pyyaml_load(stream, Loader=yLoader)
-
-    return yaml.load(stream, Loader=yLoader)
-
-
-def safe_yaml_load_all(stream, Loader=yLoader):
-    if Loader != yLoader:
-        stream_name = get_stream_name(stream)
-        log.debug("Unsafe loading of YAML has been disabled - using safe loader instead in %s", stream_name)
-
-    if pyyaml_load_all:
-        return pyyaml_load_all(stream, Loader=yLoader)
-
-    return yaml.load_all(stream, Loader=yLoader)
-
-
-def get_stream_name(stream):
-    """Using the same logic as pyyaml to handle both string types and file types. All file objects do not necessarily
-    have a `name` attribute, in that case we can only say the stream is a file."""
-    if isinstance(stream, str):
-        return "<string>"
-    elif hasattr(stream, 'name'):
-        return realpath(stream.name)
-    else:
-        return "<file>"
-
-
-def yaml_load_force_loader(stream, Loader):
-    """Override the default monkey patch for this call"""
-    log.debug(
-        "`%s` YAML loader is used instead of the default one, please make sure it is safe to do so", Loader.__name__
-    )
-    if pyyaml_load is None:
-        return yaml.load(stream, Loader)
-    return pyyaml_load(stream, Loader)
-
-
-def yaml_load_all_force_loader(stream, Loader):
-    """Override the default monkey patch for this call"""
-    log.debug(
-        "`%s` YAML loader is used instead of the default one, please make sure it is safe to do so", Loader.__name__
-    )
-    if pyyaml_load_all is None:
-        return yaml.load_all(stream, Loader)
-    return pyyaml_load_all(stream, Loader)
-
-
-def monkey_patch_pyyaml():
-    global pyyaml_load
-    global pyyaml_load_all
-    global pyyaml_dump_all
-
-    if not pyyaml_load:
-        log.info("monkey patching yaml.load...")
-        pyyaml_load = yaml.load
-        yaml.load = safe_yaml_load
-    if not pyyaml_load_all:
-        log.info("monkey patching yaml.load_all...")
-        pyyaml_load_all = yaml.load_all
-        yaml.load_all = safe_yaml_load_all
-    if not pyyaml_dump_all:
-        log.info("monkey patching yaml.dump_all... (affects all yaml dump operations)")
-        pyyaml_dump_all = yaml.dump_all
-        yaml.dump_all = safe_yaml_dump_all
-
-
-def monkey_patch_pyyaml_reverse():
-    global pyyaml_load
-    global pyyaml_load_all
-    global pyyaml_dump_all
-
-    if pyyaml_load:
-        log.info("reversing monkey patch for yaml.load...")
-        yaml.load = pyyaml_load
-        pyyaml_load = None
-    if pyyaml_load_all:
-        log.info("reversing monkey patch for yaml.load_all...")
-        yaml.load_all = pyyaml_load_all
-        pyyaml_load_all = None
-    if pyyaml_dump_all:
-        log.info("reversing monkey patch for yaml.dump_all... (affects all yaml dump operations)")
-        yaml.dump_all = pyyaml_dump_all
-        pyyaml_dump_all = None