rebase

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

cmd/manager/main.go

@@ -43,7 +43,7 @@ import (
 	corecontrollers "github.com/operator-framework/catalogd/pkg/controllers/core"
 	"github.com/operator-framework/catalogd/pkg/features"
 	"github.com/operator-framework/catalogd/pkg/profile"
-	"github.com/operator-framework/catalogd/pkg/server"
+	catalogdserver "github.com/operator-framework/catalogd/pkg/server"
 	"github.com/operator-framework/catalogd/pkg/storage"
 
 	//+kubebuilder:scaffold:imports
@@ -126,37 +126,30 @@ func main() {
 		os.Exit(1)
 	}
 
+	var localStorage storage.Instance
 	if features.CatalogdFeatureGate.Enabled(features.HTTPServer) {
-		metrics.Registry.MustRegister(server.ApdexTargetMetric, server.RequestDurationMetric)
-	}
-
-	if err := os.MkdirAll(storageDir, 0700); err != nil {
-		setupLog.Error(err, "unable to create storage directory for catalogs")
-	}
-<<<<<<< HEAD
-	localStorage := storage.LocalDir{RootDir: storageDir}
-	shutdownTimeout := 30 * time.Second
-	catalogServer := server.Server{
-		Kind: "catalogs",
-		Server: &http.Server{
-			Addr:         catalogServerAddr,
-			Handler:      localStorage.StorageServerHandler(),
-			ReadTimeout:  5 * time.Second,
-			WriteTimeout: 10 * time.Second,
-		},
-		ShutdownTimeout: &shutdownTimeout,
-=======
+		metrics.Registry.MustRegister(catalogdserver.RequestDurationMetric)
 
-	if features.CatalogdFeatureGate.Enabled(features.HTTPServer) {
-		metrics.Registry.MustRegister(server.RequestDurationMetric)
-		srv := server.Instance{StorageDir: storageDir}
-		mgr.AddMetricsExtraHandler("/catalogs/", server.AddMetricsToHandler(srv.CatalogServerHandler()))
->>>>>>> dbb9540 (remove apdex target gauge, increase histogram buckets)
+		if err := os.MkdirAll(storageDir, 0700); err != nil {
+			setupLog.Error(err, "unable to create storage directory for catalogs")
+		}
+		localStorage = storage.LocalDir{RootDir: storageDir}
+		shutdownTimeout := 30 * time.Second
+		catalogServer := server.Server{
+			Kind: "catalogs",
+			Server: &http.Server{
+				Addr:         catalogServerAddr,
+				Handler:      catalogdserver.AddMetricsToHandler(localStorage.StorageServerHandler()),
+				ReadTimeout:  5 * time.Second,
+				WriteTimeout: 10 * time.Second,
+			},
+			ShutdownTimeout: &shutdownTimeout,
+		}
+		if err := mgr.Add(&catalogServer); err != nil {
+			setupLog.Error(err, "unable to start catalog server")
+			os.Exit(1)
+		}
 	}
-	if err := mgr.Add(&catalogServer); err != nil {
-		setupLog.Error(err, "unable to start catalog server")
-		os.Exit(1)
-
 
 	if err = (&corecontrollers.CatalogReconciler{
 		Client:   mgr.GetClient(),