From de7a325377719886fb51f3260844938592664c16 Mon Sep 17 00:00:00 2001 From: Barbara Miller Date: Mon, 7 Oct 2024 15:50:32 -0700 Subject: [PATCH] histograms track_inprogress ... --- brozzler/worker.py | 8 ++++---- brozzler/ydl.py | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/brozzler/worker.py b/brozzler/worker.py index d289911..116bb75 100644 --- a/brozzler/worker.py +++ b/brozzler/worker.py @@ -317,8 +317,8 @@ class BrozzlerWorker: ) return outlinks - @metrics.brozzler_in_progress_headers.time() - @metrics.brozzler_header_processing_duration_seconds.track_inprogress() + @metrics.brozzler_header_processing_duration_seconds.time() + @metrics.brozzler_in_progress_headers.track_inprogress() def _get_page_headers(self, page): # bypassing warcprox, requests' stream=True defers downloading the body of the response # see https://docs.python-requests.org/en/latest/user/advanced/#body-content-workflow @@ -338,8 +338,8 @@ class BrozzlerWorker: return False return True - @metrics.brozzler_in_progress_browses.time() - @metrics.brozzler_browsing_duration_seconds.track_inprogress() + @metrics.brozzler_browsing_duration_seconds.time() + @metrics.brozzler_in_progress_browses.track_inprogress() def _browse_page(self, browser, site, page, on_screenshot=None, on_request=None): def update_page_metrics(page, outlinks): """Update page-level Prometheus metrics.""" diff --git a/brozzler/ydl.py b/brozzler/ydl.py index a72b904..682b099 100644 --- a/brozzler/ydl.py +++ b/brozzler/ydl.py @@ -404,9 +404,8 @@ def _try_youtube_dl(worker, ydl, site, page): ) return ie_result - -@metrics.brozzler_in_progress_ytdlps.time() -@metrics.brozzler_ytdlp_duration_seconds.track_inprogress() +@metrics.brozzler_ytdlp_duration_seconds.time() +@metrics.brozzler_in_progress_ytdlps.track_inprogress() def do_youtube_dl(worker, site, page): """ Runs yt-dlp configured for `worker` and `site` to download videos from