additional fixups; rm total suffix

still broken due to open-telemetry/opentelemetry-go#3369
coupergateway · Dec 5, 2022 · bd63ba9 · bd63ba9
1 parent 34730d6
commit bd63ba9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/handler/middleware/trace.go b/handler/middleware/trace.go
@@ -65,10 +65,12 @@ func (th *TraceHandler) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 	meter := provider.Meter("couper/server")
 
 	counter, _ := meter.SyncInt64().
-		Counter(instrumentation.ClientRequest, instrument.WithDescription(string(unit.Dimensionless)))
+		Counter(instrumentation.ClientRequest,
+			instrument.WithDescription(string(unit.Dimensionless)))
 	duration, _ := meter.SyncFloat64().
-		Histogram(instrumentation.ClientRequestDuration, instrument.WithDescription(string(unit.Dimensionless)))
+		Histogram(instrumentation.ClientRequestDuration,
+			instrument.WithDescription(string(unit.Dimensionless)))
 
-	counter.Add(req.Context(), 1)
-	duration.Record(req.Context(), end.Seconds())
+	counter.Add(req.Context(), 1, metricsAttrs...)
+	duration.Record(req.Context(), end.Seconds(), metricsAttrs...)
 }
diff --git a/server/http_telemetry_test.go b/server/http_telemetry_test.go
@@ -57,7 +57,7 @@ func TestServeMetrics(t *testing.T) {
 		`couper_client_request_total{code="404",host="localhost:8080",method="GET",service_name="my-service",service_version="0"} 1`,
 		`couper_client_request_error_types_total{error="route_not_found_error",service_name="my-service",service_version="0"} 1`,
 		`couper_client_connections_total{service_name="my-service",service_version="0"} 3`,
-		`go_goroutines{service_name="my-service"}`,
+		`go_goroutines{service_name="my-service",service_version="0"}`,
 	}
 
 	for _, expMetric := range expMetrics {

diff --git a/telemetry/instrumentation/instrumentation.go b/telemetry/instrumentation/instrumentation.go
@@ -8,12 +8,12 @@ const (
 
 	BackendConnections         = Prefix + "backend_connections_count"
 	BackendConnectionsLifetime = Prefix + "backend_connections_lifetime_seconds"
-	BackendConnectionsTotal    = Prefix + "backend_connections_total"
+	BackendConnectionsTotal    = Prefix + "backend_connections"
 	BackendHealthState         = Prefix + "backend_up"
-	BackendRequest             = Prefix + "backend_request_total"
+	BackendRequest             = Prefix + "backend_request"
 	BackendRequestDuration     = Prefix + "backend_request_duration_seconds"
 	ClientConnections          = Prefix + "client_connections_count"
-	ClientConnectionsTotal     = Prefix + "client_connections_total"
-	ClientRequest              = Prefix + "client_request_total"
+	ClientConnectionsTotal     = Prefix + "client_connections"
+	ClientRequest              = Prefix + "client_request"
 	ClientRequestDuration      = Prefix + "client_request_duration_seconds"
 )