From 3364458a783b65fd18b9ccc7fe4acfa87fbaa07d Mon Sep 17 00:00:00 2001
From: Serhii Tatarintsev <tatarintsev@prisma.io>
Date: Fri, 12 Apr 2024 19:00:28 +0200
Subject: [PATCH] qe: Fix Windows build after merging c-abi (#4826)

Metrics feature does not really make a lot of sense in that case - all
it does is excluding single property from a struct making our life
harder.
---
 libs/query-engine-common/Cargo.toml           | 3 ---
 libs/query-engine-common/src/engine.rs        | 1 -
 query-engine/query-engine-c-abi/Cargo.toml    | 3 ---
 query-engine/query-engine-c-abi/src/engine.rs | 1 -
 query-engine/query-engine-node-api/Cargo.toml | 4 +---
 5 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/libs/query-engine-common/Cargo.toml b/libs/query-engine-common/Cargo.toml
index 7554bcb7f067..daf41ba50f66 100644
--- a/libs/query-engine-common/Cargo.toml
+++ b/libs/query-engine-common/Cargo.toml
@@ -3,9 +3,6 @@ name = "query-engine-common"
 version = "0.1.0"
 edition = "2021"
 
-[features]
-metrics = []
-
 [dependencies]
 thiserror = "1"
 url.workspace = true
diff --git a/libs/query-engine-common/src/engine.rs b/libs/query-engine-common/src/engine.rs
index 96c51584e437..77aa2fec804b 100644
--- a/libs/query-engine-common/src/engine.rs
+++ b/libs/query-engine-common/src/engine.rs
@@ -58,7 +58,6 @@ pub struct EngineBuilder {
 pub struct ConnectedEngineNative {
     pub config_dir: PathBuf,
     pub env: HashMap<String, String>,
-    #[cfg(feature = "metrics")]
     pub metrics: Option<query_engine_metrics::MetricRegistry>,
 }
 
diff --git a/query-engine/query-engine-c-abi/Cargo.toml b/query-engine/query-engine-c-abi/Cargo.toml
index 65ffd72c38cc..6b58e43175aa 100644
--- a/query-engine/query-engine-c-abi/Cargo.toml
+++ b/query-engine/query-engine-c-abi/Cargo.toml
@@ -8,9 +8,6 @@ doc = false
 crate-type = ["staticlib"]
 name = "query_engine"
 
-[features]
-metrics = ["query-engine-common/metrics"]
-
 [dependencies]
 anyhow = "1"
 async-trait = "0.1"
diff --git a/query-engine/query-engine-c-abi/src/engine.rs b/query-engine/query-engine-c-abi/src/engine.rs
index 69e8a3027cc6..6e744694c46f 100644
--- a/query-engine/query-engine-c-abi/src/engine.rs
+++ b/query-engine/query-engine-c-abi/src/engine.rs
@@ -266,7 +266,6 @@ impl QueryEngine {
                 native: ConnectedEngineNative {
                     config_dir: builder.native.config_dir.clone(),
                     env: builder.native.env.clone(),
-                    #[cfg(feature = "metrics")]
                     metrics: None,
                 },
             }) as Result<ConnectedEngine>
diff --git a/query-engine/query-engine-node-api/Cargo.toml b/query-engine/query-engine-node-api/Cargo.toml
index 73abee76eaba..e5233fea4c03 100644
--- a/query-engine/query-engine-node-api/Cargo.toml
+++ b/query-engine/query-engine-node-api/Cargo.toml
@@ -25,9 +25,7 @@ request-handlers = { path = "../request-handlers", features = [
     "all",
 ] }
 query-connector = { path = "../connectors/query-connector" }
-query-engine-common = { path = "../../libs/query-engine-common", features = [
-    "metrics",
-] }
+query-engine-common = { path = "../../libs/query-engine-common" }
 user-facing-errors = { path = "../../libs/user-facing-errors" }
 psl = { workspace = true, features = ["all"] }
 sql-connector = { path = "../connectors/sql-query-connector", package = "sql-query-connector", features = [