refactor: rename garbage collector crates for consistency (#5196)

* refactor: rename garbage collector crates for consistency

* fix: cargo fmt

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

.guppy/hakari.toml

@@ -35,7 +35,7 @@ workspace-members = [
     # The garbage collector uses chrono-english which needlessly
     # brings in chrono with the default features. This exclusion can
     # likely be removed if they publish a version without that.
-    "iox_objectstore_garbage_collect",
+    "garbage_collector",
     "mutable_batch_tests",
 ]
 third-party = [

Cargo.lock

@@ -1666,6 +1666,29 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "garbage_collector"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "chrono-english",
+ "clap 3.2.14",
+ "clap_blocks",
+ "data_types",
+ "filetime",
+ "futures",
+ "iox_catalog",
+ "metric",
+ "object_store",
+ "observability_deps",
+ "once_cell",
+ "parquet_file",
+ "snafu",
+ "tempfile",
+ "tokio",
+ "uuid 1.1.2",
+]
+
 [[package]]
 name = "generated_types"
 version = "0.1.0"
@@ -2061,8 +2084,8 @@ dependencies = [
  "iox_time",
  "ioxd_common",
  "ioxd_compactor",
+ "ioxd_garbage_collector",
  "ioxd_ingester",
- "ioxd_objectstore_garbage_collect",
  "ioxd_querier",
  "ioxd_router",
  "ioxd_test",
@@ -2302,29 +2325,6 @@ dependencies = [
  "uuid 1.1.2",
 ]
 
-[[package]]
-name = "iox_objectstore_garbage_collect"
-version = "0.1.0"
-dependencies = [
- "chrono",
- "chrono-english",
- "clap 3.2.14",
- "clap_blocks",
- "data_types",
- "filetime",
- "futures",
- "iox_catalog",
- "metric",
- "object_store",
- "observability_deps",
- "once_cell",
- "parquet_file",
- "snafu",
- "tempfile",
- "tokio",
- "uuid 1.1.2",
-]
-
 [[package]]
 name = "iox_query"
 version = "0.1.0"
@@ -2454,6 +2454,23 @@ dependencies = [
  "workspace-hack",
 ]
 
+[[package]]
+name = "ioxd_garbage_collector"
+version = "0.1.0"
+dependencies = [
+ "async-trait",
+ "futures",
+ "garbage_collector",
+ "hyper",
+ "ioxd_common",
+ "metric",
+ "observability_deps",
+ "snafu",
+ "tokio",
+ "trace",
+ "workspace-hack",
+]
+
 [[package]]
 name = "ioxd_ingester"
 version = "0.1.0"
@@ -2474,23 +2491,6 @@ dependencies = [
  "write_buffer",
 ]
 
-[[package]]
-name = "ioxd_objectstore_garbage_collect"
-version = "0.1.0"
-dependencies = [
- "async-trait",
- "futures",
- "hyper",
- "iox_objectstore_garbage_collect",
- "ioxd_common",
- "metric",
- "observability_deps",
- "snafu",
- "tokio",
- "trace",
- "workspace-hack",
-]
-
 [[package]]
 name = "ioxd_querier"
 version = "0.1.0"

Cargo.toml

@@ -23,14 +23,14 @@ members = [
     "ingester",
     "iox_catalog",
     "iox_data_generator",
-    "iox_objectstore_garbage_collect",
+    "garbage_collector",
     "iox_query",
     "iox_tests",
     "iox_time",
     "ioxd_common",
     "ioxd_compactor",
     "ioxd_ingester",
-    "ioxd_objectstore_garbage_collect",
+    "ioxd_garbage_collector",
     "ioxd_querier",
     "ioxd_router",
     "ioxd_test",

garbage_collector/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "iox_objectstore_garbage_collect"
+name = "garbage_collector"
 version = "0.1.0"
 edition = "2021"
 

garbage_collector/src/lib.rs

@@ -265,9 +265,7 @@ mod tests {
 
         let metrics = metric::Registry::default().into();
 
-        cfg.get_catalog("iox_objectstore_garbage_collect", metrics)
-            .await
-            .unwrap()
+        cfg.get_catalog("garbage_collector", metrics).await.unwrap()
     }
 
     struct OldFileSetup {

influxdb_iox/Cargo.toml

@@ -18,7 +18,7 @@ iox_catalog = { path = "../iox_catalog" }
 ioxd_common = { path = "../ioxd_common"}
 ioxd_compactor = { path = "../ioxd_compactor"}
 ioxd_ingester = { path = "../ioxd_ingester"}
-ioxd_objectstore_garbage_collect = { path = "../ioxd_objectstore_garbage_collect" }
+ioxd_garbage_collector = { path = "../ioxd_garbage_collector" }
 ioxd_querier = { path = "../ioxd_querier"}
 ioxd_router = { path = "../ioxd_router"}
 ioxd_test = { path = "../ioxd_test"}

influxdb_iox/src/commands/run/garbage_collector.rs

@@ -6,7 +6,7 @@ use ioxd_common::{
     server_type::{CommonServerState, CommonServerStateError},
     Service,
 };
-use ioxd_objectstore_garbage_collect as gc;
+use ioxd_garbage_collector as gc;
 use object_store::DynObjectStore;
 use object_store_metrics::ObjectStoreMetrics;
 use observability_deps::tracing::*;

ioxd_garbage_collector/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "ioxd_objectstore_garbage_collect"
+name = "ioxd_garbage_collector"
 version = "0.1.0"
 edition = "2021"
 
@@ -9,7 +9,7 @@ edition = "2021"
 async-trait = "0.1"
 futures = "0.3"
 hyper = "0.14"
-iox_objectstore_garbage_collect = { path = "../iox_objectstore_garbage_collect" }
+garbage_collector = { path = "../garbage_collector" }
 ioxd_common = { path = "../ioxd_common" }
 metric = { path = "../metric" }
 observability_deps = { path = "../observability_deps" }

ioxd_garbage_collector/src/lib.rs

@@ -20,8 +20,8 @@ use futures::{
     future::{BoxFuture, Shared},
     prelude::*,
 };
+use garbage_collector::GarbageCollector;
 use hyper::{Body, Request, Response};
-use iox_objectstore_garbage_collect::GarbageCollector;
 use ioxd_common::{
     http::error::{HttpApiError, HttpApiErrorCode, HttpApiErrorSource},
     rpc::RpcBuilderInput,
@@ -35,7 +35,7 @@ use std::{fmt::Debug, sync::Arc, time::Duration};
 use tokio::{select, sync::broadcast, task::JoinError, time};
 use trace::TraceCollector;
 
-pub use iox_objectstore_garbage_collect::{Config, SubConfig};
+pub use garbage_collector::{Config, SubConfig};
 
 /// The object store garbage collection server
 pub struct Server {
@@ -150,13 +150,11 @@ impl HttpApiErrorSource for HttpNotFound {
 #[allow(missing_docs)]
 pub enum Error {
     #[snafu(display("Could not start the garbage collector"))]
-    StartGarbageCollector {
-        source: iox_objectstore_garbage_collect::Error,
-    },
+    StartGarbageCollector { source: garbage_collector::Error },
 
     #[snafu(display("Could not join the garbage collector"))]
     JoinGarbageCollector {
-        source: Arc<iox_objectstore_garbage_collect::Error>,
+        source: Arc<garbage_collector::Error>,
     },
 
     #[snafu(display("Could not join the garbage collector worker task"))]