Merge branch 'prom-ii' into qa

This commit is contained in:
Barbara Miller 2024-10-07 15:50:54 -07:00
commit cd3ddb3f23
2 changed files with 6 additions and 7 deletions

View File

@ -327,8 +327,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
@ -364,8 +364,8 @@ class BrozzlerWorker:
and "application/pdf" in page_headers["content-type"]
)
@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."""

View File

@ -412,9 +412,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