Use lazy logging format (#5398)

Author: AlexandreYang

couch/datadog_checks/couch/couch.py

@@ -238,7 +238,7 @@ def _build_system_metrics(self, data, tags, prefix='couchdb.erlang'):
                             self.gauge("{0}.{1}.size".format(prefix, key), val['count'], queue_tags)
                         else:
                             self.agent_check.log.debug(
-                                "Queue %s does not have a key 'count'. It will be ignored." % queue
+                                "Queue %s does not have a key 'count'. It will be ignored.", queue
                             )
                     else:
                         self.gauge("{0}.{1}.size".format(prefix, key), val, queue_tags)

datadog_checks_base/datadog_checks/__init__.py

@@ -1,5 +1,4 @@
 # (C) Datadog, Inc. 2018-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-#
 __path__ = __import__('pkgutil').extend_path(__path__, __name__)

datadog_checks_downloader/datadog_checks/downloader/download.py

@@ -104,7 +104,7 @@ def __download_with_tuf(self, target_relpath):
 
         # Either the target has not been updated...
         if not len(updated_targets):
-            logger.debug('{} has not been updated'.format(target_relpath))
+            logger.debug('%s has not been updated', target_relpath)
         # or, it has been updated, in which case...
         else:
             # First, we use TUF to download and verify the target.
@@ -113,7 +113,7 @@ def __download_with_tuf(self, target_relpath):
             assert updated_target == target
             self.__updater.download_target(updated_target, self.__targets_dir)
 
-        logger.info('TUF verified {}'.format(target_relpath))
+        logger.info('TUF verified %s', target_relpath)
 
         target_abspath = os.path.join(self.__targets_dir, target_relpath)
         return target_abspath, target
@@ -185,7 +185,7 @@ def __load_root_layout(self, target_relpath):
         return root_layout, root_layout_pubkeys, root_layout_params
 
     def __handle_in_toto_verification_exception(self, target_relpath, e):
-        logger.exception('in-toto failed to verify {}'.format(target_relpath))
+        logger.exception('in-toto failed to verify %s', target_relpath)
 
         if isinstance(e, LinkNotFoundError) and str(e) == RevokedDeveloper.MSG:
             raise RevokedDeveloper(target_relpath, IN_TOTO_ROOT_LAYOUT)
@@ -211,7 +211,7 @@ def __in_toto_verify(self, inspection_packet, target_relpath):
         except Exception as e:
             self.__handle_in_toto_verification_exception(target_relpath, e)
         else:
-            logger.info('in-toto verified {}'.format(target_relpath))
+            logger.info('in-toto verified %s', target_relpath)
         finally:
             # Switch back to a parent directory we control, so that we can
             # safely delete temp dir.

directory/datadog_checks/directory/directory.py

@@ -133,7 +133,7 @@ def _get_stats(
                     file_stat = file_entry.stat()
 
                 except OSError as ose:
-                    self.warning('DirectoryCheck: could not stat file {} - {}'.format(join(root, file_entry.name), ose))
+                    self.warning('DirectoryCheck: could not stat file %s - %s', join(root, file_entry.name), ose)
                 else:
                     # file specific metrics
                     directory_bytes += file_stat.st_size

disk/datadog_checks/disk/disk.py

@@ -263,25 +263,25 @@ def _compile_pattern_filters(self, instance):
         device_blacklist_extras = []
         mount_point_blacklist_extras = []
 
-        deprecation_message = '`{old}` is deprecated and will be removed in 6.9. Please use `{new}` instead.'
+        deprecation_message = '`%s` is deprecated and will be removed in 6.9. Please use `%s` instead.'
 
         if 'excluded_filesystems' in instance:
             file_system_blacklist_extras.extend(
                 '{}$'.format(pattern) for pattern in instance['excluded_filesystems'] if pattern
             )
-            self.warning(deprecation_message.format(old='excluded_filesystems', new='file_system_blacklist'))
+            self.warning(deprecation_message, 'excluded_filesystems', 'file_system_blacklist')
 
         if 'excluded_disks' in instance:
             device_blacklist_extras.extend('{}$'.format(pattern) for pattern in instance['excluded_disks'] if pattern)
-            self.warning(deprecation_message.format(old='excluded_disks', new='device_blacklist'))
+            self.warning(deprecation_message, 'excluded_disks', 'device_blacklist')
 
         if 'excluded_disk_re' in instance:
             device_blacklist_extras.append(instance['excluded_disk_re'])
-            self.warning(deprecation_message.format(old='excluded_disk_re', new='device_blacklist'))
+            self.warning(deprecation_message, 'excluded_disk_re', 'device_blacklist')
 
         if 'excluded_mountpoint_re' in instance:
             mount_point_blacklist_extras.append(instance['excluded_mountpoint_re'])
-            self.warning(deprecation_message.format(old='excluded_mountpoint_re', new='mount_point_blacklist'))
+            self.warning(deprecation_message, 'excluded_mountpoint_re', 'mount_point_blacklist')
 
         # Any without valid patterns will become None
         self._file_system_whitelist = self._compile_valid_patterns(self._file_system_whitelist, casing=re.I)

docker_daemon/test/test_docker_daemon.py

@@ -82,7 +82,7 @@ def test_event_attributes_tag(self):
             "nginx:latest", detach=True, name='event-tags-test', entrypoint='/bin/false')
         log.debug('start nginx:latest with entrypoint /bin/false')
         DockerUtil().client.start(container_fail)
-        log.debug('container exited with %s' % DockerUtil().client.wait(container_fail, 1))
+        log.debug('container exited with %s', DockerUtil().client.wait(container_fail, 1))
         # Wait 1 second after exit so the event will be picked up
         from time import sleep
         sleep(1)
@@ -278,12 +278,12 @@ def setUp(self):
                 self.docker_client.connect_container_to_network(cont['Id'], self.second_network)
 
         for c in self.containers:
-            log.info("Starting container: {0}".format(c))
+            log.info("Starting container: %s", c)
             self.docker_client.start(c)
 
     def tearDown(self):
         for c in self.containers:
-            log.info("Stopping container: {0}".format(c))
+            log.info("Stopping container: %s", c)
             self.docker_client.remove_container(c, force=True)
         self.docker_client.remove_network(self.second_network)
 
@@ -829,8 +829,8 @@ def test_collect_exit_code(self):
         log.debug('start nginx:latest with entrypoint /bin/false')
         self.docker_client.start(container_ok)
         self.docker_client.start(container_fail)
-        log.debug('container exited with %s' % self.docker_client.wait(container_ok, 1))
-        log.debug('container exited with %s' % self.docker_client.wait(container_fail, 1))
+        log.debug('container exited with %s', self.docker_client.wait(container_ok, 1))
+        log.debug('container exited with %s', self.docker_client.wait(container_fail, 1))
         # After the container exits, we need to wait a second so the event isn't too recent
         # when the check runs, otherwise the event is not picked up
         from time import sleep

gitlab/datadog_checks/gitlab/gitlab.py

@@ -110,7 +110,7 @@ def _check_health_endpoint(self, instance, check_type, tags):
 
         if url is None:
             # Simply ignore this service check if not configured
-            self.log.debug("gitlab_url not configured, service check {} skipped".format(check_type))
+            self.log.debug("gitlab_url not configured, service check %s skipped", check_type)
             return
 
         service_check_tags = self._service_check_tags(url)
@@ -121,7 +121,7 @@ def _check_health_endpoint(self, instance, check_type, tags):
         check_url = '{}/-/{}'.format(url, check_type)
 
         try:
-            self.log.debug("checking {} against {}".format(check_type, check_url))
+            self.log.debug("checking %s against %s", check_type, check_url)
             r = self.http.get(check_url)
             if r.status_code != 200:
                 self.service_check(
@@ -153,4 +153,4 @@ def _check_health_endpoint(self, instance, check_type, tags):
             raise
         else:
             self.service_check(service_check_name, OpenMetricsBaseCheck.OK, tags=service_check_tags)
-        self.log.debug("gitlab check {} succeeded".format(check_type))
+        self.log.debug("gitlab check %s succeeded", check_type)

gitlab_runner/datadog_checks/gitlab_runner/gitlab_runner.py

@@ -108,7 +108,7 @@ def _check_connectivity_to_master(self, instance, tags):
         service_check_tags.extend(tags)
 
         try:
-            self.log.debug("checking connectivity against {}".format(url))
+            self.log.debug("checking connectivity against %s", url)
             r = self.http.get(url)
             if r.status_code != 200:
                 self.service_check(

haproxy/datadog_checks/haproxy/haproxy.py

@@ -200,7 +200,7 @@ def _collect_version_from_http(self, url):
             self.log.debug("unable to find HAProxy version info")
         else:
             version = re.search(r"HAProxy version ([^,]+)", raw_version).group(1)
-            self.log.debug(u"HAProxy version is {}".format(version))
+            self.log.debug("HAProxy version is %s", version)
             self.set_metadata('version', version)
 
     def _fetch_socket_data(self, parsed_url):
@@ -577,14 +577,13 @@ def _process_status_metric(
             try:
                 service, _, hostname, status = host_status
             except Exception:
+                service, _, status = host_status
                 if collect_status_metrics_by_host:
                     self.warning(
-                        '`collect_status_metrics_by_host` is enabled but no host info\
-                                 could be extracted from HAProxy stats endpoint for {0}'.format(
-                            service
-                        )
+                        '`collect_status_metrics_by_host` is enabled but no host info could be extracted from HAProxy '
+                        'stats endpoint for %s',
+                        service,
                     )
-                service, _, status = host_status
 
             if self._is_service_excl_filtered(service, services_incl_filter, services_excl_filter):
                 continue

ibm_db2/datadog_checks/ibm_db2/ibm_db2.py

@@ -480,8 +480,9 @@ def query_custom(self):
                     column_type = column.get('type')
                     if not column_type:  # no cov
                         self.log.error(
-                            'Column field `type` is required for column `{}` '
-                            'of metric_prefix `{}`'.format(name, metric_prefix)
+                            'Column field `type` is required for column `%s` of metric_prefix `%s`',
+                            name,
+                            metric_prefix,
                         )
                         break
 
@@ -490,16 +491,20 @@ def query_custom(self):
                     else:
                         if not hasattr(self, column_type):
                             self.log.error(
-                                'Invalid submission method `{}` for metric column `{}` of '
-                                'metric_prefix `{}`'.format(column_type, name, metric_prefix)
+                                'Invalid submission method `%s` for metric column `%s` of metric_prefix `%s`',
+                                column_type,
+                                name,
+                                metric_prefix,
                             )
                             break
                         try:
                             metric_info.append(('{}.{}'.format(metric_prefix, name), float(value), column_type))
                         except (ValueError, TypeError):  # no cov
                             self.log.error(
-                                'Non-numeric value `{}` for metric column `{}` of '
-                                'metric_prefix `{}`'.format(value, name, metric_prefix)
+                                'Non-numeric value `%s` for metric column `%s` of metric_prefix `%s`',
+                                value,
+                                name,
+                                metric_prefix,
                             )
                             break