Skip to content

Safely pass Prometheus key deletion errors since not every setup will use it #585

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 5 commits into from
Apr 22, 2025
Merged

Safely pass Prometheus key deletion errors since not every setup will use it #585

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6bda176
Skip all prometheus data deletion errors since not all setups will ha…
tieneupin Apr 16, 2025
a44ec98
More granular try-except blocks
tieneupin Apr 16, 2025
e3ec1ae
Encased prometheus metric deletion calls in utility function to notif…
tieneupin Apr 17, 2025
6e91a65
Added function to inspect contents of the prometheus gauges and count…
tieneupin Apr 17, 2025
2a9ed08
Added explicit return
tieneupin Apr 17, 2025
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
17 changes: 10 additions & 7 deletions src/murfey/server/api/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1616,8 +1616,8 @@
sessions_for_visit = db.exec(
select(Session).where(Session.visit == session.visit)
).all()
# Don't remove prometheus metrics if there are other sessions using them
if len(sessions_for_visit) == 1:
# Don't remove prometheus metrics if there are other sessions using them
try:
prom.monitoring_switch.remove(session.visit)
except KeyError:
Expand All @@ -1626,12 +1626,15 @@
select(RsyncInstance).where(RsyncInstance.session_id == session_id)
).all()
for ri in rsync_instances:
prom.seen_files.remove(ri.source, session.visit)
prom.transferred_files.remove(ri.source, session.visit)
prom.transferred_files_bytes.remove(ri.source, session.visit)
prom.seen_data_files.remove(ri.source, session.visit)
prom.transferred_data_files.remove(ri.source, session.visit)
prom.transferred_data_files_bytes.remove(ri.source, session.visit)
try:
prom.seen_files.remove(ri.source, session.visit)
prom.transferred_files.remove(ri.source, session.visit)
prom.transferred_files_bytes.remove(ri.source, session.visit)
prom.seen_data_files.remove(ri.source, session.visit)
prom.transferred_data_files.remove(ri.source, session.visit)
prom.transferred_data_files_bytes.remove(ri.source, session.visit)
except KeyError:
pass
collected_ids = db.exec(
select(DataCollectionGroup, DataCollection, ProcessingJob)
.where(DataCollectionGroup.session_id == session_id)
Expand Down