feat: improve the metrics handling

snapp-incubator · Oct 23, 2024 · 0b339d4 · 0b339d4
1 parent 629ce81
commit 0b339d4
Show file tree

Hide file tree

Showing 10 changed files with 218 additions and 195 deletions.
diff --git a/internal/api/acl.go b/internal/api/acl.go
@@ -43,7 +43,7 @@ func (a API) ACLv2(c *fiber.Ctx) error {
 				zap.String("username", request.Username),
 				zap.String("password", request.Password),
 			)
-		authenticator.IncrementWithErrorACLCounter("unknown_company_before_parse_body", err)
+		a.Metrics.ACLFailed("unknown_company_before_parse_body", err)
 
 		return c.Status(http.StatusOK).JSON(ACLResponse{
 			Result: "deny",
@@ -85,7 +85,7 @@ func (a API) ACLv2(c *fiber.Ctx) error {
 			span.RecordError(err)
 		}
 
-		authenticator.IncrementWithErrorACLCounter(vendor, err)
+		a.Metrics.ACLFailed(vendor, err)
 
 		var tnaErr authenticator.TopicNotAllowedError
 
@@ -106,7 +106,7 @@ func (a API) ACLv2(c *fiber.Ctx) error {
 
 	logger.
 		Info("acl ok")
-	authenticator.IncrementACLCounter(vendor)
+	a.Metrics.ACLSuccess(vendor)
 
 	return c.Status(http.StatusOK).JSON(ACLResponse{
 		Result: "allow",

diff --git a/internal/api/api.go b/internal/api/api.go
@@ -8,6 +8,7 @@ import (
 	"github.com/gofiber/fiber/v2"
 	"github.com/snapp-incubator/soteria/internal/authenticator"
 	"github.com/snapp-incubator/soteria/internal/clientid"
+	"github.com/snapp-incubator/soteria/internal/metric"
 	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/zap"
 )
@@ -20,6 +21,7 @@ type API struct {
 	Tracer         trace.Tracer
 	Parser         *clientid.Parser
 	Logger         *zap.Logger
+	Metrics        *metric.APIMetrics
 }
 
 // MetricLogSkipper check if route is equal "metric" disable log.
@@ -39,7 +41,7 @@ func (a API) ReSTServer() *fiber.App {
 		Logger: a.Logger.Named("fiber"),
 	}))
 
-	prometheus := fiberprometheus.NewWith("http", "dispatching", "soteria")
+	prometheus := fiberprometheus.NewWith("http", "platform", "soteria")
 	prometheus.RegisterAt(app, "/metrics")
 	app.Use(prometheus.Middleware)
 

diff --git a/internal/api/api_test.go b/internal/api/api_test.go
@@ -16,6 +16,7 @@ import (
 	"github.com/snapp-incubator/soteria/internal/authenticator"
 	"github.com/snapp-incubator/soteria/internal/clientid"
 	"github.com/snapp-incubator/soteria/internal/config"
+	"github.com/snapp-incubator/soteria/internal/metric"
 	"github.com/stretchr/testify/suite"
 	"go.opentelemetry.io/otel/trace/noop"
 	"go.uber.org/zap"
@@ -138,6 +139,7 @@ func (suite *APITestSuite) SetupSuite() {
 		DefaultVendor: "snapp",
 		Tracer:        noop.NewTracerProvider().Tracer(""),
 		Logger:        zap.NewExample(),
+		Metrics:       metric.NewAPIMetrics(),
 		Parser: clientid.NewParser(clientid.Config{
 			Patterns: map[string]string{},
 		}),

diff --git a/internal/api/auth.go b/internal/api/auth.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/golang-jwt/jwt/v5"
-	"github.com/snapp-incubator/soteria/internal/authenticator"
 	"go.opentelemetry.io/otel/attribute"
 	"go.uber.org/zap"
 )
@@ -42,7 +41,7 @@ func (a API) Authv2(c *fiber.Ctx) error {
 			Warn("bad request",
 				zap.Error(err),
 			)
-		authenticator.IncrementWithErrorAuthCounter("unknown_company_before_parse_body", "-", err)
+		a.Metrics.AuthFailed("unknown_company_before_parse_body", "-", err)
 
 		return c.Status(http.StatusOK).JSON(AuthResponse{
 			Result:      "deny",
@@ -74,7 +73,7 @@ func (a API) Authv2(c *fiber.Ctx) error {
 
 	if err := auth.Auth(ctx, token); err != nil {
 		span.RecordError(err)
-		authenticator.IncrementWithErrorAuthCounter(vendor, source, err)
+		a.Metrics.AuthFailed(vendor, source, err)
 
 		if !errors.Is(err, jwt.ErrTokenExpired) {
 			logger.
@@ -92,7 +91,7 @@ func (a API) Authv2(c *fiber.Ctx) error {
 
 	logger.
 		Info("auth ok")
-	authenticator.IncrementAuthCounter(vendor, source)
+	a.Metrics.AuthSuccess(vendor, source)
 
 	return c.Status(http.StatusOK).JSON(AuthResponse{
 		Result:      "allow",

diff --git a/internal/authenticator/metrics.go b/internal/authenticator/metrics.go
diff --git a/internal/authenticator/metrics_test.go b/internal/authenticator/metrics_test.go
diff --git a/internal/cmd/serve/main.go b/internal/cmd/serve/main.go
@@ -11,6 +11,7 @@ import (
 	"github.com/snapp-incubator/soteria/internal/authenticator"
 	"github.com/snapp-incubator/soteria/internal/clientid"
 	"github.com/snapp-incubator/soteria/internal/config"
+	"github.com/snapp-incubator/soteria/internal/metric"
 	"github.com/spf13/cobra"
 	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/zap"
@@ -39,6 +40,7 @@ func (s Serve) main() {
 		Tracer:         s.Tracer,
 		Logger:         s.Logger.Named("api"),
 		Parser:         clientid.NewParser(s.Cfg.Parser),
+		Metrics:        metric.NewAPIMetrics(),
 	}
 
 	if _, ok := api.Authenticators[s.Cfg.DefaultVendor]; !ok {