diff --git a/crates/core/src/client/client_connection.rs b/crates/core/src/client/client_connection.rs index f33e25a8fc6..41f28df4190 100644 --- a/crates/core/src/client/client_connection.rs +++ b/crates/core/src/client/client_connection.rs @@ -13,7 +13,6 @@ use crate::error::DBError; use crate::host::module_host::{ClientConnectedError, ProcedureResultTarget}; use crate::host::{FunctionArgs, ModuleHost, NoSuchModule, ReducerCallError}; use crate::subscription::module_subscription_manager::BroadcastError; -use crate::util::prometheus_handle::IntGaugeExt; use crate::worker_metrics::{ record_client_rejection, ClientDisconnectCause, ClientDisconnectRecorder, ClientRejectCause, WORKER_METRICS, }; @@ -29,6 +28,7 @@ use spacetimedb_durability::{DurableOffset, TxOffset}; use spacetimedb_lib::identity::{AuthCtx, RequestId}; use spacetimedb_lib::metrics::ExecutionMetrics; use spacetimedb_lib::Identity; +use spacetimedb_metrics::utils::IntGaugeExt; use tokio::sync::mpsc::error::{SendError, TrySendError}; use tokio::sync::{mpsc, oneshot, watch}; use tokio::task::AbortHandle; diff --git a/crates/core/src/host/instance_env.rs b/crates/core/src/host/instance_env.rs index 982ab6dcbff..2319a97da9b 100644 --- a/crates/core/src/host/instance_env.rs +++ b/crates/core/src/host/instance_env.rs @@ -7,7 +7,6 @@ use crate::host::wasm_common::TimingSpan; use crate::replica_context::ReplicaContext; use crate::subscription::module_subscription_actor::{commit_and_broadcast_event, ModuleSubscriptions}; use crate::subscription::module_subscription_manager::{from_tx_offset, TransactionOffset}; -use crate::util::prometheus_handle::IntGaugeExt; use chrono::{DateTime, Utc}; use core::mem; use futures::TryFutureExt; @@ -20,6 +19,7 @@ use spacetimedb_datastore::locking_tx_datastore::state_view::StateView; use spacetimedb_datastore::locking_tx_datastore::{FuncCallType, IndexScanPointOrRange, MutTxId}; use spacetimedb_datastore::traits::IsolationLevel; use spacetimedb_lib::{http as st_http, ConnectionId, Identity, Timestamp}; +use spacetimedb_metrics::utils::IntGaugeExt; use spacetimedb_primitives::{ColId, ColList, IndexId, TableId}; use spacetimedb_sats::{ bsatn::{self, ToBsatn}, diff --git a/crates/core/src/host/wasm_common/module_host_actor.rs b/crates/core/src/host/wasm_common/module_host_actor.rs index 18fb6bd7e99..21a86248e69 100644 --- a/crates/core/src/host/wasm_common/module_host_actor.rs +++ b/crates/core/src/host/wasm_common/module_host_actor.rs @@ -26,7 +26,6 @@ use crate::replica_context::ReplicaContext; use crate::sql::execute::run_with_instance; use crate::subscription::module_subscription_actor::{commit_and_broadcast_event, CommitAndBroadcastEventSuccess}; use crate::subscription::module_subscription_manager::TransactionOffset; -use crate::util::prometheus_handle::{HistogramExt, TimerGuard}; use crate::worker_metrics::WORKER_METRICS; use anyhow::{anyhow, bail, ensure, Context}; use bytes::{Buf, Bytes}; @@ -46,6 +45,7 @@ use spacetimedb_lib::de::DeserializeSeed; use spacetimedb_lib::identity::AuthCtx; use spacetimedb_lib::metrics::ExecutionMetrics; use spacetimedb_lib::{bsatn, http as st_http, ConnectionId, Hash, ProductType, RawModuleDef, Timestamp}; +use spacetimedb_metrics::utils::{HistogramExt, TimerGuard}; use spacetimedb_primitives::{HttpHandlerId, ProcedureId, TableId, ViewFnPtr, ViewId}; use spacetimedb_sats::algebraic_type::fmt::fmt_algebraic_type; use spacetimedb_sats::{AlgebraicType, AlgebraicTypeRef, Deserialize, ProductValue, Typespace, WithTypespace}; diff --git a/crates/core/src/subscription/module_subscription_actor.rs b/crates/core/src/subscription/module_subscription_actor.rs index 21d20a2aefe..ed364c8bcc8 100644 --- a/crates/core/src/subscription/module_subscription_actor.rs +++ b/crates/core/src/subscription/module_subscription_actor.rs @@ -20,7 +20,6 @@ use crate::host::{self, ModuleHost}; use crate::subscription::query::is_subscribe_to_all_tables; use crate::subscription::row_list_builder_pool::{BsatnRowListBuilderPool, JsonRowListBuilderFakePool}; use crate::subscription::{collect_table_update, collect_table_update_for_view, execute_plans}; -use crate::util::prometheus_handle::IntGaugeExt; use crate::worker_metrics::WORKER_METRICS; use core::panic; use parking_lot::RwLock; @@ -41,6 +40,7 @@ use spacetimedb_lib::identity::RequestId; use spacetimedb_lib::metrics::ExecutionMetrics; use spacetimedb_lib::Identity; use spacetimedb_lib::{bsatn, identity::AuthCtx}; +use spacetimedb_metrics::utils::IntGaugeExt; use spacetimedb_physical_plan::plan::ProjectPlan; use spacetimedb_schema::def::RawModuleDefVersion; use spacetimedb_table::static_assert_size; diff --git a/crates/core/src/util/mod.rs b/crates/core/src/util/mod.rs index dafa83dea44..a0894163d51 100644 --- a/crates/core/src/util/mod.rs +++ b/crates/core/src/util/mod.rs @@ -4,8 +4,6 @@ use std::pin::pin; use tokio::sync::oneshot; use tracing::Span; -pub mod prometheus_handle; - pub mod adaptive_recv; pub mod jobs; pub mod notify_once; diff --git a/crates/metrics/src/lib.rs b/crates/metrics/src/lib.rs index d67b57522c0..f50134f8ce5 100644 --- a/crates/metrics/src/lib.rs +++ b/crates/metrics/src/lib.rs @@ -1 +1,2 @@ pub mod typed_prometheus; +pub mod utils; diff --git a/crates/core/src/util/prometheus_handle.rs b/crates/metrics/src/utils.rs similarity index 100% rename from crates/core/src/util/prometheus_handle.rs rename to crates/metrics/src/utils.rs