fix: shutdown metrics http-server on context done

Author: ezdac

rolling-shutter/keyper/keyper.go

@@ -119,7 +119,6 @@ func (kpr *keyper) Start(ctx context.Context, runner service.Runner) error {
 	if kpr.config.Metrics.Enabled {
 		epochkghandler.InitMetrics()
 		kpr.metricsServer = metricsserver.New(kpr.config.Metrics)
-		runner.Defer(kpr.metricsServer.Shutdown)
 	}
 
 	kpr.dbpool = dbpool

rolling-shutter/medley/metricsserver/metricsserver.go

@@ -22,7 +22,7 @@ func New(config *MetricsConfig) *MetricsServer {
 	return &MetricsServer{config: config, mux: http.NewServeMux()}
 }
 
-func (srv *MetricsServer) Start(_ context.Context, group service.Runner) error {
+func (srv *MetricsServer) Start(ctx context.Context, group service.Runner) error { //nolint:unparam
 	group.Go(func() error {
 		srv.mux.Handle("/metrics", promhttp.Handler())
 		addr := fmt.Sprintf("%s:%d", srv.config.Host, srv.config.Port)
@@ -39,6 +39,11 @@ func (srv *MetricsServer) Start(_ context.Context, group service.Runner) error {
 		}
 		return nil
 	})
+	group.Go(func() error {
+		<-ctx.Done()
+		srv.Shutdown()
+		return ctx.Err()
+	})
 	return nil
 }
 

rolling-shutter/snapshot/snapshot.go

@@ -86,7 +86,6 @@ func (snp *Snapshot) Start(ctx context.Context, runner service.Runner) error {
 			return err
 		}
 		snp.metricsServer = metricsserver.New(snp.Config.Metrics)
-		runner.Defer(snp.metricsServer.Shutdown)
 	}
 
 	hub := hubapi.New(snp.Config.SnapshotHubURL)

rolling-shutter/snapshotkeyper/snapshotkeyper.go

@@ -90,7 +90,6 @@ func (snkpr *snapshotkeyper) Start(ctx context.Context, runner service.Runner) e
 	if snkpr.config.Metrics.Enabled {
 		epochkghandler.InitMetrics()
 		snkpr.metricsServer = metricsserver.New(snkpr.config.Metrics)
-		runner.Defer(snkpr.metricsServer.Shutdown)
 	}
 
 	snkpr.dbpool = dbpool