From 540294d7f25408cd12fbfaedba73b581323fe53a Mon Sep 17 00:00:00 2001 From: Jonathan Vuillemin Date: Fri, 15 Mar 2024 11:13:46 +0100 Subject: [PATCH] feat(httpserver): Updated metrics base name --- httpserver/factory_test.go | 16 ++++++------- httpserver/middleware/request_metrics.go | 4 ++-- httpserver/middleware/request_metrics_test.go | 24 +++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/httpserver/factory_test.go b/httpserver/factory_test.go index e07afbda..7b225b3e 100644 --- a/httpserver/factory_test.go +++ b/httpserver/factory_test.go @@ -1966,15 +1966,15 @@ func TestCreateWithRequestMetricsAndWithNormalization(t *testing.T) { assert.Contains(t, rec.Body.String(), `baz`) expectedCounterMetric := ` - # HELP namespace_subsystem_httpserver_requests_total Number of processed HTTP requests - # TYPE namespace_subsystem_httpserver_requests_total counter - namespace_subsystem_httpserver_requests_total{method="GET",path="/foo/bar/:id",status="2xx"} 1 + # HELP namespace_subsystem_http_server_requests_total Number of processed HTTP requests + # TYPE namespace_subsystem_http_server_requests_total counter + namespace_subsystem_http_server_requests_total{method="GET",path="/foo/bar/:id",status="2xx"} 1 ` err = testutil.GatherAndCompare( registry, strings.NewReader(expectedCounterMetric), - "namespace_subsystem_httpserver_requests_total", + "namespace_subsystem_http_server_requests_total", ) assert.NoError(t, err) } @@ -2009,15 +2009,15 @@ func TestCreateWithRequestMetricsAndWithoutNormalization(t *testing.T) { assert.Contains(t, rec.Body.String(), `baz`) expectedCounterMetric := ` - # HELP namespace_subsystem_httpserver_requests_total Number of processed HTTP requests - # TYPE namespace_subsystem_httpserver_requests_total counter - namespace_subsystem_httpserver_requests_total{method="GET",path="/foo/bar/baz?page=1",status="200"} 1 + # HELP namespace_subsystem_http_server_requests_total Number of processed HTTP requests + # TYPE namespace_subsystem_http_server_requests_total counter + namespace_subsystem_http_server_requests_total{method="GET",path="/foo/bar/baz?page=1",status="200"} 1 ` err = testutil.GatherAndCompare( registry, strings.NewReader(expectedCounterMetric), - "namespace_subsystem_httpserver_requests_total", + "namespace_subsystem_http_server_requests_total", ) assert.NoError(t, err) } diff --git a/httpserver/middleware/request_metrics.go b/httpserver/middleware/request_metrics.go index 866c0189..6d12d635 100644 --- a/httpserver/middleware/request_metrics.go +++ b/httpserver/middleware/request_metrics.go @@ -12,8 +12,8 @@ import ( ) const ( - HttpServerMetricsRequestsCount = "httpserver_requests_total" - HttpServerMetricsRequestsDuration = "httpserver_requests_duration_seconds" + HttpServerMetricsRequestsCount = "http_server_requests_total" + HttpServerMetricsRequestsDuration = "http_server_requests_duration_seconds" HttpServerMetricsNotFoundPath = "/not-found" ) diff --git a/httpserver/middleware/request_metrics_test.go b/httpserver/middleware/request_metrics_test.go index a0131452..d91f883a 100644 --- a/httpserver/middleware/request_metrics_test.go +++ b/httpserver/middleware/request_metrics_test.go @@ -39,15 +39,15 @@ func TestRequestMetricsMiddlewareWithDefaults(t *testing.T) { // requests counter assertions expectedCounterMetric := ` - # HELP httpserver_requests_total Number of processed HTTP requests - # TYPE httpserver_requests_total counter - httpserver_requests_total{method="GET",path="/not-found",status="2xx"} 1 + # HELP http_server_requests_total Number of processed HTTP requests + # TYPE http_server_requests_total counter + http_server_requests_total{method="GET",path="/not-found",status="2xx"} 1 ` err = testutil.GatherAndCompare( prometheus.DefaultGatherer, strings.NewReader(expectedCounterMetric), - "httpserver_requests_total", + "http_server_requests_total", ) assert.NoError(t, err) } @@ -85,15 +85,15 @@ func TestRequestMetricsMiddlewareWithSkipper(t *testing.T) { // requests counter assertions expectedCounterMetric := ` - # HELP httpserver_requests_total Number of processed HTTP requests - # TYPE httpserver_requests_total counter - httpserver_requests_total{path="/not-found",method="GET",status="200"} 1 + # HELP http_server_requests_total Number of processed HTTP requests + # TYPE http_server_requests_total counter + http_server_requests_total{path="/not-found",method="GET",status="200"} 1 ` err = testutil.GatherAndCompare( registry, strings.NewReader(expectedCounterMetric), - "httpserver_requests_total", + "http_server_requests_total", ) assert.Error(t, err) assert.Contains(t, err.Error(), "metric output does not match expectation") @@ -132,15 +132,15 @@ func TestRequestMetricsMiddlewareWithCustomOptions(t *testing.T) { // requests counter assertions expectedCounterMetric := ` - # HELP namespace_subsystem_httpserver_requests_total Number of processed HTTP requests - # TYPE namespace_subsystem_httpserver_requests_total counter - namespace_subsystem_httpserver_requests_total{method="GET",path="/not-found",status="4xx"} 1 + # HELP namespace_subsystem_http_server_requests_total Number of processed HTTP requests + # TYPE namespace_subsystem_http_server_requests_total counter + namespace_subsystem_http_server_requests_total{method="GET",path="/not-found",status="4xx"} 1 ` err = testutil.GatherAndCompare( registry, strings.NewReader(expectedCounterMetric), - "namespace_subsystem_httpserver_requests_total", + "namespace_subsystem_http_server_requests_total", ) assert.NoError(t, err) }