add webservice label to metrics (#49)

* add webservice label to metrics * remove webservice label from request latency
snapp-incubator · Apr 8, 2024 · 2d7be3a · 2d7be3a
1 parent ddae9a9
commit 2d7be3a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/pkg/auth/metrics.go b/pkg/auth/metrics.go
@@ -13,6 +13,7 @@ const (
 	HasUpstreamAuth             = "upstream_auth_enabled"
 	ObjectKindLabel             = "kind"
 	WithDownstreamDeadlineLabel = "with_downstream_deadline"
+	WebserviceLabel 			= "webservice" 
 
 	MetricsKindSecret                  = "secret"
 	MetricsKindWebservice              = "webservice"
@@ -33,7 +34,7 @@ var (
 			Name: "check_request_count",
 			Help: "CheckRequest count",
 		},
-		[]string{CerberusReasonLabel, CheckRequestVersionLabel, HasUpstreamAuth},
+		[]string{CerberusReasonLabel, CheckRequestVersionLabel, HasUpstreamAuth, WebserviceLabel},
 	)
 
 	reqLatency = prometheus.NewHistogramVec(
@@ -128,7 +129,7 @@ var (
 			Name: "upstream_auth_failed_requests_total",
 			Help: "Total number of failed UpstreamAuth requests",
 		},
-		[]string{"with_downstream_deadline"},
+		[]string{WithDownstreamDeadlineLabel},
 	)
 )
 
@@ -193,3 +194,11 @@ func AddWithDownstreamDeadlineLabel(labels prometheus.Labels, hasDeadline bool)
 	}
 	return labels
 }
+
+func AddWebserviceLabel(labels prometheus.Labels, wsvc string) prometheus.Labels {
+    if labels == nil {
+        labels = prometheus.Labels{}
+    }
+    labels[WebserviceLabel] = wsvc
+    return labels
+}
diff --git a/pkg/auth/server.go b/pkg/auth/server.go
@@ -48,8 +48,10 @@ func (a *authV2) Check(ctx context.Context, check *CheckRequestV2) (*CheckRespon
 	labels := AddReasonLabel(nil, reason)
 	labels = AddUpstreamAuthLabel(labels, request.Context[HasUpstreamAuth])
 	labels[CheckRequestVersionLabel] = MetricsCheckRequestVersion2
-	reqCount.With(labels).Inc()
 	reqLatency.With(labels).Observe(time.Since(reqStartTime).Seconds())
+	labels = AddWebserviceLabel(labels, string(CerberusHeaderWebservice))
+	reqCount.With(labels).Inc()
+
 
 	return final_response, nil
 }
@@ -74,8 +76,9 @@ func (a *authV3) Check(ctx context.Context, check *CheckRequestV3) (*CheckRespon
 	labels := AddReasonLabel(nil, reason)
 	labels = AddUpstreamAuthLabel(labels, request.Context[HasUpstreamAuth])
 	labels[CheckRequestVersionLabel] = MetricsCheckRequestVersion3
-	reqCount.With(labels).Inc()
 	reqLatency.With(labels).Observe(time.Since(reqStartTime).Seconds())
+	labels = AddWebserviceLabel(labels, string(CerberusHeaderWebservice))
+	reqCount.With(labels).Inc()
 
 	return final_response, nil
 }