Apply suggestions from code review

server/v2/api/rest/server.go

@@ -46,7 +46,10 @@ func New[T transaction.Tx](
 		}
 	}
 	srv.config = serverCfg
-	srv.init()
+	srv.httpServer = &http.Server{
+		Addr:    srv.config.Address,
+		Handler: srv.router,
+	}
 	return srv, nil
 }
 
@@ -59,13 +62,6 @@ func NewWithConfigOptions[T transaction.Tx](opts ...CfgOption) *Server[T] {
 	}
 }
 
-func (s *Server[T]) init() {
-	s.httpServer = &http.Server{
-		Addr:    s.config.Address,
-		Handler: s.router,
-	}
-}
-
 func (s *Server[T]) Name() string {
 	return ServerName
 }
@@ -91,7 +87,6 @@ func (s *Server[T]) Stop(ctx context.Context) error {
 	}
 
 	s.logger.Info("stopping HTTP server")
-	defer s.init()
 	return s.httpServer.Shutdown(ctx)
 }
 

server/v2/api/telemetry/server.go

@@ -52,22 +52,18 @@ func New[T transaction.Tx](cfg server.ConfigMap, logger log.Logger, enableTeleme
 		return nil, fmt.Errorf("failed to initialize metrics: %w", err)
 	}
 	srv.metrics = metrics
-	srv.init()
-	return srv, nil
-}
-
-func (s *Server[T]) init() {
 	mux := http.NewServeMux()
 	// /metrics is the default standard path for Prometheus metrics.
-	mux.HandleFunc("/metrics", s.metricsHandler)
+	mux.HandleFunc("/metrics", srv.metricsHandler)
 	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		http.Redirect(w, r, "/metrics", http.StatusMovedPermanently)
 	})
 
-	s.server = &http.Server{
-		Addr:    s.config.Address,
+	srv.server = &http.Server{
+		Addr:    srv.config.Address,
 		Handler: mux,
 	}
+	return srv, nil
 }
 
 // Name returns the server name.
@@ -102,7 +98,6 @@ func (s *Server[T]) Stop(ctx context.Context) error {
 		return nil
 	}
 
-	defer s.init()
 	s.logger.Info("stopping telemetry server...", "address", s.config.Address)
 	return s.server.Shutdown(ctx)
 }