wip

Author: kariy

crates/storage/db/src/mdbx/metrics.rs

@@ -26,6 +26,28 @@ impl Default for DbMetrics {
 impl DbMetrics {
     /// Creates a new instance of database metrics.
     pub fn new() -> Self {
+        // database tables metrics
+        ::metrics::describe_gauge!(
+            "db.table_size",
+            ::metrics::Unit::Bytes,
+            "Total size of the table"
+        );
+        ::metrics::describe_gauge!(
+            "db.table_pages",
+            ::metrics::Unit::Count,
+            "Number of pages in the table"
+        );
+        ::metrics::describe_gauge!(
+            "db.table_entries",
+            ::metrics::Unit::Count,
+            "Number of entries in the table"
+        );
+        ::metrics::describe_gauge!(
+            "db.freelist",
+            ::metrics::Unit::Bytes,
+            "Size of the database freelist"
+        );
+
         Self {
             inner: Arc::new(DbMetricsInner {
                 transaction: DbTransactionMetrics::default(),
@@ -35,21 +57,27 @@ impl DbMetrics {
     }
 
     /// Records a transaction creation.
-    pub fn record_tx_create(&self, is_write: bool) {
-        if is_write {
-            self.inner.transaction.rw_created.increment(1);
-        } else {
-            self.inner.transaction.ro_created.increment(1);
-        }
+    pub fn record_ro_tx_create(&self) {
+        self.inner.transaction.ro_created.increment(1);
+    }
+
+    pub fn record_rw_tx_create(&self) {
+        self.inner.transaction.rw_created.increment(1);
     }
 
     /// Records a transaction commit with timing.
+    ///
+    /// ## Arguments
+    ///
+    /// * `duration` - Time taken for the get operation in seconds
+    /// * `success` - Whether the commit operation completed sucessfully or not.
     pub fn record_tx_commit(&self, duration: f64, success: bool) {
         if success {
             self.inner.transaction.commits_successful.increment(1);
         } else {
             self.inner.transaction.commits_failed.increment(1);
         }
+
         self.inner.transaction.commit_time_seconds.record(duration);
     }
 
@@ -59,32 +87,51 @@ impl DbMetrics {
     }
 
     /// Records a get operation.
+    ///
+    /// ## Arguments
+    ///
+    /// * `duration` - Time taken for the get operation in seconds
+    /// * `found` - Whether the requested value was found
     pub fn record_get(&self, duration: f64, found: bool) {
         if found {
             self.inner.operations.get_hits.increment(1);
         } else {
             self.inner.operations.get_misses.increment(1);
         }
+
         self.inner.operations.get_time_seconds.record(duration);
     }
 
     /// Records a put operation.
+    ///
+    /// ## Arguments
+    ///
+    /// * `duration` - Time taken for the put operation in seconds
     pub fn record_put(&self, duration: f64) {
         self.inner.operations.puts.increment(1);
         self.inner.operations.put_time_seconds.record(duration);
     }
 
     /// Records a delete operation.
+    ///
+    /// ## Arguments
+    ///
+    /// * `duration` - Time taken for the delete operation in seconds
     pub fn record_delete(&self, duration: f64, deleted: bool) {
         if deleted {
             self.inner.operations.deletes_successful.increment(1);
         } else {
             self.inner.operations.deletes_failed.increment(1);
         }
+
         self.inner.operations.delete_time_seconds.record(duration);
     }
 
     /// Records a clear operation.
+    ///
+    /// ## Arguments
+    ///
+    /// * `duration` - Time taken for the clear operation in seconds
     pub fn record_clear(&self, duration: f64) {
         self.inner.operations.clears.increment(1);
         self.inner.operations.clear_time_seconds.record(duration);

crates/storage/db/src/mdbx/mod.rs

@@ -101,7 +101,7 @@ impl DbEnvBuilder {
         let dir = path.as_ref().to_path_buf();
         let metrics = DbMetrics::new();
 
-        Ok(DbEnv { inner: Arc::new(DbEnvInner { env, dir, metrics }) }.with_metrics())
+        Ok(DbEnv { inner: Arc::new(DbEnvInner { env, dir, metrics }) })
     }
 }
 
@@ -161,30 +161,6 @@ impl DbEnv {
     pub fn path(&self) -> &Path {
         &self.inner.dir
     }
-
-    pub(super) fn with_metrics(self) -> Self {
-        ::metrics::describe_gauge!(
-            "db.table_size",
-            ::metrics::Unit::Bytes,
-            "Total size of the table"
-        );
-        ::metrics::describe_gauge!(
-            "db.table_pages",
-            ::metrics::Unit::Count,
-            "Number of pages in the table"
-        );
-        ::metrics::describe_gauge!(
-            "db.table_entries",
-            ::metrics::Unit::Count,
-            "Number of entries in the table"
-        );
-        ::metrics::describe_gauge!(
-            "db.freelist",
-            ::metrics::Unit::Bytes,
-            "Size of the database freelist"
-        );
-        self
-    }
 }
 
 impl Database for DbEnv {
@@ -194,20 +170,16 @@ impl Database for DbEnv {
 
     #[tracing::instrument(level = "trace", name = "db_txn_ro_create", skip_all)]
     fn tx(&self) -> Result<Self::Tx, DatabaseError> {
-        self.inner.metrics.record_tx_create(false);
-        Ok(Tx::new(
-            self.inner.env.begin_ro_txn().map_err(DatabaseError::CreateROTx)?,
-            self.inner.metrics.clone(),
-        ))
+        let tx = self.inner.env.begin_ro_txn().map_err(DatabaseError::CreateROTx)?;
+        self.inner.metrics.record_ro_tx_create();
+        Ok(Tx::new(tx, self.inner.metrics.clone()))
     }
 
     #[tracing::instrument(level = "trace", name = "db_txn_rw_create", skip_all)]
     fn tx_mut(&self) -> Result<Self::TxMut, DatabaseError> {
-        self.inner.metrics.record_tx_create(true);
-        Ok(Tx::new(
-            self.inner.env.begin_rw_txn().map_err(DatabaseError::CreateRWTx)?,
-            self.inner.metrics.clone(),
-        ))
+        let tx = self.inner.env.begin_rw_txn().map_err(DatabaseError::CreateRWTx)?;
+        self.inner.metrics.record_rw_tx_create();
+        Ok(Tx::new(tx, self.inner.metrics.clone()))
     }
 
     fn stats(&self) -> Result<Self::Stats, DatabaseError> {