datadog-checks-base 37.8.0__py2.py3-none-any.whl → 37.9.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.9.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/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-37.8.0.dist-info → datadog_checks_base-37.9.0.dist-info}/METADATA

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

{datadog_checks_base-37.8.0.dist-info → datadog_checks_base-37.9.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=iGqq-S-VDNzq-lXJgI6gEsOyXzbc8iNlsKUM6mQR6Do,138
 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
@@ -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
@@ -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.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/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