Merge branch 'fx-init' into ancla

main.go

@@ -131,8 +131,8 @@ func caduceus(arguments []string, run bool) error {
 		arrangehttp.ProvideServer("servers.health"),
 		arrangehttp.ProvideServer("servers.metrics"),
 		arrangehttp.ProvideServer("servers.pprof"),
-		// arrangehttp.ProvideServer("servers.primary"),
-		// arrangehttp.ProvideServer("servers.alternate"),
+		arrangehttp.ProvideServer("servers.primary"),
+		arrangehttp.ProvideServer("servers.alternate"),
 
 		touchstone.Provide(),
 		touchhttp.Provide(),

metrics.go

@@ -76,7 +76,7 @@ func NewMetricWrapperMeasures(m CaduceusMetricsRegistry) metrics.Histogram {
 
 // TODO: do these need to be annonated/broken into groups based on where the metrics are being used/called
 func ProvideMetrics() fx.Option {
-	return fx.Provide(
+	return fx.Options(
 		touchstone.Gauge(prometheus.GaugeOpts{
 			Name: IncomingQueueDepth,
 			Help: "The depth of the queue behind the incoming handlers.",

routes.go

@@ -43,13 +43,27 @@ func provideCoreEndpoints() fx.Option {
 		},
 		func(in RoutesIn) RoutesOut {
 			return RoutesOut{
-				// Primary:   provideCoreOption("primary", in),
-				// Alternate: provideCoreOption("alternate", in),
+				Primary:   provideCoreOption("primary", in),
+				Alternate: provideCoreOption("alternate", in),
 			}
 		},
 	)
 }
 
+func provideCoreOption(server string, in RoutesIn) arrangehttp.Option[http.Server] {
+	return arrangehttp.AsOption[http.Server](
+		func(s *http.Server) {
+			mux := chi.NewMux()
+			if server == "primary" {
+				s.Handler = in.PrimaryMetrics.Then(mux)
+			} else {
+				s.Handler = in.AlternateMetrics.Then(mux)
+			}
+		},
+	)
+
+}
+
 func provideHealthCheck() fx.Option {
 	return fx.Provide(
 		fx.Annotated{