Skip to content

feat(httpserver): Updated metrics base name #171

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 1 commit into from
Mar 15, 2024
Merged

feat(httpserver): Updated metrics base name #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions httpserver/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions httpserver/middleware/request_metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
24 changes: 12 additions & 12 deletions httpserver/middleware/request_metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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)
}