Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix warnings usage related to RequestsWrapper, Openmetrics and Prometheus #5080

Merged
merged 11 commits into from
Nov 27, 2019
Merged

Fix warnings usage related to RequestsWrapper, Openmetrics and Prometheus #5080

Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f53af46
Remove warning lock
AlexandreYang Nov 25, 2019
6035f82
Revert warnings.catch_warnings
AlexandreYang Nov 26, 2019
46dd7ea
Revert comments
AlexandreYang Nov 26, 2019
ba83d99
Refactor handle_tls_warning
AlexandreYang Nov 26, 2019
785b08b
Refactor warnings
AlexandreYang Nov 26, 2019
aabf428
Refactor mixins
AlexandreYang Nov 26, 2019
8501e66
Improve tests
AlexandreYang Nov 26, 2019
9123fd2
Address reviews
AlexandreYang Nov 27, 2019
9bc997f
Add test filters_count_append
AlexandreYang Nov 27, 2019
f4062c7
Fix test
AlexandreYang Nov 27, 2019
51a5406
Update imports
AlexandreYang Nov 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions datadog_checks_base/datadog_checks/base/utils/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# Licensed under a 3-clause BSD style license (see LICENSE)
import logging
import os
import threading
import warnings
from contextlib import contextmanager

Expand Down Expand Up @@ -94,10 +93,6 @@ class RequestsWrapper(object):
'request_hooks',
)

# For modifying the warnings filter since the context
# manager that is provided changes module constants
warning_lock = threading.Lock()

def __init__(self, instance, init_config, remapper=None, logger=None):
self.logger = logger or LOGGER
default_fields = dict(STANDARD_FIELDS)
Expand Down Expand Up @@ -339,13 +334,11 @@ def populate_options(self, options):

@contextmanager
def handle_tls_warning(self):
with self.warning_lock:

with warnings.catch_warnings():
if self.ignore_tls_warning:
warnings.simplefilter('ignore', InsecureRequestWarning)
with warnings.catch_warnings():
if self.ignore_tls_warning:
warnings.simplefilter('ignore', InsecureRequestWarning)

yield
yield

@property
def session(self):
Expand Down