Fix base package tests

Author: dkirov-dd

datadog_checks_base/tests/base/checks/openmetrics/test_legacy/test_openmetrics.py

@@ -157,7 +157,7 @@ def test_poll_text_plain(mocked_prometheus_check, mocked_prometheus_scraper_conf
     mock_response = mock.MagicMock(
         status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': text_content_type}
     )
-    with mock.patch('requests.get', return_value=mock_response, __name__="get"):
+    with mock.patch('requests.Session.get', return_value=mock_response, __name__="get"):
         response = check.poll(mocked_prometheus_scraper_config)
         messages = list(check.parse_metric_family(response, mocked_prometheus_scraper_config))
         messages.sort(key=lambda x: x.name)
@@ -174,7 +174,7 @@ def test_poll_octet_stream(mocked_prometheus_check, mocked_prometheus_scraper_co
     mock_response.status_code = 200
     mock_response.headers = {'Content-Type': 'application/octet-stream'}
 
-    with mock.patch('requests.get', return_value=mock_response, __name__="get"):
+    with mock.patch('requests.Session.get', return_value=mock_response, __name__="get"):
         response = check.poll(mocked_prometheus_scraper_config)
         messages = list(check.parse_metric_family(response, mocked_prometheus_scraper_config))
         assert len(messages) == 40
@@ -1695,7 +1695,7 @@ def test_ignore_metrics_multiple_wildcards(
     mock_response = mock.MagicMock(
         status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': text_content_type}
     )
-    with mock.patch('requests.get', return_value=mock_response, __name__="get"):
+    with mock.patch('requests.Session.get', return_value=mock_response, __name__="get"):
         check.process(config)
 
         # Make sure metrics are ignored
@@ -1803,7 +1803,7 @@ def test_metrics_with_ignore_label_values(
     mock_response = mock.MagicMock(
         status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': text_content_type}
     )
-    with mock.patch('requests.get', return_value=mock_response, __name__="get"):
+    with mock.patch('requests.Session.get', return_value=mock_response, __name__="get"):
         check.process(config)
 
         # Make sure metrics are ignored
@@ -1854,7 +1854,7 @@ def test_match_metrics_multiple_wildcards(
     mock_response = mock.MagicMock(
         status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': text_content_type}
     )
-    with mock.patch('requests.get', return_value=mock_response, __name__="get"):
+    with mock.patch('requests.Session.get', return_value=mock_response, __name__="get"):
         check.process(config)
 
         aggregator.assert_metric('prometheus.go_memstats_mcache_inuse_bytes', count=1)
@@ -2304,7 +2304,7 @@ def test_label_joins_gc(aggregator, mocked_prometheus_check, mocked_prometheus_s
     mock_response = mock.MagicMock(
         status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': text_content_type}
     )
-    with mock.patch('requests.get', return_value=mock_response, __name__="get"):
+    with mock.patch('requests.Session.get', return_value=mock_response, __name__="get"):
         check.process(mocked_prometheus_scraper_config)
         assert 'dd-agent-1337' in mocked_prometheus_scraper_config['_label_mapping']['pod']
         assert 'dd-agent-62bgh' not in mocked_prometheus_scraper_config['_label_mapping']['pod']
@@ -2464,7 +2464,7 @@ def test_label_join_state_change(aggregator, mocked_prometheus_check, mocked_pro
     mock_response = mock.MagicMock(
         status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': text_content_type}
     )
-    with mock.patch('requests.get', return_value=mock_response, __name__="get"):
+    with mock.patch('requests.Session.get', return_value=mock_response, __name__="get"):
         check.process(mocked_prometheus_scraper_config)
         assert 15 == len(mocked_prometheus_scraper_config['_label_mapping']['pod'])
         assert mocked_prometheus_scraper_config['_label_mapping']['pod']['dd-agent-62bgh']['phase'] == 'Test'
@@ -2582,7 +2582,7 @@ def mock_filter_get():
     with open(f_name, 'r') as f:
         text_data = f.read()
     with mock.patch(
-        'requests.get',
+        'requests.Session.get',
         return_value=mock.MagicMock(
             status_code=200,
             iter_lines=lambda **kwargs: text_data.split("\n"),
@@ -2672,7 +2672,7 @@ def test_ssl_verify_not_raise_warning(caplog, mocked_openmetrics_check_factory,
     check = mocked_openmetrics_check_factory(instance)
     scraper_config = check.get_scraper_config(instance)
 
-    with caplog.at_level(logging.DEBUG), mock.patch('requests.get', return_value=MockResponse('httpbin.org')):
+    with caplog.at_level(logging.DEBUG), mock.patch('requests.Session.get', return_value=MockResponse('httpbin.org')):
         resp = check.send_request('https://httpbin.org/get', scraper_config)
 
     assert "httpbin.org" in resp.content.decode('utf-8')
@@ -2696,7 +2696,7 @@ def test_send_request_with_dynamic_prometheus_url(caplog, mocked_openmetrics_che
     # `prometheus_url` changed just before calling `send_request`
     scraper_config['prometheus_url'] = 'https://www.example.com/foo/bar'
 
-    with caplog.at_level(logging.DEBUG), mock.patch('requests.get', return_value=MockResponse('httpbin.org')):
+    with caplog.at_level(logging.DEBUG), mock.patch('requests.Session.get', return_value=MockResponse('httpbin.org')):
         resp = check.send_request('https://httpbin.org/get', scraper_config)
 
     assert "httpbin.org" in resp.content.decode('utf-8')

datadog_checks_base/tests/base/checks/prometheus/test_prometheus.py

@@ -5,6 +5,7 @@
 # Licensed under Simplified BSD License (see LICENSE)
 import logging
 import os
+import ssl
 from collections import OrderedDict
 
 import mock
@@ -334,7 +335,7 @@ def test_poll_protobuf(mocked_prometheus_check, bin_data):
     """Tests poll using the protobuf format"""
     check = mocked_prometheus_check
     mock_response = mock.MagicMock(status_code=200, content=bin_data, headers={'Content-Type': protobuf_content_type})
-    with mock.patch('requests.get', return_value=mock_response, __name__="get"):
+    with mock.patch('requests.Session.get', return_value=mock_response, __name__="get"):
         response = check.poll("http://fake.endpoint:10055/metrics")
         messages = list(check.parse_metric_family(response))
         assert len(messages) == 61
@@ -347,7 +348,7 @@ def test_poll_text_plain(mocked_prometheus_check, text_data):
     mock_response = mock.MagicMock(
         status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': "text/plain"}
     )
-    with mock.patch('requests.get', return_value=mock_response, __name__="get"):
+    with mock.patch('requests.Session.get', return_value=mock_response, __name__="get"):
         response = check.poll("http://fake.endpoint:10055/metrics")
         messages = list(check.parse_metric_family(response))
         messages.sort(key=lambda x: x.name)
@@ -1284,7 +1285,7 @@ def test_label_joins(sorted_tags_check):
     mock_response = mock.MagicMock(
         status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': "text/plain"}
     )
-    with mock.patch('requests.get', return_value=mock_response, __name__="get"):
+    with mock.patch('requests.Session.get', return_value=mock_response, __name__="get"):
         check = sorted_tags_check
         check.NAMESPACE = 'ksm'
         check.label_joins = {
@@ -1634,7 +1635,7 @@ def test_label_joins_gc(sorted_tags_check):
     mock_response = mock.MagicMock(
         status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': "text/plain"}
     )
-    with mock.patch('requests.get', return_value=mock_response, __name__="get"):
+    with mock.patch('requests.Session.get', return_value=mock_response, __name__="get"):
         check = sorted_tags_check
         check.NAMESPACE = 'ksm'
         check.label_joins = {'kube_pod_info': {'label_to_match': 'pod', 'labels_to_get': ['node', 'pod_ip']}}
@@ -1684,7 +1685,7 @@ def test_label_joins_gc(sorted_tags_check):
     mock_response = mock.MagicMock(
         status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': "text/plain"}
     )
-    with mock.patch('requests.get', return_value=mock_response, __name__="get"):
+    with mock.patch('requests.Session.get', return_value=mock_response, __name__="get"):
         check.process("http://fake.endpoint:10055/metrics")
         assert 'dd-agent-1337' in check._label_mapping['pod']
         assert 'dd-agent-62bgh' not in check._label_mapping['pod']
@@ -1700,7 +1701,7 @@ def test_label_joins_missconfigured(sorted_tags_check):
     mock_response = mock.MagicMock(
         status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': "text/plain"}
     )
-    with mock.patch('requests.get', return_value=mock_response, __name__="get"):
+    with mock.patch('requests.Session.get', return_value=mock_response, __name__="get"):
         check = sorted_tags_check
         check.NAMESPACE = 'ksm'
         check.label_joins = {'kube_pod_info': {'label_to_match': 'pod', 'labels_to_get': ['node', 'not_existing']}}
@@ -1753,7 +1754,7 @@ def test_label_join_not_existing(sorted_tags_check):
     mock_response = mock.MagicMock(
         status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': "text/plain"}
     )
-    with mock.patch('requests.get', return_value=mock_response, __name__="get"):
+    with mock.patch('requests.Session.get', return_value=mock_response, __name__="get"):
         check = sorted_tags_check
         check.NAMESPACE = 'ksm'
         check.label_joins = {'kube_pod_info': {'label_to_match': 'not_existing', 'labels_to_get': ['node', 'pod_ip']}}
@@ -1792,7 +1793,7 @@ def test_label_join_metric_not_existing(sorted_tags_check):
     mock_response = mock.MagicMock(
         status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': "text/plain"}
     )
-    with mock.patch('requests.get', return_value=mock_response, __name__="get"):
+    with mock.patch('requests.Session.get', return_value=mock_response, __name__="get"):
         check = sorted_tags_check
         check.NAMESPACE = 'ksm'
         check.label_joins = {'not_existing': {'label_to_match': 'pod', 'labels_to_get': ['node', 'pod_ip']}}
@@ -1831,7 +1832,7 @@ def test_label_join_with_hostname(sorted_tags_check):
     mock_response = mock.MagicMock(
         status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': "text/plain"}
     )
-    with mock.patch('requests.get', return_value=mock_response, __name__="get"):
+    with mock.patch('requests.Session.get', return_value=mock_response, __name__="get"):
         check = sorted_tags_check
         check.NAMESPACE = 'ksm'
         check.label_joins = {'kube_pod_info': {'label_to_match': 'pod', 'labels_to_get': ['node']}}
@@ -1883,7 +1884,7 @@ def mock_get():
     with open(f_name, 'r') as f:
         text_data = f.read()
     mock_get = mock.patch(
-        'requests.get',
+        'requests.Session.get',
         return_value=mock.MagicMock(
             status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': "text/plain"}
         ),
@@ -1966,7 +1967,7 @@ def test_ssl_verify_not_raise_warning(caplog, mocked_prometheus_check, text_data
 
     check = mocked_prometheus_check
 
-    with caplog.at_level(logging.DEBUG), mock.patch('requests.get', return_value=MockResponse('httpbin.org')):
+    with caplog.at_level(logging.DEBUG), mock.patch('requests.Session.get', return_value=MockResponse('httpbin.org')):
         resp = check.poll('https://httpbin.org/get')
 
     assert 'httpbin.org' in resp.content.decode('utf-8')
@@ -1982,7 +1983,7 @@ def test_ssl_verify_not_raise_warning_cert_false(caplog, mocked_prometheus_check
     check = mocked_prometheus_check
     check.ssl_ca_cert = False
 
-    with caplog.at_level(logging.DEBUG), mock.patch('requests.get', return_value=MockResponse('httpbin.org')):
+    with caplog.at_level(logging.DEBUG), mock.patch('requests.Session.get', return_value=MockResponse('httpbin.org')):
         resp = check.poll('https://httpbin.org/get')
 
     assert 'httpbin.org' in resp.content.decode('utf-8')
@@ -2018,29 +2019,32 @@ def test_requests_wrapper_config():
         ]
     )
 
-    with mock.patch("requests.get") as get:
-        check.poll(instance_http['prometheus_endpoint'], instance=instance_http)
-        get.assert_called_with(
-            instance_http['prometheus_endpoint'],
-            stream=False,
-            headers=expected_headers,
-            auth=requests.auth.HTTPDigestAuth('data', 'dog'),
-            cert='/path/to/cert',
-            timeout=(42.0, 42.0),
-            proxies=None,
-            verify=True,
-            allow_redirects=True,
-        )
-
-        check.poll(instance_http['prometheus_endpoint'])
-        get.assert_called_with(
-            instance_http['prometheus_endpoint'],
-            stream=False,
-            headers=expected_headers,
-            auth=requests.auth.HTTPDigestAuth('data', 'dog'),
-            cert='/path/to/cert',
-            timeout=(42.0, 42.0),
-            proxies=None,
-            verify=True,
-            allow_redirects=True,
-        )
+    with mock.patch("requests.Session.get") as get:
+        with mock.patch.object(ssl.SSLContext, 'load_cert_chain') as mock_load_cert_chain:
+            mock_load_cert_chain.return_value = None
+
+            check.poll(instance_http['prometheus_endpoint'], instance=instance_http)
+            get.assert_called_with(
+                instance_http['prometheus_endpoint'],
+                stream=False,
+                headers=expected_headers,
+                auth=requests.auth.HTTPDigestAuth('data', 'dog'),
+                cert='/path/to/cert',
+                timeout=(42.0, 42.0),
+                proxies=None,
+                verify=True,
+                allow_redirects=True,
+            )
+
+            check.poll(instance_http['prometheus_endpoint'])
+            get.assert_called_with(
+                instance_http['prometheus_endpoint'],
+                stream=False,
+                headers=expected_headers,
+                auth=requests.auth.HTTPDigestAuth('data', 'dog'),
+                cert='/path/to/cert',
+                timeout=(42.0, 42.0),
+                proxies=None,
+                verify=True,
+                allow_redirects=True,
+            )