From 0f280ef9e75ceeab24722d296c78b3e6a004f981 Mon Sep 17 00:00:00 2001 From: Jaime Martinez Date: Thu, 1 Oct 2020 15:03:59 +1000 Subject: Rename all zip and httprange metrics Renames all metrics to make them easier to understand. Adds a missing metric for number of open requests made by httprange. --- acceptance_test.go | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'acceptance_test.go') diff --git a/acceptance_test.go b/acceptance_test.go index 5b7788ce..c946167e 100644 --- a/acceptance_test.go +++ b/acceptance_test.go @@ -487,14 +487,17 @@ func TestPrometheusMetricsCanBeScraped(t *testing.T) { require.Contains(t, string(body), "gitlab_pages_serving_time_seconds_sum") require.Contains(t, string(body), `gitlab_pages_domains_source_api_requests_total{status_code="200"}`) require.Contains(t, string(body), `gitlab_pages_domains_source_api_call_duration_bucket`) - // object storage - require.Contains(t, string(body), `gitlab_pages_object_storage_backend_requests_total{status_code="206"}`) - require.Contains(t, string(body), `gitlab_pages_object_storage_backend_requests_duration_bucket`) - require.Contains(t, string(body), `gitlab_pages_object_storage_backend_httptrace_duration`) - require.Contains(t, string(body), `gitlab_pages_zip_archives_total`) - require.Contains(t, string(body), `gitlab_pages_zip_archives_currently_cached`) - require.Contains(t, string(body), `gitlab_pages_files_per_zip_archive_currently_cached`) - require.Contains(t, string(body), `gitlab_pages_files_per_zip_archive_total`) + // httprange + require.Contains(t, string(body), `gitlab_pages_httprange_requests_total{status_code="206"}`) + require.Contains(t, string(body), "gitlab_pages_httprange_requests_duration_bucket") + require.Contains(t, string(body), "gitlab_pages_httprange_trace_duration") + require.Contains(t, string(body), "gitlab_pages_httprange_open_requests") + // zip archives + require.Contains(t, string(body), "gitlab_pages_zip_opened") + require.Contains(t, string(body), "gitlab_pages_zip_cache_requests") + require.Contains(t, string(body), "gitlab_pages_zip_cached_archives") + require.Contains(t, string(body), "gitlab_pages_zip_archive_entries_cached") + require.Contains(t, string(body), "gitlab_pages_zip_opened_entries_count") } func TestDisabledRedirects(t *testing.T) { -- cgit v1.2.3