Rename prometheus_utils to metrics_utils

TraceMachina · Aug 26, 2023 · 298bfb9 · 298bfb9
1 parent 2875f0b
commit 298bfb9
Show file tree

Hide file tree

Showing 38 changed files with 97 additions and 70 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -54,11 +54,11 @@ members = [
   "gencargo/local_worker_test_utils",
   "gencargo/memory_store",
   "gencargo/memory_store_test",
+  "gencargo/metrics_utils",
   "gencargo/mock_running_actions_manager",
   "gencargo/mock_scheduler",
   "gencargo/mock_worker_api_client",
   "gencargo/platform_property_manager",
-  "gencargo/prometheus_utils",
   "gencargo/property_modifier_scheduler",
   "gencargo/property_modifier_scheduler_test",
   "gencargo/proto",
@@ -190,11 +190,11 @@ local_worker_test = { path = "gencargo/local_worker_test" }
 local_worker_test_utils = { path = "gencargo/local_worker_test_utils" }
 memory_store = { path = "gencargo/memory_store" }
 memory_store_test = { path = "gencargo/memory_store_test" }
+metrics_utils = { path = "gencargo/metrics_utils" }
 mock_running_actions_manager = { path = "gencargo/mock_running_actions_manager" }
 mock_scheduler = { path = "gencargo/mock_scheduler" }
 mock_worker_api_client = { path = "gencargo/mock_worker_api_client" }
 platform_property_manager = { path = "gencargo/platform_property_manager" }
-prometheus_utils = { path = "gencargo/prometheus_utils" }
 property_modifier_scheduler = { path = "gencargo/property_modifier_scheduler" }
 property_modifier_scheduler_test = { path = "gencargo/property_modifier_scheduler_test" }
 proto = { path = "gencargo/proto" }

diff --git a/cas/BUILD b/cas/BUILD
@@ -17,7 +17,7 @@ rust_binary(
         "//config",
         "//util:common",
         "//util:error",
-        "//util:prometheus_utils",
+        "//util:metrics_utils",
         "@crate_index//:clap",
         "@crate_index//:drop_guard",
         "@crate_index//:env_logger",

diff --git a/cas/cas_main.rs b/cas/cas_main.rs
@@ -42,7 +42,7 @@ use default_store_factory::store_factory;
 use error::{make_err, Code, Error, ResultExt};
 use execution_server::ExecutionServer;
 use local_worker::new_local_worker;
-use prometheus_utils::{set_metrics_enabled_for_this_thread, Collector, CollectorState, MetricsComponent, Registry};
+use metrics_utils::{set_metrics_enabled_for_this_thread, Collector, CollectorState, MetricsComponent, Registry};
 use store::StoreManager;
 use worker_api_server::WorkerApiServer;
 

diff --git a/cas/scheduler/BUILD b/cas/scheduler/BUILD
@@ -27,7 +27,7 @@ rust_library(
         ":platform_property_manager",
         ":worker",
         "//util:error",
-        "//util:prometheus_utils",
+        "//util:metrics_utils",
         "@crate_index//:tokio",
     ],
 )
@@ -82,7 +82,7 @@ rust_library(
         "//config",
         "//util:common",
         "//util:error",
-        "//util:prometheus_utils",
+        "//util:metrics_utils",
         "@crate_index//:parking_lot",
         "@crate_index//:futures",
         "@crate_index//:hashbrown",
@@ -216,7 +216,7 @@ rust_library(
         "//cas/store",
         "//config",
         "//util:error",
-        "//util:prometheus_utils",
+        "//util:metrics_utils",
         "@crate_index//:futures",
         "@crate_index//:tokio",
     ],
@@ -234,7 +234,7 @@ rust_library(
         ":platform_property_manager",
         "//proto",
         "//util:error",
-        "//util:prometheus_utils",
+        "//util:metrics_utils",
         "@crate_index//:tokio",
         "@crate_index//:uuid",
     ],
@@ -252,7 +252,7 @@ rust_library(
         "//proto",
         "//util:common",
         "//util:error",
-        "//util:prometheus_utils",
+        "//util:metrics_utils",
         "@crate_index//:prost",
         "@crate_index//:prost-types",
         "@crate_index//:sha2",

diff --git a/cas/scheduler/action_messages.rs b/cas/scheduler/action_messages.rs
@@ -26,8 +26,8 @@ use sha2::{digest::Update as _, Digest as _, Sha256};
 
 use common::{DigestInfo, HashMapExt, VecExt};
 use error::{error_if, make_input_err, Error, ResultExt};
+use metrics_utils::{CollectorState, MetricsComponent};
 use platform_property_manager::PlatformProperties;
-use prometheus_utils::{CollectorState, MetricsComponent};
 use prost::bytes::Bytes;
 use proto::build::bazel::remote::execution::v2::{
     execution_stage, Action, ActionResult as ProtoActionResult, ExecuteOperationMetadata, ExecuteRequest,

diff --git a/cas/scheduler/default_scheduler_factory.rs b/cas/scheduler/default_scheduler_factory.rs
@@ -24,7 +24,7 @@ use cache_lookup_scheduler::CacheLookupScheduler;
 use config::schedulers::SchedulerConfig;
 use error::{Error, ResultExt};
 use grpc_scheduler::GrpcScheduler;
-use prometheus_utils::Registry;
+use metrics_utils::Registry;
 use property_modifier_scheduler::PropertyModifierScheduler;
 use scheduler::{ActionScheduler, WorkerScheduler};
 use simple_scheduler::SimpleScheduler;

diff --git a/cas/scheduler/scheduler.rs b/cas/scheduler/scheduler.rs
@@ -19,8 +19,8 @@ use tokio::sync::watch;
 
 use action_messages::{ActionInfo, ActionInfoHashKey, ActionStage, ActionState};
 use error::Error;
+use metrics_utils::Registry;
 use platform_property_manager::PlatformPropertyManager;
-use prometheus_utils::Registry;
 use worker::{Worker, WorkerId, WorkerTimestamp};
 
 /// ActionScheduler interface is responsible for interactions between the scheduler

diff --git a/cas/scheduler/simple_scheduler.rs b/cas/scheduler/simple_scheduler.rs
@@ -33,10 +33,10 @@ use tokio::time::Duration;
 use action_messages::{ActionInfo, ActionInfoHashKey, ActionResult, ActionStage, ActionState, ExecutionMetadata};
 use common::log;
 use error::{error_if, make_err, make_input_err, Code, Error, ResultExt};
-use platform_property_manager::PlatformPropertyManager;
-use prometheus_utils::{
+use metrics_utils::{
     AsyncCounterWrapper, Collector, CollectorState, CounterWithTime, FuncCounterWrapper, MetricsComponent, Registry,
 };
+use platform_property_manager::PlatformPropertyManager;
 use scheduler::{ActionScheduler, WorkerScheduler};
 use worker::{Worker, WorkerId, WorkerTimestamp, WorkerUpdate};
 

diff --git a/cas/scheduler/worker.rs b/cas/scheduler/worker.rs
@@ -21,8 +21,8 @@ use uuid::Uuid;
 
 use action_messages::ActionInfo;
 use error::{make_err, make_input_err, Code, Error, ResultExt};
+use metrics_utils::{CollectorState, CounterWithTime, FuncCounterWrapper, MetricsComponent};
 use platform_property_manager::{PlatformProperties, PlatformPropertyValue};
-use prometheus_utils::{CollectorState, CounterWithTime, FuncCounterWrapper, MetricsComponent};
 use proto::com::github::allada::turbo_cache::remote_execution::{
     update_for_worker, ConnectionResult, StartExecute, UpdateForWorker,
 };

diff --git a/cas/store/BUILD b/cas/store/BUILD
@@ -36,7 +36,7 @@ rust_library(
         ":verify_store",
         "//config",
         "//util:error",
-        "//util:prometheus_utils",
+        "//util:metrics_utils",
         "@crate_index//:futures",
     ],
 )
@@ -50,7 +50,7 @@ rust_library(
         "//util:buf_channel",
         "//util:common",
         "//util:error",
-        "//util:prometheus_utils",
+        "//util:metrics_utils",
         "@crate_index//:bytes",
         "@crate_index//:futures",
         "@crate_index//:serde",
@@ -119,7 +119,7 @@ rust_library(
         "//util:common",
         "//util:error",
         "//util:evicting_map",
-        "//util:prometheus_utils",
+        "//util:metrics_utils",
         "@crate_index//:bytes",
     ],
 )
@@ -135,7 +135,7 @@ rust_library(
         "//util:buf_channel",
         "//util:common",
         "//util:error",
-        "//util:prometheus_utils",
+        "//util:metrics_utils",
         "@crate_index//:hex",
         "@crate_index//:sha2",
         "@crate_index//:tokio",
@@ -242,7 +242,7 @@ rust_library(
         "//util:common",
         "//util:error",
         "//util:evicting_map",
-        "//util:prometheus_utils",
+        "//util:metrics_utils",
         "@crate_index//:async-lock",
         "@crate_index//:bytes",
         "@crate_index//:filetime",

diff --git a/cas/store/default_store_factory.rs b/cas/store/default_store_factory.rs
@@ -25,7 +25,7 @@ use fast_slow_store::FastSlowStore;
 use filesystem_store::FilesystemStore;
 use grpc_store::GrpcStore;
 use memory_store::MemoryStore;
-use prometheus_utils::Registry;
+use metrics_utils::Registry;
 use ref_store::RefStore;
 use s3_store::S3Store;
 use size_partitioning_store::SizePartitioningStore;

diff --git a/cas/store/filesystem_store.rs b/cas/store/filesystem_store.rs
@@ -32,7 +32,7 @@ use buf_channel::{DropCloserReadHalf, DropCloserWriteHalf};
 use common::{fs, log, DigestInfo};
 use error::{make_err, make_input_err, Code, Error, ResultExt};
 use evicting_map::{EvictingMap, LenEntry};
-use prometheus_utils::{Collector, CollectorState, MetricsComponent, Registry};
+use metrics_utils::{Collector, CollectorState, MetricsComponent, Registry};
 use traits::{StoreTrait, UploadSizeInfo};
 
 // Default size to allocate memory of the buffer when reading files.

diff --git a/cas/store/memory_store.rs b/cas/store/memory_store.rs
@@ -24,7 +24,7 @@ use bytes::{Bytes, BytesMut};
 use common::DigestInfo;
 use error::{Code, Error, ResultExt};
 use evicting_map::{EvictingMap, LenEntry};
-use prometheus_utils::{Collector, CollectorState, MetricsComponent, Registry};
+use metrics_utils::{Collector, CollectorState, MetricsComponent, Registry};
 use traits::{StoreTrait, UploadSizeInfo};
 
 #[derive(Clone)]

diff --git a/cas/store/store_trait.rs b/cas/store/store_trait.rs
@@ -24,7 +24,7 @@ use buf_channel::{make_buf_channel_pair, DropCloserReadHalf, DropCloserWriteHalf
 use bytes::Bytes;
 use common::DigestInfo;
 use error::{Error, ResultExt};
-use prometheus_utils::Registry;
+use metrics_utils::Registry;
 
 #[derive(Debug, PartialEq, Copy, Clone, Serialize, Deserialize)]
 pub enum UploadSizeInfo {

diff --git a/cas/store/verify_store.rs b/cas/store/verify_store.rs
@@ -22,7 +22,7 @@ use sha2::{Digest, Sha256};
 use buf_channel::{make_buf_channel_pair, DropCloserReadHalf, DropCloserWriteHalf};
 use common::DigestInfo;
 use error::{make_input_err, Error, ResultExt};
-use prometheus_utils::{Collector, CollectorState, CounterWithTime, MetricsComponent, Registry};
+use metrics_utils::{Collector, CollectorState, CounterWithTime, MetricsComponent, Registry};
 use traits::{StoreTrait, UploadSizeInfo};
 
 pub struct VerifyStore {