DataDog · mx-psi · Jun 24, 2020 · Jun 17, 2020 · Jun 17, 2020 · Jun 17, 2020
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -63,7 +63,7 @@ jobs:
           command: |
             pip install wheel
             pip install -r requirements.txt
-            pip3 install flake8==3.8.3 flake8-bugbear==20.1.4
+            pip3 install flake8~=3.8.3 flake8-bugbear~=20.1.4 black~=19.10b0
       - run:
           name: grab go deps
           command: |

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -3,11 +3,15 @@ default_language_version:
 
 repos:
 - repo: https://gitlab.com/pycqa/flake8
-  rev: 3.8.3 # should match Python version
+  rev: 3.8.3 # should match major Python version
   hooks:
     - id: flake8
       additional_dependencies:
         - flake8-bugbear==20.1.4
+- repo: https://github.com/psf/black
+  rev: 19.10b0
+  hooks:
+    - id: black
 - repo: https://github.com/jumanjihouse/pre-commit-hooks
   rev: 2.1.1
   hooks:

diff --git a/Dockerfiles/agent/secrets-helper/readsecret.py b/Dockerfiles/agent/secrets-helper/readsecret.py
@@ -50,13 +50,13 @@ def is_valid_folder(arg):
         epilog='''
             See https://github.com/DataDog/datadog-agent/blob/6.4.x/docs/agent/secrets.md
             for more information on the secrets protocol.
-        '''
+        ''',
     )
     parser.add_argument(
         "root_folder",
         help="folder where secrets are mounted, eg. /run/secrets",
         default="/run/secrets",
-        type=is_valid_folder
+        type=is_valid_folder,
     )
 
     args = parser.parse_args()

diff --git a/Dockerfiles/agent/secrets-helper/test_readsecret.py b/Dockerfiles/agent/secrets-helper/test_readsecret.py
@@ -11,9 +11,7 @@
 
 class TestListSecretNames(unittest.TestCase):
     def test_invalid_output(self):
-        with self.assertRaisesRegex(
-            ValueError, r"Expecting value: line 1 column 1 \(char 0\)"
-        ):
+        with self.assertRaisesRegex(ValueError, r"Expecting value: line 1 column 1 \(char 0\)"):
             list_secret_names("")
 
     def test_invalid_version(self):
@@ -51,8 +49,7 @@ def test_path_escape_symlink(self):
         with open(os.path.join(sensitive_path, "target"), "w") as f:
             f.write("sensitive")
         os.symlink(
-            os.path.join(sensitive_path, "target"),
-            os.path.join(allowed_path, "target"),
+            os.path.join(sensitive_path, "target"), os.path.join(allowed_path, "target"),
         )
 
         with self.assertRaisesRegex(ValueError, "outside of the specified folder"):

diff --git a/cmd/agent/dist/checks/prometheus_check/__init__.py b/cmd/agent/dist/checks/prometheus_check/__init__.py
@@ -1,6 +1,4 @@
 # (C) Datadog, Inc. 2016
 # All rights reserved
 # Licensed under Simplified BSD License (see LICENSE)
-from datadog_checks.base.checks.prometheus import (  # noqa: F401
-    PrometheusCheck, PrometheusFormat, UnknownFormatError
-)
+from datadog_checks.base.checks.prometheus import PrometheusCheck, PrometheusFormat, UnknownFormatError  # noqa: F401
diff --git a/cmd/agent/dist/checks/winwmi_check.py b/cmd/agent/dist/checks/winwmi_check.py
@@ -2,6 +2,4 @@
 # under the Apache License Version 2.0.
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2016-2020 Datadog, Inc.
-from datadog_checks.base.checks.win.wmi import ( # noqa: F401
-    WinWMICheck, WMIMetric, MissingTagBy, from_time, to_time
-)
+from datadog_checks.base.checks.win.wmi import WinWMICheck, WMIMetric, MissingTagBy, from_time, to_time  # noqa: F401
diff --git a/cmd/agent/dist/utils/platform.py b/cmd/agent/dist/utils/platform.py
@@ -2,4 +2,4 @@
 # under the Apache License Version 2.0.
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2016-2020 Datadog, Inc.
-from datadog_checks.base.utils.platform import Platform # noqa: F401
+from datadog_checks.base.utils.platform import Platform  # noqa: F401
diff --git a/cmd/agent/dist/utils/py_mem.py b/cmd/agent/dist/utils/py_mem.py
@@ -12,7 +12,7 @@ def get_mem_stats():
 
         stat = stats.get(entry_type, {})
         stat['num'] = stat.get('n', 0) + n
-        stat['sz'] = stat.get('sz', 0) + n*sz
+        stat['sz'] = stat.get('sz', 0) + n * sz
 
         entries = stat.get('entries', [])
         entries.append([ref, n, sz])

diff --git a/cmd/agent/dist/utils/tailfile.py b/cmd/agent/dist/utils/tailfile.py
@@ -2,4 +2,4 @@
 # under the Apache License Version 2.0.
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2016-2020 Datadog, Inc.
-from datadog_checks.base.utils.tailfile import TailFile # noqa: F401
+from datadog_checks.base.utils.tailfile import TailFile  # noqa: F401
diff --git a/devenv/tasks/__init__.py b/devenv/tasks/__init__.py
@@ -10,13 +10,15 @@
 
 ns.add_collection(packer)
 
-ns.configure({
-    'run': {
-        # workaround waiting for a fix being merged on Invoke,
-        # see https://github.com/pyinvoke/invoke/pull/407
-        'shell': os.environ.get('COMSPEC', os.environ.get('SHELL')),
-        # this should stay, set the encoding explicitly so invoke doesn't
-        # freak out if a command outputs unicode chars.
-        'encoding': 'utf-8',
+ns.configure(
+    {
+        'run': {
+            # workaround waiting for a fix being merged on Invoke,
+            # see https://github.com/pyinvoke/invoke/pull/407
+            'shell': os.environ.get('COMSPEC', os.environ.get('SHELL')),
+            # this should stay, set the encoding explicitly so invoke doesn't
+            # freak out if a command outputs unicode chars.
+            'encoding': 'utf-8',
+        }
     }
-})
+)
diff --git a/devenv/tasks/packer.py b/devenv/tasks/packer.py
@@ -9,11 +9,12 @@
 DEFAULT_BUILDERS = [
     "parallels-iso",
     "vmware-iso",
-    "virtualbox-iso"
+    "virtualbox-iso",
 ]
 
+
 @task
-def build(ctx, os = "windows-10", provider = "virtualbox-iso"):
+def build(ctx, os="windows-10", provider="virtualbox-iso"):
     """
     Build the Vagrant box
 
@@ -28,15 +29,9 @@ def build(ctx, os = "windows-10", provider = "virtualbox-iso"):
     command = "ruby -r \"./gen-packer.rb\" -e \"build('{name}', '{type}')\" > packer.json"
 
     if os == "windows-10":
-        ctx.run(command.format(
-            name="windows_10_ent",
-            type="client"
-        ))
+        ctx.run(command.format(name="windows_10_ent", type="client"))
     elif os == "windows-server":
-        ctx.run(command.format(
-            name="windows_2019_core",
-            type="server"
-        ))
+        ctx.run(command.format(name="windows_2019_core", type="server"))
     else:
         print("Error: unknown OS")
         raise Exit(code=1)

diff --git a/pkg/collector/runner/runner_test.py b/pkg/collector/runner/runner_test.py
@@ -4,6 +4,7 @@
 import time
 from time import sleep
 
+
 class TestCheck(AgentCheck):
     def check(self, instance):
         test_inst = instance['test_instance']
@@ -13,5 +14,5 @@ def check(self, instance):
 
         else:
             current_time = time.time()
-            while (time.time() < current_time + test_inst['wait_length']):
+            while time.time() < current_time + test_inst['wait_length']:
                 pass
diff --git a/pkg/config/legacy/tests/config.py b/pkg/config/legacy/tests/config.py
@@ -32,7 +32,7 @@
 DATADOG_CONF = "datadog.conf"
 UNIX_CONFIG_PATH = '/etc/dd-agent'
 MAC_CONFIG_PATH = '/opt/datadog-agent/etc'
-DEFAULT_CHECK_FREQUENCY = 15   # seconds
+DEFAULT_CHECK_FREQUENCY = 15  # seconds
 LOGGING_MAX_BYTES = 10 * 1024 * 1024
 SDK_INTEGRATIONS_DIR = 'integrations'
 SD_PIPE_NAME = "dd-service_discovery"
@@ -61,7 +61,7 @@
 
 NAGIOS_OLD_CONF_KEYS = [
     'nagios_log',
-    'nagios_perf_cfg'
+    'nagios_perf_cfg',
 ]
 
 LEGACY_DATADOG_URLS = [
@@ -75,7 +75,7 @@
 # so keeping these as a list just in case we change add stuff.
 MANIFEST_VALIDATION = {
     'max': ['max_agent_version'],
-    'min': ['min_agent_version']
+    'min': ['min_agent_version'],
 }
 
 
@@ -103,10 +103,13 @@ def _windows_commondata_path():
     CSIDL_COMMON_APPDATA = 35
 
     _SHGetFolderPath = windll.shell32.SHGetFolderPathW
-    _SHGetFolderPath.argtypes = [wintypes.HWND,
-                                 ctypes.c_int,
-                                 wintypes.HANDLE,
-                                 wintypes.DWORD, wintypes.LPCWSTR]
+    _SHGetFolderPath.argtypes = [
+        wintypes.HWND,
+        ctypes.c_int,
+        wintypes.HANDLE,
+        wintypes.DWORD,
+        wintypes.LPCWSTR,
+    ]
 
     path_buf = wintypes.create_unicode_buffer(wintypes.MAX_PATH)
     _SHGetFolderPath(0, CSIDL_COMMON_APPDATA, 0, 0, path_buf)
@@ -214,12 +217,10 @@ def get_histogram_percentiles(configstr=None):
                 if floatval <= 0 or floatval >= 1:
                     raise ValueError
                 if len(val) > 4:
-                    log.warning("Histogram percentiles are rounded to 2 digits: {0} rounded"
-                                .format(floatval))
+                    log.warning("Histogram percentiles are rounded to 2 digits: {0} rounded".format(floatval))
                 result.append(float(val[0:4]))
             except ValueError:
-                log.warning("Bad histogram percentile value {0}, must be float in ]0;1[, skipping"
-                            .format(val))
+                log.warning("Bad histogram percentile value {0}, must be float in ]0;1[, skipping".format(val))
     except Exception:
         log.exception("Error when parsing histogram percentiles, skipping")
         return None
@@ -254,7 +255,7 @@ def get_config(cfg_path=None, options=None, can_query_registry=True):
         'additional_checksd': '/etc/dd-agent/checks.d/',
         'bind_host': get_default_bind_host(),
         'statsd_metric_namespace': None,
-        'utf8_decoding': False
+        'utf8_decoding': False,
     }
 
     if "darwin" in sys.platform:
@@ -285,7 +286,7 @@ def get_config(cfg_path=None, options=None, can_query_registry=True):
             agentConfig['developer_mode'] = True
 
         # Core config
-        #ap
+        # ap
         if not config.has_option('Main', 'api_key'):
             log.warning(u"No API key was found. Aborting.")
             sys.exit(2)
@@ -337,7 +338,6 @@ def get_config(cfg_path=None, options=None, can_query_registry=True):
         if config.has_option('Main', 'forwarder_timeout'):
             agentConfig['forwarder_timeout'] = int(config.get('Main', 'forwarder_timeout'))
 
-
         # Extra checks.d path
         # the linux directory is set by default
         if config.has_option('Main', 'additional_checksd'):
@@ -354,8 +354,7 @@ def get_config(cfg_path=None, options=None, can_query_registry=True):
                 additional_config = extract_agent_config(config)
                 agentConfig.update(additional_config)
             except Exception:
-                log.error('Failed to load the agent configuration related to '
-                          'service discovery. It will not be used.')
+                log.error('Failed to load the agent configuration related to service discovery. It will not be used.')
 
         # Concerns only Windows
         if config.has_option('Main', 'use_web_info_page'):
@@ -372,7 +371,7 @@ def get_config(cfg_path=None, options=None, can_query_registry=True):
         if config.has_option('Main', 'use_ec2_instance_id'):
             use_ec2_instance_id = config.get('Main', 'use_ec2_instance_id')
             # translate yes into True, the rest into False
-            agentConfig['use_ec2_instance_id'] = (use_ec2_instance_id.lower() == 'yes')
+            agentConfig['use_ec2_instance_id'] = use_ec2_instance_id.lower() == 'yes'
 
         if config.has_option('Main', 'check_freq'):
             try:
@@ -385,7 +384,9 @@ def get_config(cfg_path=None, options=None, can_query_registry=True):
             agentConfig['histogram_aggregates'] = get_histogram_aggregates(config.get('Main', 'histogram_aggregates'))
 
         if config.has_option('Main', 'histogram_percentiles'):
-            agentConfig['histogram_percentiles'] = get_histogram_percentiles(config.get('Main', 'histogram_percentiles'))
+            agentConfig['histogram_percentiles'] = get_histogram_percentiles(
+                config.get('Main', 'histogram_percentiles')
+            )
 
         # Disable Watchdog (optionally)
         if config.has_option('Main', 'watchdog'):
@@ -394,8 +395,7 @@ def get_config(cfg_path=None, options=None, can_query_registry=True):
 
         # Optional graphite listener
         if config.has_option('Main', 'graphite_listen_port'):
-            agentConfig['graphite_listen_port'] = \
-                int(config.get('Main', 'graphite_listen_port'))
+            agentConfig['graphite_listen_port'] = int(config.get('Main', 'graphite_listen_port'))
         else:
             agentConfig['graphite_listen_port'] = None
 
@@ -411,8 +411,9 @@ def get_config(cfg_path=None, options=None, can_query_registry=True):
                 agentConfig[key] = value
 
         # Create app:xxx tags based on monitored apps
-        agentConfig['create_dd_check_tags'] = config.has_option('Main', 'create_dd_check_tags') and \
-            _is_affirmative(config.get('Main', 'create_dd_check_tags'))
+        agentConfig['create_dd_check_tags'] = config.has_option('Main', 'create_dd_check_tags') and _is_affirmative(
+            config.get('Main', 'create_dd_check_tags')
+        )
 
         # Forwarding to external statsd server
         if config.has_option('Main', 'statsd_forward_host'):
@@ -477,7 +478,9 @@ def get_config(cfg_path=None, options=None, can_query_registry=True):
 
         agentConfig["proxy_forbid_method_switch"] = False
         if config.has_option("Main", "proxy_forbid_method_switch"):
-            agentConfig["proxy_forbid_method_switch"] = _is_affirmative(config.get("Main", "proxy_forbid_method_switch"))
+            agentConfig["proxy_forbid_method_switch"] = _is_affirmative(
+                config.get("Main", "proxy_forbid_method_switch")
+            )
 
         agentConfig["collect_ec2_tags"] = False
         if config.has_option("Main", "collect_ec2_tags"):
@@ -528,16 +531,15 @@ def extract_agent_config(config):
         conf_backend = config.get('Main', 'sd_config_backend')
 
     if backend not in SD_BACKENDS:
-        log.error("The backend {0} is not supported. "
-                  "Service discovery won't be enabled.".format(backend))
+        log.error("The backend {0} is not supported. Service discovery won't be enabled.".format(backend))
         agentConfig['service_discovery'] = False
 
     if conf_backend is None:
-        log.warning('No configuration backend provided for service discovery. '
-                    'Only auto config templates will be used.')
+        log.warning('No configuration backend provided for service discovery. Only auto config templates will be used.')
     elif conf_backend not in SD_CONFIG_BACKENDS:
-        log.error("The config backend {0} is not supported. "
-                  "Only auto config templates will be used.".format(conf_backend))
+        log.error(
+            "The config backend {0} is not supported. Only auto config templates will be used.".format(conf_backend)
+        )
         conf_backend = None
     agentConfig['sd_config_backend'] = conf_backend
 
@@ -554,19 +556,15 @@ def extract_sd_config(config):
     else:
         sd_config['sd_config_backend'] = None
     if config.has_option('Main', 'sd_template_dir'):
-        sd_config['sd_template_dir'] = config.get(
-            'Main', 'sd_template_dir')
+        sd_config['sd_template_dir'] = config.get('Main', 'sd_template_dir')
     else:
         sd_config['sd_template_dir'] = SD_TEMPLATE_DIR
     if config.has_option('Main', 'sd_backend_host'):
-        sd_config['sd_backend_host'] = config.get(
-            'Main', 'sd_backend_host')
+        sd_config['sd_backend_host'] = config.get('Main', 'sd_backend_host')
     if config.has_option('Main', 'sd_backend_port'):
-        sd_config['sd_backend_port'] = config.get(
-            'Main', 'sd_backend_port')
+        sd_config['sd_backend_port'] = config.get('Main', 'sd_backend_port')
     if config.has_option('Main', 'sd_jmx_enable'):
-        sd_config['sd_jmx_enable'] = config.get(
-            'Main', 'sd_jmx_enable')
+        sd_config['sd_jmx_enable'] = config.get('Main', 'sd_jmx_enable')
     return sd_config
 
 
@@ -585,8 +583,9 @@ def get_proxy(agentConfig):
 
         proxy_settings['user'] = agentConfig.get('proxy_user')
         proxy_settings['password'] = agentConfig.get('proxy_password')
-        log.debug("Proxy Settings: %s:*****@%s:%s", proxy_settings['user'],
-                  proxy_settings['host'], proxy_settings['port'])
+        log.debug(
+            "Proxy Settings: %s:*****@%s:%s", proxy_settings['user'], proxy_settings['host'], proxy_settings['port']
+        )
         return proxy_settings
 
     # If no proxy configuration was specified in datadog.conf
@@ -600,13 +599,13 @@ def get_proxy(agentConfig):
             proxy_settings['user'] = parse.username
             proxy_settings['password'] = parse.password
 
-            log.debug("Proxy Settings: %s:*****@%s:%s", proxy_settings['user'],
-                      proxy_settings['host'], proxy_settings['port'])
+            log.debug(
+                "Proxy Settings: %s:*****@%s:%s", proxy_settings['user'], proxy_settings['host'], proxy_settings['port']
+            )
             return proxy_settings
 
     except Exception as e:
-        log.debug("Error while trying to fetch proxy settings using urllib %s."
-                  "Proxy is probably not set", str(e))
+        log.debug("Error while trying to fetch proxy settings using urllib %s. Proxy is probably not set", str(e))
 
     return None