Remove tenant id from metrics

The tenantid is no longer a label on latency metrics. Additionally corrected the generated mocks for azbus. AB#8906
datatrails · May 7, 2024 · d602252 · d602252
1 parent 2c5ead5
commit d602252
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 49 deletions.
diff --git a/azbus/mocks/Handler.go b/azbus/mocks/Handler.go
diff --git a/azbus/mocks/MsgReceiver.go b/azbus/mocks/MsgReceiver.go
diff --git a/azbus/mocks/MsgSender.go b/azbus/mocks/MsgSender.go
diff --git a/metrics/handler.go b/metrics/handler.go
@@ -4,8 +4,6 @@ import (
 	"net/http"
 	"strings"
 	"time"
-
-	"github.com/datatrails/go-datatrails-common/tenantid"
 )
 
 // Tailored Prometheus metrics
@@ -53,21 +51,9 @@ func (m *Metrics) NewLatencyMetricsHandler(h http.Handler) http.Handler {
 
 		latency := time.Since(start).Seconds()
 
-		header := lrw.Header()
-
 		// generate post-process metrics here...
 
-		// tenantID
-		// TODO: when we put the tenant ID in the JWT we can get rid of these
-		// odd header arrangements
-		var tenant string
-		tenantID := tenantid.GetTenantIDFromHeader(header)
-		if tenantID != "" {
-			log.Debugf("tenant ID %s", tenantID)
-			tenant = strings.TrimPrefix(tenantID, tenantid.Prefix)
-			tenantid.DeleteTenantIDFromHeader(header)
-		}
-		observer.ObserveRequestsCount(fields, r.Method, tenant)
-		observer.ObserveRequestsLatency(latency, fields, r.Method, tenant)
+		observer.ObserveRequestsCount(fields, r.Method)
+		observer.ObserveRequestsLatency(latency, fields, r.Method)
 	})
 }
diff --git a/metrics/metrics.go b/metrics/metrics.go
@@ -18,9 +18,9 @@ func CosmosChargeMetric() *prometheus.GaugeVec {
 	return prometheus.NewGaugeVec(
 		prometheus.GaugeOpts{
 			Name: "archivist_cosmos_charge",
-			Help: "Cosmos charge by tenant, method and resource.",
+			Help: "Cosmos charge by method and resource.",
 		},
-		[]string{"tenant", "method", "resource"},
+		[]string{"method", "resource"},
 	)
 }
 
@@ -29,9 +29,9 @@ func CosmosDurationMetric() *prometheus.GaugeVec {
 	return prometheus.NewGaugeVec(
 		prometheus.GaugeOpts{
 			Name: "archivist_cosmos_duration",
-			Help: "Cosmos duration by tenant, method and resource.",
+			Help: "Cosmos duration by method and resource.",
 		},
-		[]string{"tenant", "method", "resource"},
+		[]string{"method", "resource"},
 	)
 }
 
@@ -40,9 +40,9 @@ func RequestsCounterMetric() *prometheus.CounterVec {
 	return prometheus.NewCounterVec(
 		prometheus.CounterOpts{
 			Name: "archivist_requests_total",
-			Help: "Total number of requests by method, tenant, service and resource.",
+			Help: "Total number of requests by method, service and resource.",
 		},
-		[]string{"method", "tenant", "service", "resource"},
+		[]string{"method", "service", "resource"},
 	)
 }
 
@@ -57,7 +57,7 @@ func RequestsLatencyMetric() *prometheus.HistogramVec {
 			Help:    "Histogram of time to reply to request.",
 			Buckets: []float64{.005, .01, .02, .04, .08, .16, .32},
 		},
-		[]string{"method", "tenant", "service", "resource"},
+		[]string{"method", "service", "resource"},
 	)
 }
 

diff --git a/metrics/observers.go b/metrics/observers.go
@@ -38,23 +38,23 @@ func NewLatencyObservers(m *Metrics) LatencyObservers {
 	return o
 }
 
-func (o *LatencyObservers) ObserveRequestsCount(fields []string, method string, tenant string) {
+func (o *LatencyObservers) ObserveRequestsCount(fields []string, method string) {
 
 	for _, label := range o.labels {
 		if len(fields) > label.offset && fields[label.offset] == label.label {
-			o.log.Infof("Count %s: %s, %s", label.label, method, tenant)
-			o.requestsCounter.WithLabelValues(method, tenant, o.serviceName, label.label).Inc()
+			o.log.Infof("Count %s: %s", label.label, method)
+			o.requestsCounter.WithLabelValues(method, o.serviceName, label.label).Inc()
 			return
 		}
 	}
 }
 
-func (o *LatencyObservers) ObserveRequestsLatency(elapsed float64, fields []string, method string, tenant string) {
+func (o *LatencyObservers) ObserveRequestsLatency(elapsed float64, fields []string, method string) {
 
 	for _, label := range o.labels {
 		if len(fields) > label.offset && fields[label.offset] == label.label {
-			o.log.Infof("Latency %v %s: %s, %s", elapsed, label.label, method, tenant)
-			o.requestsLatency.WithLabelValues(method, tenant, o.serviceName, label.label).Observe(elapsed)
+			o.log.Infof("Latency %v %s: %s", elapsed, label.label, method)
+			o.requestsLatency.WithLabelValues(method, o.serviceName, label.label).Observe(elapsed)
 			return
 		}
 	}

diff --git a/startup/run.go b/startup/run.go
@@ -25,7 +25,7 @@ func Run(serviceName string, run Runner) {
 		}
 		err := run(serviceName, log)
 		if err != nil {
-			log.Infof("Error terminating: %v", err)
+			log.Infof("Error at startup: %v", err)
 			exitCode = 1
 		}
 		return exitCode