separate out metrics into a separate crate

.github/workflows/ship.yaml

@@ -162,9 +162,9 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y ${{ matrix.linux-packages }}
 
-      # - uses: Swatinem/rust-cache@v2
-      #   with:
-      #     shared-key: "build-${matrix.runner}" # share the cache across jobs
+      - uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: "build-${matrix.runner}" # share the cache across jobs
 
       - name: build the CLI
         run: |

Cargo.toml

@@ -10,6 +10,7 @@ members = [
   "crates/query-engine/metadata",
   "crates/query-engine/sql",
   "crates/query-engine/translation",
+  "crates/query-engine/metrics",
   "crates/cli",
 ]
 

crates/configuration/Cargo.toml

@@ -8,7 +8,7 @@ workspace = true
 
 [dependencies]
 query-engine-metadata = { path = "../query-engine/metadata" }
-query-engine-execution = { path = "../query-engine/execution" }
+query-engine-metrics = { path = "../query-engine/metrics" }
 
 
 schemars = { version = "0.8.16", features = ["smol_str", "preserve_order"] }

crates/configuration/src/version1.rs

@@ -2,9 +2,9 @@
 
 use super::introspection;
 use crate::error::Error;
-use query_engine_execution::metrics;
 use query_engine_metadata::metadata;
 use query_engine_metadata::metadata::{database, Nullable};
+use query_engine_metrics::metrics;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
@@ -74,7 +74,7 @@ pub struct Configuration {
 #[derive(Debug)]
 pub struct State {
     pub mssql_pool: bb8::Pool<bb8_tiberius::ConnectionManager>,
-    pub metrics: query_engine_execution::metrics::Metrics,
+    pub metrics: query_engine_metrics::metrics::Metrics,
 }
 
 /// Validate the user configuration.
@@ -99,7 +99,7 @@ pub async fn create_state(
     let mssql_pool = create_mssql_pool(&configuration.config)
         .await
         .map_err(InitializationError::UnableToCreateMSSQLPool)?;
-    let metrics = query_engine_execution::metrics::Metrics::initialize(metrics_registry)
+    let metrics = query_engine_metrics::metrics::Metrics::initialize(metrics_registry)
         .map_err(InitializationError::MetricsError)?;
     Ok(State {
         mssql_pool,

crates/query-engine/execution/Cargo.toml

@@ -9,6 +9,7 @@ workspace = true
 [dependencies]
 query-engine-sql = { path = "../sql" }
 query-engine-translation = { path = "../translation" }
+query-engine-metrics = { path = "../metrics" }
 
 tiberius = { version = "0.12.2", default-features = false, features = ["rustls"] }
 bb8 = "0.8.1"

crates/query-engine/execution/src/lib.rs

@@ -3,6 +3,5 @@
 
 pub mod error;
 pub mod helpers;
-pub mod metrics;
 pub mod mutation;
 pub mod query;

crates/query-engine/execution/src/mutation.rs

@@ -1,9 +1,9 @@
 use crate::{
     helpers::{execute_statement, rollback_on_exception},
-    metrics,
     query::execute_query,
 };
 use bytes::{BufMut, Bytes, BytesMut};
+use query_engine_metrics::metrics;
 use query_engine_sql::sql::{
     self,
     ast::With,

crates/query-engine/execution/src/query.rs

@@ -1,7 +1,7 @@
 //! Execute a Query execution plan against the database.
 
-use crate::metrics;
 use bytes::{BufMut, Bytes, BytesMut};
+use query_engine_metrics::metrics;
 
 use crate::error::Error;
 use query_engine_sql::sql;

crates/query-engine/metrics/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "query-engine-metrics"
+version.workspace = true
+edition.workspace = true
+
+[lints]
+workspace = true
+
+[dependencies]
+tiberius = { version = "0.12.2", default-features = false, features = ["rustls"] }
+bb8 = "0.8.1"
+bb8-tiberius = "0.15.0"
+bytes = "1.6.0"
+prometheus = "0.13.3"
+serde_json = "1.0.116"
+sqlformat = "0.2.3"
+tokio-stream = "0.1.14"
+tracing = "0.1.40"
+thiserror = "1.0"

crates/query-engine/metrics/mod.rs

@@ -0,0 +1 @@
+

crates/query-engine/metrics/src/lib.rs

@@ -0,0 +1 @@
+pub mod metrics;