Skip to content

Commit e291f77

Browse files
authored
Merge pull request #3727 from LinPr/fix
backend: HeadlampServer: Move router initialization codes to createHeadlampHandler
2 parents 2308586 + f4298cb commit e291f77

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

backend/cmd/headlamp.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,11 @@ func createHeadlampHandler(config *HeadlampConfig) http.Handler {
453453
r = baseRoute.PathPrefix(config.BaseURL).Subrouter()
454454
}
455455

456+
if config.Telemetry != nil && config.Metrics != nil {
457+
r.Use(telemetry.TracingMiddleware("headlamp-server"))
458+
r.Use(config.Metrics.RequestCounterMiddleware)
459+
}
460+
456461
fmt.Println("*** Headlamp Server ***")
457462
fmt.Println(" API Routers:")
458463

@@ -1139,13 +1144,6 @@ func StartHeadlampServer(config *HeadlampConfig) {
11391144
config.Metrics = metrics
11401145
config.telemetryHandler = telemetry.NewRequestHandler(tel, metrics)
11411146

1142-
router := mux.NewRouter()
1143-
1144-
if config.Telemetry != nil && config.Metrics != nil {
1145-
router.Use(telemetry.TracingMiddleware("headlamp-server"))
1146-
router.Use(config.Metrics.RequestCounterMiddleware)
1147-
}
1148-
11491147
// Copy static files as squashFS is read-only (AppImage)
11501148
if config.StaticDir != "" {
11511149
dir, err := os.MkdirTemp(os.TempDir(), ".headlamp")

0 commit comments

Comments
 (0)