datadog-checks-base 37.15.0__py2.py3-none-any.whl → 37.16.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.15.0"
+__version__ = "37.16.0"

datadog_checks/base/checks/base.py

@@ -29,32 +29,32 @@ from typing import (  # noqa: F401
 import lazy_loader
 
 from datadog_checks.base.agent import AGENT_RUNNING, aggregator, datadog_agent
+from datadog_checks.base.config import is_affirmative
+from datadog_checks.base.constants import ServiceCheck
+from datadog_checks.base.errors import ConfigurationError
+from datadog_checks.base.types import (
+    AgentConfigType,
+    Event,
+    ExternalTagType,
+    InitConfigType,
+    InstanceType,
+    ProxySettings,
+    ServiceCheckStatus,
+)
+from datadog_checks.base.utils.agent.utils import should_profile_memory
+from datadog_checks.base.utils.common import ensure_bytes, to_native_string
+from datadog_checks.base.utils.fips import enable_fips
 from datadog_checks.base.utils.format import json
+from datadog_checks.base.utils.tagging import GENERIC_TAGS
+from datadog_checks.base.utils.tracing import traced_class
 
-from ..config import is_affirmative
-from ..constants import ServiceCheck
-from ..errors import ConfigurationError
-from ..types import (
-    AgentConfigType,  # noqa: F401
-    Event,  # noqa: F401
-    ExternalTagType,  # noqa: F401
-    InitConfigType,  # noqa: F401
-    InstanceType,  # noqa: F401
-    ProxySettings,  # noqa: F401
-    ServiceCheckStatus,  # noqa: F401
-)
-from ..utils.agent.utils import should_profile_memory
-from ..utils.common import ensure_bytes, to_native_string
-from ..utils.fips import enable_fips
-from ..utils.tagging import GENERIC_TAGS
-from ..utils.tracing import traced_class
 from ._config_ast import parse as _parse_ast_config
 
 if AGENT_RUNNING:
-    from ..log import CheckLoggingAdapter, init_logging
+    from datadog_checks.base.log import CheckLoggingAdapter, init_logging
 
 else:
-    from ..stubs.log import CheckLoggingAdapter, init_logging
+    from datadog_checks.base.stubs.log import CheckLoggingAdapter, init_logging
 
 init_logging()
 
@@ -147,12 +147,12 @@ class AgentCheck(object):
     # a mapping type, then each key will be considered a `name` and will be sent with its (str) value.
     METADATA_TRANSFORMERS = None
 
-    FIRST_CAP_RE = re.compile(br'(.)([A-Z][a-z]+)')
-    ALL_CAP_RE = re.compile(br'([a-z0-9])([A-Z])')
-    METRIC_REPLACEMENT = re.compile(br'([^a-zA-Z0-9_.]+)|(^[^a-zA-Z]+)')
-    TAG_REPLACEMENT = re.compile(br'[,\+\*\-/()\[\]{}\s]')
-    MULTIPLE_UNDERSCORE_CLEANUP = re.compile(br'__+')
-    DOT_UNDERSCORE_CLEANUP = re.compile(br'_*\._*')
+    FIRST_CAP_RE = re.compile(rb'(.)([A-Z][a-z]+)')
+    ALL_CAP_RE = re.compile(rb'([a-z0-9])([A-Z])')
+    METRIC_REPLACEMENT = re.compile(rb'([^a-zA-Z0-9_.]+)|(^[^a-zA-Z]+)')
+    TAG_REPLACEMENT = re.compile(rb'[,\+\*\-/()\[\]{}\s]')
+    MULTIPLE_UNDERSCORE_CLEANUP = re.compile(rb'__+')
+    DOT_UNDERSCORE_CLEANUP = re.compile(rb'_*\._*')
 
     # allows to set a limit on the number of metric name and tags combination
     # this check can send per run. This is useful for checks that have an unbounded
@@ -1146,10 +1146,10 @@ class AgentCheck(object):
         And substitute illegal metric characters
         """
         name = ensure_bytes(name)
-        metric_name = self.FIRST_CAP_RE.sub(br'\1_\2', name)
-        metric_name = self.ALL_CAP_RE.sub(br'\1_\2', metric_name).lower()
-        metric_name = self.METRIC_REPLACEMENT.sub(br'_', metric_name)
-        return self.DOT_UNDERSCORE_CLEANUP.sub(br'.', metric_name).strip(b'_')
+        metric_name = self.FIRST_CAP_RE.sub(rb'\1_\2', name)
+        metric_name = self.ALL_CAP_RE.sub(rb'\1_\2', metric_name).lower()
+        metric_name = self.METRIC_REPLACEMENT.sub(rb'_', metric_name)
+        return self.DOT_UNDERSCORE_CLEANUP.sub(rb'.', metric_name).strip(b'_')
 
     def warning(self, warning_message, *args, **kwargs):
         # type: (str, *Any, **Any) -> None
@@ -1243,10 +1243,10 @@ class AgentCheck(object):
             if prefix is not None:
                 prefix = self.convert_to_underscore_separated(prefix)
         else:
-            name = self.METRIC_REPLACEMENT.sub(br'_', metric)
-            name = self.DOT_UNDERSCORE_CLEANUP.sub(br'.', name).strip(b'_')
+            name = self.METRIC_REPLACEMENT.sub(rb'_', metric)
+            name = self.DOT_UNDERSCORE_CLEANUP.sub(rb'.', name).strip(b'_')
 
-        name = self.MULTIPLE_UNDERSCORE_CLEANUP.sub(br'_', name)
+        name = self.MULTIPLE_UNDERSCORE_CLEANUP.sub(rb'_', name)
 
         if prefix is not None:
             name = ensure_bytes(prefix) + b"." + name
@@ -1262,9 +1262,9 @@ class AgentCheck(object):
         """
         if isinstance(tag, str):
             tag = tag.encode('utf-8', 'ignore')
-        tag = self.TAG_REPLACEMENT.sub(br'_', tag)
-        tag = self.MULTIPLE_UNDERSCORE_CLEANUP.sub(br'_', tag)
-        tag = self.DOT_UNDERSCORE_CLEANUP.sub(br'.', tag).strip(b'_')
+        tag = self.TAG_REPLACEMENT.sub(rb'_', tag)
+        tag = self.MULTIPLE_UNDERSCORE_CLEANUP.sub(rb'_', tag)
+        tag = self.DOT_UNDERSCORE_CLEANUP.sub(rb'.', tag).strip(b'_')
         return to_native_string(tag)
 
     def check(self, instance):
@@ -1287,7 +1287,7 @@ class AgentCheck(object):
             self._clear_diagnosis()
             # Ignore check initializations if running in a separate process
             if is_affirmative(self.instance.get('process_isolation', self.init_config.get('process_isolation', False))):
-                from ..utils.replay.execute import run_with_isolation
+                from datadog_checks.base.utils.replay.execute import run_with_isolation
 
                 run_with_isolation(self, aggregator, datadog_agent)
             else:
@@ -1302,7 +1302,7 @@ class AgentCheck(object):
                 instance = copy.deepcopy(self.instances[0])
 
                 if 'set_breakpoint' in self.init_config:
-                    from ..utils.agent.debug import enter_pdb
+                    from datadog_checks.base.utils.agent.debug import enter_pdb
 
                     enter_pdb(self.check, line=self.init_config['set_breakpoint'], args=(instance,))
                 elif self.should_profile_memory():
@@ -1457,7 +1457,7 @@ class AgentCheck(object):
 
     def profile_memory(self, func, namespaces=None, args=(), kwargs=None, extra_tags=None):
         # type: (Callable[..., Any], Optional[Sequence[str]], Sequence[Any], Optional[Dict[str, Any]], Optional[List[str]]) -> None  # noqa: E501
-        from ..utils.agent.memory import profile_memory
+        from datadog_checks.base.utils.agent.memory import profile_memory
 
         if namespaces is None:
             namespaces = self.check_id.split(':', 1)

datadog_checks/base/checks/kube_leader/base_check.py

@@ -1,7 +1,8 @@
 # (C) Datadog, Inc. 2018-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-from .. import AgentCheck
+from datadog_checks.base.checks import AgentCheck
+
 from .mixins import KubeLeaderElectionMixin
 
 

datadog_checks/base/checks/kube_leader/mixins.py

@@ -2,8 +2,8 @@
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
 from datadog_checks.base.agent import datadog_agent
+from datadog_checks.base.checks import AgentCheck
 
-from .. import AgentCheck
 from .record import ElectionRecordAnnotation, ElectionRecordLease
 
 # Import lazily to reduce memory footprint

datadog_checks/base/checks/kubelet_base/base.py

@@ -4,8 +4,8 @@
 import json
 from datetime import datetime, timedelta, timezone
 
-from ...utils.date import parse_rfc3339
-from .. import AgentCheck
+from datadog_checks.base.checks import AgentCheck
+from datadog_checks.base.utils.date import parse_rfc3339
 
 try:
     from datadog_agent import get_config

datadog_checks/base/checks/network.py

@@ -33,7 +33,7 @@ class NetworkCheck(AgentCheck):
         try:
             statuses = self._check(instance)
         except Exception:
-            self.log.exception(u"Failed to run instance '%s'.", instance.get('name', u""))
+            self.log.exception("Failed to run instance '%s'.", instance.get('name', ""))
         else:
             if isinstance(statuses, tuple):
                 # Assume the check only returns one service check

datadog_checks/base/checks/openmetrics/base_check.py

@@ -5,9 +5,10 @@ from copy import deepcopy
 
 import requests
 
-from ...errors import CheckException
-from ...utils.tracing import traced_class
-from .. import AgentCheck
+from datadog_checks.base.checks import AgentCheck
+from datadog_checks.base.errors import CheckException
+from datadog_checks.base.utils.tracing import traced_class
+
 from .mixins import OpenMetricsScraperMixin
 
 STANDARD_FIELDS = [

datadog_checks/base/checks/openmetrics/mixins.py

@@ -14,13 +14,12 @@ import requests
 from prometheus_client.samples import Sample
 
 from datadog_checks.base.agent import datadog_agent
-
-from ...config import is_affirmative
-from ...errors import CheckException
-from ...utils.common import to_native_string
-from ...utils.http import RequestsWrapper
-from .. import AgentCheck
-from ..libs.prometheus import text_fd_to_metric_families
+from datadog_checks.base.checks import AgentCheck
+from datadog_checks.base.checks.libs.prometheus import text_fd_to_metric_families
+from datadog_checks.base.config import is_affirmative
+from datadog_checks.base.errors import CheckException
+from datadog_checks.base.utils.common import to_native_string
+from datadog_checks.base.utils.http import RequestsWrapper
 
 
 class OpenMetricsScraperMixin(object):

datadog_checks/base/checks/openmetrics/v2/base.py

@@ -6,9 +6,10 @@ from contextlib import contextmanager
 
 from requests.exceptions import RequestException
 
-from ....errors import ConfigurationError
-from ....utils.tracing import traced_class
-from ... import AgentCheck
+from datadog_checks.base.checks import AgentCheck
+from datadog_checks.base.errors import ConfigurationError
+from datadog_checks.base.utils.tracing import traced_class
+
 from .scraper import OpenMetricsScraper
 
 

datadog_checks/base/checks/openmetrics/v2/labels.py

@@ -3,7 +3,7 @@
 # Licensed under a 3-clause BSD style license (see LICENSE)
 from collections import ChainMap
 
-from ....utils.functions import no_op
+from datadog_checks.base.utils.functions import no_op
 
 
 class LabelAggregator:

datadog_checks/base/checks/openmetrics/v2/scraper/__init__.py

@@ -0,0 +1,8 @@
+# (C) Datadog, Inc. 2025-present
+# All rights reserved
+# Licensed under a 3-clause BSD style license (see LICENSE)
+
+from . import decorators
+from .base_scraper import OpenMetricsCompatibilityScraper, OpenMetricsScraper
+
+__all__ = ["OpenMetricsScraper", "OpenMetricsCompatibilityScraper", "decorators"]

datadog_checks/base/checks/openmetrics/v2/{scraper.py → scraper/base_scraper.py}

@@ -4,25 +4,26 @@
 import fnmatch
 import inspect
 import re
+from collections.abc import Generator
 from copy import copy, deepcopy
 from itertools import chain
 from math import isinf, isnan
 from typing import List  # noqa: F401
 
+from prometheus_client import Metric
 from prometheus_client.openmetrics.parser import text_fd_to_metric_families as parse_openmetrics
 from prometheus_client.parser import text_fd_to_metric_families as parse_prometheus
 from requests.exceptions import ConnectionError
 
 from datadog_checks.base.agent import datadog_agent
-
-from ....config import is_affirmative
-from ....constants import ServiceCheck
-from ....errors import ConfigurationError
-from ....utils.functions import no_op, return_true
-from ....utils.http import RequestsWrapper
-from .first_scrape_handler import first_scrape_handler
-from .labels import LabelAggregator, get_label_normalizer
-from .transform import MetricTransformer
+from datadog_checks.base.checks.openmetrics.v2.first_scrape_handler import first_scrape_handler
+from datadog_checks.base.checks.openmetrics.v2.labels import LabelAggregator, get_label_normalizer
+from datadog_checks.base.checks.openmetrics.v2.transform import MetricTransformer
+from datadog_checks.base.config import is_affirmative
+from datadog_checks.base.constants import ServiceCheck
+from datadog_checks.base.errors import ConfigurationError
+from datadog_checks.base.utils.functions import no_op, return_true
+from datadog_checks.base.utils.http import RequestsWrapper
 
 
 class OpenMetricsScraper:
@@ -238,19 +239,21 @@ class OpenMetricsScraper:
         """
         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:
-            consume_method = self.consume_metrics_w_target_info
-        else:
-            consume_method = self.consume_metrics
-
-        for metric in consume_method(runtime_data):
+        for metric in self.yield_metrics(runtime_data):
             transformer = self.metric_transformer.get(metric)
             if transformer is None:
                 continue
 
             transformer(metric, self.generate_sample_data(metric), runtime_data)
 
+    def yield_metrics(self, runtime_data: dict) -> Generator[Metric]:
+        if self.target_info:
+            consume_method = self.consume_metrics_w_target_info
+        else:
+            consume_method = self.consume_metrics
+
+        yield from consume_method(runtime_data)
+
     def scrape(self):
         try:
             self._scrape()

datadog_checks/base/checks/openmetrics/v2/scraper/decorators.py

@@ -0,0 +1,48 @@
+# (C) Datadog, Inc. 2025-present
+# All rights reserved
+# Licensed under a 3-clause BSD style license (see LICENSE)
+
+from __future__ import annotations
+
+from functools import partial
+from typing import TYPE_CHECKING, Any
+
+from .base_scraper import OpenMetricsScraper
+
+if TYPE_CHECKING:
+    from collections.abc import Generator
+
+    from prometheus_client.metrics_core import Metric
+
+
+class WithHttpCodeClass(OpenMetricsScraper):
+    """
+    Scraper decorator that parses the HTTP status code from the metric and adds a new tag named
+    `code_class` to the metric.
+
+    The HTTP status code is parsed and a new tag named `code_class` is added to the metric
+    stating whether the status code is in the 1xx, 2xx, 3xx, 4xx, or 5xx range.
+    """
+
+    def __init__(self, scraper: OpenMetricsScraper, http_status_tag: str):
+        self.scraper = scraper
+        self.http_status_tag = http_status_tag
+        self.decorated_methods = {"yield_metrics": self.yield_metrics}
+
+    def __getattr__(self, name: str) -> Any:
+        return self.decorated_methods.get(name, getattr(self.scraper, name))
+
+    def _add_http_code_class(self, metric: Metric, http_status_tag: str) -> Metric:
+        for sample in metric.samples:
+            if (
+                (code := sample.labels.get(http_status_tag))
+                and isinstance(code, str)
+                and len(code) == 3
+                and code.isdigit()
+            ):
+                sample.labels["code_class"] = f"{code[0]}xx"
+        return metric
+
+    def yield_metrics(self, runtime_data: dict[str, Any]) -> Generator[Metric]:
+        add_http_code_class_func = partial(self._add_http_code_class, http_status_tag=self.http_status_tag)
+        yield from map(add_http_code_class_func, self.scraper.yield_metrics(runtime_data))

datadog_checks/base/checks/openmetrics/v2/transform.py

@@ -4,7 +4,8 @@
 import re
 from copy import deepcopy
 
-from ....config import is_affirmative
+from datadog_checks.base.config import is_affirmative
+
 from . import transformers
 
 DEFAULT_METRIC_TYPE = 'native'

datadog_checks/base/checks/openmetrics/v2/transformers/histogram.py

@@ -1,8 +1,8 @@
 # (C) Datadog, Inc. 2020-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-from ..labels import canonicalize_numeric_label
-from ..utils import decumulate_histogram_buckets
+from datadog_checks.base.checks.openmetrics.v2.labels import canonicalize_numeric_label
+from datadog_checks.base.checks.openmetrics.v2.utils import decumulate_histogram_buckets
 
 
 def get_histogram(check, metric_name, modifiers, global_options):

datadog_checks/base/checks/openmetrics/v2/transformers/service_check.py

@@ -1,7 +1,7 @@
 # (C) Datadog, Inc. 2020-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-from .....constants import ServiceCheck
+from datadog_checks.base.constants import ServiceCheck
 
 
 def get_service_check(check, metric_name, modifiers, global_options):

datadog_checks/base/checks/openmetrics/v2/transformers/temporal_percent.py

@@ -1,8 +1,8 @@
 # (C) Datadog, Inc. 2020-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-from .....utils.common import total_time_to_temporal_percent
-from .....utils.constants import TIME_UNITS
+from datadog_checks.base.utils.common import total_time_to_temporal_percent
+from datadog_checks.base.utils.constants import TIME_UNITS
 
 
 def get_temporal_percent(check, metric_name, modifiers, global_options):

datadog_checks/base/checks/openmetrics/v2/transformers/time_elapsed.py

@@ -1,7 +1,7 @@
 # (C) Datadog, Inc. 2020-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-from .....utils.time import get_timestamp
+from datadog_checks.base.utils.time import get_timestamp
 
 
 def get_time_elapsed(check, metric_name, modifiers, global_options):

datadog_checks/base/checks/prometheus/base_check.py

@@ -1,9 +1,10 @@
 # (C) Datadog, Inc. 2018-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-from ...errors import CheckException
-from ...utils.common import to_native_string
-from .. import AgentCheck
+from datadog_checks.base.checks import AgentCheck
+from datadog_checks.base.errors import CheckException
+from datadog_checks.base.utils.common import to_native_string
+
 from .mixins import PrometheusScraperMixin
 
 

datadog_checks/base/checks/prometheus/mixins.py

@@ -11,11 +11,11 @@ from math import isinf, isnan
 import requests
 from google.protobuf.internal.decoder import _DecodeVarint32  # pylint: disable=E0611,E0401
 
-from ...config import is_affirmative
-from ...utils.http import RequestsWrapper
-from ...utils.prometheus import metrics_pb2
-from .. import AgentCheck
-from ..libs.prometheus import text_fd_to_metric_families
+from datadog_checks.base.checks import AgentCheck
+from datadog_checks.base.checks.libs.prometheus import text_fd_to_metric_families
+from datadog_checks.base.config import is_affirmative
+from datadog_checks.base.utils.http import RequestsWrapper
+from datadog_checks.base.utils.prometheus import metrics_pb2
 
 
 class PrometheusFormat:
@@ -561,7 +561,7 @@ class PrometheusScraperMixin(object):
             headers['Accept-Encoding'] = 'gzip'
         if pFormat == PrometheusFormat.PROTOBUF:
             headers['accept'] = (
-                'application/vnd.google.protobuf; ' 'proto=io.prometheus.client.MetricFamily; ' 'encoding=delimited'
+                'application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=delimited'
             )
         handler = self.get_http_handler(endpoint, instance)
         if (
@@ -569,7 +569,7 @@ class PrometheusScraperMixin(object):
             and not handler.ignore_tls_warning
             and not is_affirmative(handler.options.get('ssl_verify', True))
         ):
-            self.log.debug(u'An unverified HTTPS request is being made to %s', endpoint)
+            self.log.debug('An unverified HTTPS request is being made to %s', endpoint)
 
         try:
             response = handler.get(endpoint, extra_headers=headers, stream=False)

datadog_checks/base/checks/prometheus/prometheus_base.py

@@ -2,8 +2,9 @@
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
 
-from ...utils.common import to_native_string
-from .. import AgentCheck
+from datadog_checks.base.checks import AgentCheck
+from datadog_checks.base.utils.common import to_native_string
+
 from .mixins import PrometheusScraperMixin
 
 # Prometheus check is a parent class providing a structure and some helpers

datadog_checks/base/checks/win/winpdh_base.py

@@ -6,8 +6,8 @@ from typing import Callable, Dict, List, Optional, Tuple  # noqa: F401
 
 import win32wnet
 
-from ... import AgentCheck, is_affirmative
-from ...utils.containers import hash_mutable
+from datadog_checks.base import AgentCheck, is_affirmative
+from datadog_checks.base.utils.containers import hash_mutable
 
 try:
     from .winpdh import DATA_TYPE_DOUBLE, DATA_TYPE_INT, WinPDHCounter

datadog_checks/base/checks/win/wmi/base.py

@@ -3,7 +3,8 @@
 # Licensed under a 3-clause BSD style license (see LICENSE)
 from typing import Any, Dict, List, Optional, Tuple  # noqa: F401
 
-from ... import AgentCheck
+from datadog_checks.base.checks import AgentCheck
+
 from .sampler import WMISampler
 from .types import TagQuery, WMIFilter, WMIMetric, WMIObject, WMIProperties  # noqa: F401
 
@@ -68,14 +69,14 @@ class WinWMICheck(AgentCheck):
             target_property = tag_query[3]
         except IndexError:
             self.log.error(
-                u"Wrong `tag_queries` parameter format. " "Please refer to the configuration file for more information."
+                "Wrong `tag_queries` parameter format. Please refer to the configuration file for more information."
             )
             raise
         except TypeError:
             wmi_property = tag_query[0]
             wmi_class = sampler.class_name
             self.log.error(
-                u"Incorrect 'link source property' in `tag_queries` parameter: `%s` is not a property of `%s`",
+                "Incorrect 'link source property' in `tag_queries` parameter: `%s` is not a property of `%s`",
                 wmi_property,
                 wmi_class,
             )
@@ -94,7 +95,7 @@ class WinWMICheck(AgentCheck):
                 message = "multiple results returned (one expected)"
 
             self.log.warning(
-                u"Failed to extract a tag from `tag_queries` parameter: %s. wmi_object=%s - query=%s",
+                "Failed to extract a tag from `tag_queries` parameter: %s. wmi_object=%s - query=%s",
                 message,
                 wmi_obj,
                 tag_query,
@@ -103,7 +104,7 @@ class WinWMICheck(AgentCheck):
 
         if sampler[0][target_property] is None:
             self.log.error(
-                u"Incorrect 'target property' in `tag_queries` parameter: `%s` is empty or is not a property of `%s`",
+                "Incorrect 'target property' in `tag_queries` parameter: `%s` is empty or is not a property of `%s`",
                 target_property,
                 target_class,
             )
@@ -116,7 +117,7 @@ class WinWMICheck(AgentCheck):
 
         Returns: tag or TagQueryUniquenessFailure exception.
         """
-        self.log.debug(u"`tag_queries` parameter found. wmi_object=%s - query=%s", wmi_obj, tag_query)
+        self.log.debug("`tag_queries` parameter found. wmi_object=%s - query=%s", wmi_obj, tag_query)
 
         # Extract query information
         target_class, target_property, filters = self._format_tag_query(sampler, wmi_obj, tag_query)
@@ -134,7 +135,7 @@ class WinWMICheck(AgentCheck):
 
         tag = "{tag_name}:{tag_value}".format(tag_name=target_property.lower(), tag_value="_".join(link_value.split()))
 
-        self.log.debug(u"Extracted `tag_queries` tag: '%s'", tag)
+        self.log.debug("Extracted `tag_queries` tag: '%s'", tag)
         return tag
 
     def _extract_metrics(self, wmi_sampler, tag_by, tag_queries, constant_tags):
@@ -154,7 +155,7 @@ class WinWMICheck(AgentCheck):
         """
         if len(wmi_sampler) > 1 and not tag_by:
             raise MissingTagBy(
-                u"WMI query returned multiple rows but no `tag_by` value was given."
+                "WMI query returned multiple rows but no `tag_by` value was given."
                 " class={wmi_class} - properties={wmi_properties} - filters={filters}".format(
                     wmi_class=wmi_sampler.class_name,
                     wmi_properties=wmi_sampler.property_names,
@@ -209,11 +210,11 @@ class WinWMICheck(AgentCheck):
                     extracted_metrics.append(WMIMetric(wmi_property, float(wmi_value), tags))
                 except ValueError:
                     self.log.warning(
-                        u"When extracting metrics with WMI, found a non digit value for property '%s'.", wmi_property
+                        "When extracting metrics with WMI, found a non digit value for property '%s'.", wmi_property
                     )
                     continue
                 except TypeError:
-                    self.log.warning(u"When extracting metrics with WMI, found a missing property '%s'", wmi_property)
+                    self.log.warning("When extracting metrics with WMI, found a missing property '%s'", wmi_property)
                     continue
         return extracted_metrics
 
@@ -241,7 +242,7 @@ class WinWMICheck(AgentCheck):
             try:
                 func = getattr(self, metric_type.lower())
             except AttributeError:
-                raise Exception(u"Invalid metric type: {0}".format(metric_type))
+                raise Exception("Invalid metric type: {0}".format(metric_type))
 
             func(metric_name, metric.value, metric.tags)
 
@@ -270,7 +271,7 @@ class WinWMICheck(AgentCheck):
             username=self.username,
             password=self.password,
             tag_by=tag_by,
-            **kwargs
+            **kwargs,
         )
 
     def _get_running_wmi_sampler(self, instance_key, wmi_class, properties, tag_by="", **kwargs):