extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-08-16 01:58:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Extract app metrics to a separate struct (#520)

Browse Source
This commit is contained in:
Misha Bragin
2022-10-22 11:50:21 +02:00
committed by GitHub
parent ed2214f9a9
commit 84879a356b
5 changed files with 119 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
management/server/http/handler.go
View File

@ -5,14 +5,14 @@ import (
"github.com/gorilla/mux"
s "github.com/netbirdio/netbird/management/server"
"github.com/netbirdio/netbird/management/server/http/middleware"
"github.com/netbirdio/netbird/management/server/metrics"
"github.com/rs/cors"
"go.opentelemetry.io/otel/metric"
"net/http"
)
// APIHandler creates the Management service HTTP API handler registering all the available endpoints.
func APIHandler(accountManager s.AccountManager, authIssuer string, authAudience string, authKeysLocation string,
meter metric.Meter) (http.Handler, error) {
func APIHandler(ctx context.Context, accountManager s.AccountManager, authIssuer string, authAudience string, authKeysLocation string,
appMetrics metrics.AppMetrics) (http.Handler, error) {
jwtMiddleware, err := middleware.NewJwtMiddleware(
authIssuer,
authAudience,
@ -29,13 +29,13 @@ func APIHandler(accountManager s.AccountManager, authIssuer string, authAudience
accountManager.IsUserAdmin)
rootRouter := mux.NewRouter()
metrics, err := middleware.NewMetricsMiddleware(context.Background(), meter)
metricsMiddleware, err := metrics.NewMetricsMiddleware(ctx, appMetrics)
if err != nil {
return nil, err
}
apiHandler := rootRouter.PathPrefix("/api").Subrouter()
apiHandler.Use(metrics.Handler, corsMiddleware.Handler, jwtMiddleware.Handler, acMiddleware.Handler)
apiHandler.Use(metricsMiddleware.Handler, corsMiddleware.Handler, jwtMiddleware.Handler, acMiddleware.Handler)
groupsHandler := NewGroups(accountManager, authAudience)
rulesHandler := NewRules(accountManager, authAudience)
@ -95,7 +95,7 @@ func APIHandler(accountManager s.AccountManager, authIssuer string, authAudience
if err != nil {
return err
}
err = metrics.AddHTTPRequestResponseCounter(template, method)
err = metricsMiddleware.AddHTTPRequestResponseCounter(template, method)
if err != nil {
return err
}