Skip to content

Add new handled exceptions #17773

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

Merged
merged 8 commits into from
Jun 11, 2024
Merged

Add new handled exceptions #17773

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5074574
Add new handled exceptions
jose-manuel-almaza Jun 7, 2024
c34cb4c
Added changelog
jose-manuel-almaza Jun 7, 2024
4649aa1
Update openstack_controller/changelog.d/17773.added
jose-manuel-almaza Jun 7, 2024
b5837c0
Merge branch 'master' into jose/add-new-handle-exceptions
jose-manuel-almaza Jun 10, 2024
4e6287e
return http error response instead of raising an exception
jose-manuel-almaza Jun 11, 2024
b05359c
Merge branch 'master' into jose/add-new-handle-exceptions
jose-manuel-almaza Jun 11, 2024
8c6a5ea
Catch all requests exceptions usingrequests.exceptions.RequestException
jose-manuel-almaza Jun 11, 2024
54e3164
Remove CatalogEndPointFailure exception
jose-manuel-almaza Jun 11, 2024
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
1 change: 1 addition & 0 deletions openstack_controller/changelog.d/17773.added
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Handle more exceptions by lowering severity of logs
9 changes: 6 additions & 3 deletions openstack_controller/datadog_checks/openstack_controller/components/component.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
from enum import Enum, unique
from functools import wraps

from requests.exceptions import HTTPError
import requests

from datadog_checks.base import AgentCheck
from datadog_checks.openstack_controller.api.catalog import CatalogEndPointFailure


def argument_value(arg_name, func, *args, **kwargs):
Expand Down Expand Up @@ -75,10 +76,12 @@ def wrapper(self, *args, **kwargs):
tags = argument_value('tags', func, *args, **kwargs)
self.check.service_check(self.SERVICE_CHECK, AgentCheck.OK, tags=tags)
return result if result is not None else True
except HTTPError as e:
self.check.log.error("HTTPError: %s", e.response)
except (requests.HTTPError, requests.ConnectionError, requests.Timeout, requests.RequestException) as e:
self.check.log.debug("HTTPError: %s", e.response)
if report_service_check:
self.check.service_check(self.SERVICE_CHECK, AgentCheck.CRITICAL, tags=tags)
except CatalogEndPointFailure as e:
self.check.log.debug("CatalogEndPointFailure: %s", e)
except Exception as e:
self.check.log.error("Exception: %s", e)
return None
Expand Down
4 changes: 2 additions & 2 deletions openstack_controller/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,7 @@ def get(url, *args, **kwargs):
method = 'GET'
url = get_url_path(url)
if http_error and url in http_error:
raise requests.exceptions.HTTPError(response=http_error[url])
return http_error[url]

if data and url in data:
return MockResponse(json_data=data[url], status_code=200)
Expand All @@ -1015,7 +1015,7 @@ def post(url, *args, **kwargs):
if exception and url in exception:
raise exception[url]
if http_error and url in http_error:
raise requests.exceptions.HTTPError(response=http_error[url])
return http_error[url]
if url == '/identity/v3/auth/tokens':
data = kwargs['json']
scope = data.get('auth', {}).get('scope', 'unscoped')
Expand Down
Loading