Remove Python2 logic when loading checks (#18620)

* Remove Python2 logic when loading checks

* remove py2 test for argocd

active_directory/datadog_checks/active_directory/active_directory.py

@@ -1,18 +1,15 @@
 # (C) Datadog, Inc. 2013-present
 # All rights reserved
 # Licensed under Simplified BSD License (see LICENSE)
-from six import PY3
-
 from datadog_checks.base import PDHBaseCheck, is_affirmative
 
+from .check import ActiveDirectoryCheckV2
 from .metrics import DEFAULT_COUNTERS
 
 
 class ActiveDirectoryCheck(PDHBaseCheck):
     def __new__(cls, name, init_config, instances):
-        if PY3 and not is_affirmative(instances[0].get('use_legacy_check_version', False)):
-            from .check import ActiveDirectoryCheckV2
-
+        if not is_affirmative(instances[0].get('use_legacy_check_version', False)):
             return ActiveDirectoryCheckV2(name, init_config, instances)
         else:
             return super(ActiveDirectoryCheck, cls).__new__(cls)

aerospike/datadog_checks/aerospike/aerospike.py

@@ -10,11 +10,11 @@
 from collections import defaultdict
 from typing import List  # noqa: F401
 
-from six import PY2, iteritems
-
-from datadog_checks.base import AgentCheck, ConfigurationError
+from datadog_checks.base import AgentCheck
 from datadog_checks.base.errors import CheckException
 
+from .check import AerospikeCheckV2
+
 try:
     import aerospike
 except ImportError as e:
@@ -78,15 +78,6 @@ def __new__(cls, name, init_config, instances):
         instance = instances[0]
 
         if 'openmetrics_endpoint' in instance:
-            if PY2:
-                raise ConfigurationError(
-                    "This version of the integration is only available when using py3. "
-                    "Check https://docs.datadoghq.com/agent/guide/agent-v6-python-3 "
-                    "for more information or use the older style config."
-                )
-            # TODO: when we drop Python 2 move this import up top
-            from .check import AerospikeCheckV2
-
             return AerospikeCheckV2(name, init_config, instances)
 
         else:
@@ -232,7 +223,7 @@ def collect_info(self, command, metric_type, separator=';', required_keys=None,
                 self.log.warning('Exceeded cap `%s` for metric type `%s` - please contact support', cap, metric_type)
                 return
 
-        for key, value in iteritems(required_data):
+        for key, value in required_data.items():
             self.send(metric_type, key, value, tags)
 
     def get_namespaces(self):
@@ -491,7 +482,7 @@ def collect_latency(self, namespaces):
 
             ns_latencies[ns].setdefault("metric_names", []).extend(metric_names)
 
-        for ns, v in iteritems(ns_latencies):
+        for ns, v in ns_latencies.items():
             metric_names = v.get("metric_names", [])
             metric_values = v.get("metric_values", [])
             namespace_tags = ['namespace:{}'.format(ns)] if ns else []

amazon_msk/datadog_checks/amazon_msk/amazon_msk.py

@@ -4,10 +4,10 @@
 import json
 
 import boto3
-from six import PY2
 
 from datadog_checks.base import ConfigurationError, OpenMetricsBaseCheck, is_affirmative
 
+from .check import AmazonMskCheckV2
 from .metrics import JMX_METRICS_MAP, JMX_METRICS_OVERRIDES, NODE_METRICS_MAP, NODE_METRICS_OVERRIDES
 from .utils import construct_boto_config
 
@@ -29,15 +29,6 @@ def __new__(cls, name, init_config, instances):
         instance = instances[0]
 
         if is_affirmative(instance.get('use_openmetrics', False)):
-            if PY2:
-                raise ConfigurationError(
-                    "Openmetrics on this integration is only available when using py3. "
-                    "Check https://docs.datadoghq.com/agent/guide/agent-v6-python-3 "
-                    "for more information"
-                )
-            # TODO: when we drop Python 2 move this import up top
-            from .check import AmazonMskCheckV2
-
             return AmazonMskCheckV2(name, init_config, instances)
         else:
             return super(AmazonMskCheck, cls).__new__(cls)

argocd/datadog_checks/argocd/check.py

@@ -3,8 +3,6 @@
 # Licensed under a 3-clause BSD style license (see LICENSE)
 from collections import defaultdict
 
-from six import PY2
-
 from datadog_checks.base import ConfigurationError, OpenMetricsBaseCheckV2
 from datadog_checks.base.constants import ServiceCheck
 
@@ -36,12 +34,6 @@ class ArgocdCheck(OpenMetricsBaseCheckV2, ConfigMixin):
     DEFAULT_METRIC_LIMIT = 0
 
     def __init__(self, name, init_config, instances):
-        if PY2:
-            raise ConfigurationError(
-                "This version of the integration is only available when using py3. "
-                "Check https://docs.datadoghq.com/agent/guide/agent-v6-python-3 "
-                "for more information."
-            )
         super(ArgocdCheck, self).__init__(name, init_config, instances)
         self.check_initializations.appendleft(self.parse_config)
         self.check_initializations.append(self.configure_additional_transformers)

argocd/tests/test_argocd.py

@@ -3,11 +3,9 @@
 # Licensed under a 3-clause BSD style license (see LICENSE)
 
 import pytest
-from mock import patch
 
 from datadog_checks.argocd import ArgocdCheck
 from datadog_checks.base.constants import ServiceCheck
-from datadog_checks.base.errors import ConfigurationError
 from datadog_checks.dev.utils import get_metadata_metrics
 
 from .common import (
@@ -96,10 +94,3 @@ def test_app_controller_service_check(dd_run_check, aggregator, mock_http_respon
         ServiceCheck.UNKNOWN,
         tags=['endpoint:http://app_controller:8082', 'name:faz'],
     )
-
-
-@patch('datadog_checks.argocd.check.PY2', True)
-def test_py2():
-    # Test to ensure that a ConfigurationError is raised when running with Python 2.
-    with pytest.raises(ConfigurationError, match="This version of the integration is only available when using py3."):
-        ArgocdCheck('argocd', {}, [MOCKED_APP_CONTROLLER_INSTANCE])

aspdotnet/datadog_checks/aspdotnet/aspdotnet.py

@@ -1,10 +1,9 @@
 # (C) Datadog, Inc. 2013-present
 # All rights reserved
 # Licensed under Simplified BSD License (see LICENSE)
-from six import PY3
-
 from datadog_checks.base import PDHBaseCheck, is_affirmative
 
+from .check import AspdotnetCheckV2
 from .metrics import DEFAULT_COUNTERS
 
 EVENT_TYPE = SOURCE_TYPE_NAME = 'aspdotnet'
@@ -13,9 +12,7 @@
 class AspdotnetCheck(PDHBaseCheck):
     def __new__(cls, name, init_config, instances):
 
-        if PY3 and not is_affirmative(instances[0].get('use_legacy_check_version', False)):
-            from .check import AspdotnetCheckV2
-
+        if not is_affirmative(instances[0].get('use_legacy_check_version', False)):
             return AspdotnetCheckV2(name, init_config, instances)
         else:
             return super(AspdotnetCheck, cls).__new__(cls)

cilium/datadog_checks/cilium/cilium.py

@@ -1,10 +1,9 @@
 # (C) Datadog, Inc. 2019-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-from six import PY2
-
 from datadog_checks.base import ConfigurationError, OpenMetricsBaseCheck, is_affirmative
 
+from .check import CiliumCheckV2
 from .metrics import AGENT_METRICS, OPERATOR_METRICS
 
 
@@ -19,15 +18,6 @@ def __new__(cls, name, init_config, instances):
         instance = instances[0]
 
         if is_affirmative(instance.get('use_openmetrics', False)):
-            if PY2:
-                raise ConfigurationError(
-                    "This version of the integration is only available when using py3. "
-                    "Check https://docs.datadoghq.com/agent/guide/agent-v6-python-3 "
-                    "for more information or use the older style config."
-                )
-            # TODO: when we drop Python 2 move this import up top
-            from .check import CiliumCheckV2
-
             return CiliumCheckV2(name, init_config, instances)
         else:
             return super(CiliumCheck, cls).__new__(cls)

cockroachdb/datadog_checks/cockroachdb/cockroachdb.py

@@ -1,10 +1,9 @@
 # (C) Datadog, Inc. 2018-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-from six import PY2
-
-from datadog_checks.base import ConfigurationError, OpenMetricsBaseCheck
+from datadog_checks.base import OpenMetricsBaseCheck
 
+from .check import CockroachdbCheckV2
 from .metrics import METRIC_MAP
 
 
@@ -16,15 +15,6 @@ def __new__(cls, name, init_config, instances):
         instance = instances[0]
 
         if 'openmetrics_endpoint' in instance:
-            if PY2:
-                raise ConfigurationError(
-                    'This version of the integration is only available when using Python 3. '
-                    'Check https://docs.datadoghq.com/agent/guide/agent-v6-python-3/ '
-                    'for more information or use the older style config.'
-                )
-            # TODO: when we drop Python 2 move this import up top
-            from .check import CockroachdbCheckV2
-
             return CockroachdbCheckV2(name, init_config, instances)
         else:
             return super(CockroachdbCheck, cls).__new__(cls)

coredns/datadog_checks/coredns/coredns.py

@@ -1,10 +1,9 @@
 # (C) Datadog, Inc. 2018-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-from six import PY2
-
 from datadog_checks.base import ConfigurationError, OpenMetricsBaseCheck
 
+from .check import CoreDNS
 from .metrics import DEFAULT_METRICS, GO_METRICS
 
 
@@ -25,15 +24,6 @@ def __new__(cls, name, init_config, instances):
         instance = instances[0]
 
         if 'openmetrics_endpoint' in instance:
-            if PY2:
-                raise ConfigurationError(
-                    "This version of the integration is only available when using py3. "
-                    "Check https://docs.datadoghq.com/agent/guide/agent-v6-python-3 "
-                    "for more information or use the older style config."
-                )
-            # TODO: when we drop Python 2 move this import up top
-            from .check import CoreDNS
-
             return CoreDNS(name, init_config, instances)
         else:
             return super(CoreDNSCheck, cls).__new__(cls)

dotnetclr/datadog_checks/dotnetclr/dotnetclr.py

@@ -1,20 +1,17 @@
 # (C) Datadog, Inc. 2013-present
 # All rights reserved
 # Licensed under Simplified BSD License (see LICENSE)
-from six import PY3
-
 from datadog_checks.base import PDHBaseCheck, is_affirmative
 
+from .check import DotnetclrCheckV2
 from .metrics import DEFAULT_COUNTERS
 
 EVENT_TYPE = SOURCE_TYPE_NAME = 'dotnetclr'
 
 
 class DotnetclrCheck(PDHBaseCheck):
     def __new__(cls, name, init_config, instances):
-        if PY3 and not is_affirmative(instances[0].get('use_legacy_check_version', False)):
-            from .check import DotnetclrCheckV2
-
+        if not is_affirmative(instances[0].get('use_legacy_check_version', False)):
             return DotnetclrCheckV2(name, init_config, instances)
         else:
             return super(DotnetclrCheck, cls).__new__(cls)

envoy/datadog_checks/envoy/envoy.py

@@ -6,10 +6,10 @@
 from urllib.parse import urljoin
 
 import requests
-from six import PY2
 
 from datadog_checks.base import AgentCheck, ConfigurationError, is_affirmative
 
+from .check import EnvoyCheckV2
 from .errors import UnknownMetric, UnknownTags
 from .parser import parse_histogram, parse_metric
 from .utils import _get_server_info
@@ -27,15 +27,6 @@ def __new__(cls, name, init_config, instances):
         instance = instances[0]
 
         if 'openmetrics_endpoint' in instance:
-            if PY2:
-                raise ConfigurationError(
-                    "This version of the integration is only available when using py3. "
-                    "Check https://docs.datadoghq.com/agent/guide/agent-v6-python-3 "
-                    "for more information or use the older style config."
-                )
-            # TODO: when we drop Python 2 move this import up top
-            from .check import EnvoyCheckV2
-
             return EnvoyCheckV2(name, init_config, instances)
         else:
             return super(Envoy, cls).__new__(cls)

exchange_server/datadog_checks/exchange_server/exchange_server.py

@@ -1,18 +1,15 @@
 # (C) Datadog, Inc. 2013-present
 # All rights reserved
 # Licensed under Simplified BSD License (see LICENSE)
-from six import PY3
-
 from datadog_checks.base import PDHBaseCheck, is_affirmative
 
+from .check import ExchangeCheckV2
 from .metrics import DEFAULT_COUNTERS
 
 
 class ExchangeCheck(PDHBaseCheck):
     def __new__(cls, name, init_config, instances):
-        if PY3 and not is_affirmative(instances[0].get('use_legacy_check_version', False)):
-            from .check import ExchangeCheckV2
-
+        if not is_affirmative(instances[0].get('use_legacy_check_version', False)):
             return ExchangeCheckV2(name, init_config, instances)
         else:
             return super(ExchangeCheck, cls).__new__(cls)

gitlab/datadog_checks/gitlab/gitlab.py

@@ -4,13 +4,13 @@
 from copy import deepcopy
 
 import requests
-from six import PY2
 
 from datadog_checks.base import AgentCheck
 from datadog_checks.base.checks.openmetrics import OpenMetricsBaseCheck
-from datadog_checks.base.errors import CheckException, ConfigurationError
+from datadog_checks.base.errors import CheckException
 
 from .common import get_gitlab_version, get_tags
+from .gitlab_v2 import GitlabCheckV2
 from .metrics import METRICS_MAP
 
 
@@ -41,15 +41,6 @@ def __new__(cls, name, init_config, instances):
         instance = instances[0]
 
         if instance.get('openmetrics_endpoint'):
-            if PY2:
-                raise ConfigurationError(
-                    'This version of the integration is only available when using Python 3. '
-                    'Check https://docs.datadoghq.com/agent/guide/agent-v6-python-3/ '
-                    'for more information or use the older style config.'
-                )
-            # TODO: when we drop Python 2 move this import up top
-            from .gitlab_v2 import GitlabCheckV2
-
             return GitlabCheckV2(name, init_config, instances)
 
         return super(GitlabCheck, cls).__new__(cls)

haproxy/datadog_checks/haproxy/check.py

@@ -1,10 +1,9 @@
 # (C) Datadog, Inc. 2020-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-from six import PY2
-
-from datadog_checks.base import ConfigurationError, OpenMetricsBaseCheck, is_affirmative
+from datadog_checks.base import OpenMetricsBaseCheck, is_affirmative
 
+from .checkv2 import HaproxyCheckV2
 from .legacy.haproxy import HAProxyCheckLegacy
 from .metrics import METRIC_MAP
 
@@ -16,14 +15,6 @@ def __new__(cls, name, init_config, instances):
         instance = instances[0]
 
         if is_affirmative(instance.get('use_openmetrics', False)):
-            if PY2:
-                raise ConfigurationError(
-                    "Openmetrics on this integration is only available when using py3. "
-                    "Check https://docs.datadoghq.com/agent/guide/agent-v6-python-3 "
-                    "for more information"
-                )
-            from .checkv2 import HaproxyCheckV2
-
             return HaproxyCheckV2(name, init_config, instances)
         elif is_affirmative(instance.get('use_prometheus', False)):
             return super(HAProxyCheck, cls).__new__(cls)