Merge current v2.5 into master

2021-09-23 15:30:01 +02:00
parent 07a3c37a23 61ceb7a32c
commit 380514941c
35 changed files with 773 additions and 161 deletions
--- a/pkg/server/router/router.go
+++ b/pkg/server/router/router.go
@@ -184,7 +184,7 @@ func (m *Manager) buildHTTPHandler(ctx context.Context, router *runtime.RouterIn
 	chain := alice.New()

 	if m.metricsRegistry != nil && m.metricsRegistry.IsRouterEnabled() {
-		chain = chain.Append(metricsMiddle.WrapRouterHandler(ctx, m.metricsRegistry, routerName, router.Service))
+		chain = chain.Append(metricsMiddle.WrapRouterHandler(ctx, m.metricsRegistry, routerName, provider.GetQualifiedName(ctx, router.Service)))
 	}

 	return chain.Extend(*mHandler).Append(tHandler).Then(sHandler)
--- a/pkg/server/server_signals.go
+++ b/pkg/server/server_signals.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows

 package server