Enable k2v feature flag in CI

nix/compile.nix

@@ -137,8 +137,8 @@ let
         /* [2] */ hardeningDisable = [ "pie" ];
       };
       overrideArgs = old: {
-        /* [4] */ features = [ "bundled-libs" "sled" "metrics" "k2v" ]
+        /* [4] */ features = [ "bundled-libs" "sled" "k2v" ]
-          ++ (if release then [ "kubernetes-discovery" "telemetry-otlp" "lmdb" "sqlite" ] else []);
+          ++ (if release then [ "kubernetes-discovery" "telemetry-otlp" "metrics" "lmdb" "sqlite" ] else []);
       };
     })
 

src/api/admin/api_server.rs

@@ -34,10 +34,7 @@ pub struct AdminApiServer {
 }
 
 impl AdminApiServer {
-	pub fn new(
+	pub fn new(garage: Arc<Garage>) -> Self {
-		garage: Arc<Garage>,
-		#[cfg(feature = "metrics")] exporter: PrometheusExporter,
-	) -> Self {
 		let cfg = &garage.config.admin;
 		let metrics_token = cfg
 			.metrics_token
@@ -50,7 +47,7 @@ impl AdminApiServer {
 		Self {
 			garage,
 			#[cfg(feature = "metrics")]
-			exporter,
+			exporter: opentelemetry_prometheus::exporter().init(),
 			metrics_token,
 			admin_token,
 		}

src/garage/server.rs

@@ -32,9 +32,6 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> {
 
 	// ---- Initialize Garage internals ----
 
-	#[cfg(feature = "metrics")]
-	let metrics_exporter = opentelemetry_prometheus::exporter().init();
-
 	info!("Initializing background runner...");
 	let watch_cancel = netapp::util::watch_ctrl_c();
 	let (background, await_background_done) = BackgroundRunner::new(16, watch_cancel.clone());
@@ -53,11 +50,7 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> {
 	}
 
 	info!("Initialize Admin API server and metrics collector...");
-	let admin_server = AdminApiServer::new(
+	let admin_server = AdminApiServer::new(garage.clone());
-		garage.clone(),
-		#[cfg(feature = "metrics")]
-		metrics_exporter,
-	);
 
 	info!("Launching internal Garage cluster communications...");
 	let run_system = tokio::spawn(garage.system.clone().run(watch_cancel.clone()));