Skip to content

[monitorlib/fetch] query_and_describe: catch AccessTokenError #1834

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
mickmis merged 2 commits into from
Oct 20, 2026
Merged

[monitorlib/fetch] query_and_describe: catch AccessTokenError #1834

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73cbc4c
[monitorlib/fetch] query_and_describe: catch AccessTokenError
mickmis Oct 20, 2026
c6d5d93
Update monitoring/monitorlib/fetch/__init__.py
mickmis Oct 20, 2026
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
7 changes: 7 additions & 0 deletions monitoring/monitorlib/fetch/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
from loguru import logger

from monitoring.monitorlib import infrastructure
from monitoring.monitorlib.auth import AccessTokenError
from monitoring.monitorlib.errors import stacktrace_string
from monitoring.monitorlib.infrastructure import AUTHORIZATION_DT
from monitoring.monitorlib.rid import RIDVersion
Expand Down Expand Up @@ -770,6 +771,12 @@ def context_contains(exception, types) -> bool:

return build_failing_query(t0)

except AccessTokenError as e:
failure_message = f"query_and_describe attempt {attempt + 1} from PID {os.getpid()} to {verb} {url} failed with non-retryable AccessTokenError {type(e).__name__}: {str(e)}\nAt {get_traceback_location()}"
# We ignore expect_failure here as failing to retrieve the access token is not supported as an expected failure.
failures.append(failure_message)
return build_failing_query(t0)

previous_query = build_failing_query(
t0
) # If we arrive there, query failled, but is retriable
Expand Down
Loading