refactor(config): rename config crate to amp-config

crates/bin/ampd/Cargo.toml

@@ -17,7 +17,7 @@ snmalloc = ["dep:snmalloc-rs"]
 amp-object-store = { path = "../../core/object-store" }
 clap.workspace = true
 common = { path = "../../core/common" }
-config = { path = "../../config" }
+amp-config = { path = "../../config" }
 console-subscriber = { version = "0.4.1", default-features = false, optional = true }
 controller = { path = "../../services/controller" }
 dataset-store = { path = "../../core/dataset-store" }

crates/bin/ampd/src/controller_cmd.rs

@@ -1,8 +1,8 @@
 use std::{net::SocketAddr, sync::Arc};
 
+use amp_config::Config as CommonConfig;
 use amp_object_store::ObjectStoreCreationError;
 use common::{BoxError, store::Store};
-use config::Config as CommonConfig;
 use controller::config::Config;
 use dataset_store::{
     DatasetStore, manifests::DatasetManifestsStore, providers::ProviderConfigsStore,
@@ -69,7 +69,7 @@ pub enum Error {
     /// This occurs when the controller cannot establish a connection to the
     /// PostgreSQL metadata database.
     #[error("Failed to connect to metadata database: {0}")]
-    MetadataDbConnection(#[source] Box<config::ConfigError>),
+    MetadataDbConnection(#[source] Box<amp_config::ConfigError>),
 
     /// Failed to create data store
     ///

crates/bin/ampd/src/main.rs

@@ -1,5 +1,5 @@
+use amp_config::Config;
 use common::BoxError;
-use config::Config;
 
 mod controller_cmd;
 mod migrate_cmd;
@@ -167,7 +167,7 @@ async fn load_config(
     };
 
     // Gather build info from environment variables set by vergen
-    let build_info = config::BuildInfo {
+    let build_info = amp_config::BuildInfo {
         version: env!("VERGEN_GIT_DESCRIBE").to_string(),
         commit_sha: env!("VERGEN_GIT_SHA").to_string(),
         commit_timestamp: env!("VERGEN_GIT_COMMIT_TIMESTAMP").to_string(),

crates/bin/ampd/src/migrate_cmd.rs

@@ -1,4 +1,4 @@
-use config::Config;
+use amp_config::Config;
 
 pub async fn run(config: Config) -> Result<(), Error> {
     let url = config

crates/bin/ampd/src/server_cmd.rs

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
+use amp_config::{Addrs, Config as CommonConfig};
 use amp_object_store::ObjectStoreCreationError;
 use common::{BoxError, store::Store};
-use config::{Addrs, Config as CommonConfig};
 use dataset_store::{
     DatasetStore, manifests::DatasetManifestsStore, providers::ProviderConfigsStore,
 };
@@ -102,7 +102,7 @@ pub enum Error {
     /// This occurs when the server cannot establish a connection to the
     /// PostgreSQL metadata database.
     #[error("Failed to connect to metadata database: {0}")]
-    MetadataDbConnection(#[source] Box<config::ConfigError>),
+    MetadataDbConnection(#[source] Box<amp_config::ConfigError>),
 
     /// Failed to create data store
     ///

crates/bin/ampd/src/solo_cmd.rs

@@ -1,8 +1,8 @@
 use std::{future::Future, pin::Pin, sync::Arc};
 
+use amp_config::Config as CommonConfig;
 use amp_object_store::ObjectStoreCreationError;
 use common::{BoxError, store::Store};
-use config::Config as CommonConfig;
 use dataset_store::{
     DatasetStore, manifests::DatasetManifestsStore, providers::ProviderConfigsStore,
 };
@@ -137,7 +137,7 @@ pub enum Error {
     /// This occurs when the solo command cannot establish a connection to the
     /// PostgreSQL metadata database.
     #[error("Failed to connect to metadata database: {0}")]
-    MetadataDbConnection(#[source] Box<config::ConfigError>),
+    MetadataDbConnection(#[source] Box<amp_config::ConfigError>),
 
     /// Failed to create data store
     ///

crates/bin/ampd/src/worker_cmd.rs

@@ -1,6 +1,6 @@
+use amp_config::Config;
 use amp_object_store::ObjectStoreCreationError;
 use common::store::Store;
-use config::Config;
 use dataset_store::{
     DatasetStore, manifests::DatasetManifestsStore, providers::ProviderConfigsStore,
 };
@@ -64,7 +64,7 @@ pub enum Error {
     /// This occurs when the worker cannot establish a connection to the
     /// PostgreSQL metadata database.
     #[error("Failed to connect to metadata database: {0}")]
-    MetadataDbConnection(#[source] Box<config::ConfigError>),
+    MetadataDbConnection(#[source] Box<amp_config::ConfigError>),
 
     /// Failed to create data store
     ///

crates/config/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "config"
+name = "amp-config"
 edition.workspace = true
 version.workspace = true
 license-file.workspace = true

crates/core/monitoring/src/logging.rs

@@ -66,6 +66,7 @@ const AMP_CRATES: &[&str] = &[
     "admin_api",
     "admin_client",
     "amp_client",
+    "amp_config",
     "amp_object_store",
     "ampcc",
     "ampctl",
@@ -75,7 +76,6 @@ const AMP_CRATES: &[&str] = &[
     "arrow_to_postgres",
     "auth_http",
     "common",
-    "config",
     "controller",
     "dataset_store",
     "datasets_common",

crates/services/admin-api/Cargo.toml

@@ -8,7 +8,7 @@ edition.workspace = true
 async-trait.workspace = true
 axum.workspace = true
 common = { path = "../../core/common" }
-config = { path = "../../config" }
+amp-config = { path = "../../config" }
 datafusion.workspace = true
 dataset-store = { path = "../../core/dataset-store" }
 datasets-common = { path = "../../core/datasets-common" }

crates/services/admin-api/src/ctx.rs

@@ -1,8 +1,8 @@
 //! Service context
 use std::sync::Arc;
 
+use amp_config::BuildInfo;
 use common::store::Store;
-use config::BuildInfo;
 use dataset_store::DatasetStore;
 use metadata_db::MetadataDb;
 

crates/services/controller/Cargo.toml

@@ -9,7 +9,7 @@ admin-api = { path = "../admin-api" }
 async-trait.workspace = true
 axum.workspace = true
 common = { path = "../../core/common" }
-config = { path = "../../config" }
+amp-config = { path = "../../config" }
 dataset-store = { version = "0.1.0", path = "../../core/dataset-store" }
 datasets-common = { version = "0.1.0", path = "../../core/datasets-common" }
 dump = { version = "0.1.0", path = "../../core/dump" }

crates/services/controller/src/config.rs

@@ -1,4 +1,4 @@
-use config::BuildInfo;
+use amp_config::BuildInfo;
 
 /// Controller-specific configuration
 ///

crates/services/worker/Cargo.toml

@@ -8,7 +8,7 @@ license-file.workspace = true
 backon.workspace = true
 chrono.workspace = true
 common = { path = "../../core/common" }
-config = { path = "../../config" }
+amp-config = { path = "../../config" }
 dataset-store = { path = "../../core/dataset-store" }
 datasets-common = { path = "../../core/datasets-common" }
 dump = { path = "../../core/dump" }

crates/services/worker/src/config.rs

@@ -1,6 +1,6 @@
 use std::{path::PathBuf, time::Duration};
 
-use config::ParquetConfig;
+use amp_config::ParquetConfig;
 
 use crate::info::WorkerInfo;
 

tests/Cargo.toml

@@ -22,7 +22,7 @@ color-backtrace = { version = "0.7.1", default-features = false, features = [
     "use-btparse-crate",
 ] }
 common = { path = "../crates/core/common" }
-config = { path = "../crates/config" }
+amp-config = { path = "../crates/config" }
 controller = { path = "../crates/services/controller" }
 ctor = "0.5.0"
 dataset-store = { path = "../crates/core/dataset-store" }

tests/src/main.rs

@@ -47,9 +47,9 @@
 
 use std::{path::PathBuf, sync::Arc};
 
+use amp_config::Config;
 use clap::Parser;
 use common::{BoxError, Store};
-use config::Config;
 use dataset_store::{
     DatasetStore, dataset_and_dependencies, manifests::DatasetManifestsStore,
     providers::ProviderConfigsStore,

tests/src/testlib/ctx.rs

@@ -29,8 +29,8 @@
 
 use std::{collections::BTreeSet, path::Path, sync::Arc};
 
+use amp_config::Config;
 use common::{BoxError, store::Store};
-use config::Config;
 use datasets_common::reference::Reference;
 use worker::node_id::NodeId;
 

tests/src/testlib/fixtures/daemon_controller.rs

@@ -31,7 +31,7 @@ impl DaemonController {
     /// Starts a Amp controller with the provided configuration and metadata database.
     /// The controller will be automatically shut down when the fixture is dropped.
     pub async fn new(
-        config: Arc<config::Config>,
+        config: Arc<amp_config::Config>,
         metadata_db: metadata_db::MetadataDb,
         data_store: Store,
         dataset_store: dataset_store::DatasetStore,
@@ -99,7 +99,7 @@ impl Drop for DaemonController {
 }
 
 /// Convert common config to controller config
-fn controller_config_from_common(config: &config::Config) -> Config {
+fn controller_config_from_common(config: &amp_config::Config) -> Config {
     Config {
         build_info: config.build_info.clone(),
     }

tests/src/testlib/fixtures/daemon_server.rs

@@ -36,7 +36,7 @@ impl DaemonServer {
     /// use the `DaemonController` fixture.
     /// The server will be automatically shut down when the fixture is dropped.
     pub async fn new(
-        config: Arc<config::Config>,
+        config: Arc<amp_config::Config>,
         metadb: MetadataDb,
         data_store: Store,
         dataset_store: DatasetStore,
@@ -144,7 +144,7 @@ impl Drop for DaemonServer {
 }
 
 /// Convert config::Config to server::config::Config
-fn server_config_from_common(config: &config::Config) -> Config {
+fn server_config_from_common(config: &amp_config::Config) -> Config {
     Config {
         server_microbatch_max_interval: config.server_microbatch_max_interval,
         keep_alive_interval: config.keep_alive_interval,

tests/src/testlib/fixtures/daemon_worker.rs

@@ -34,7 +34,7 @@ impl DaemonWorker {
     /// Starts a Amp worker with the provided configuration, metadata database, and worker ID.
     /// The worker will be automatically shut down when the fixture is dropped.
     pub async fn new(
-        config: Arc<config::Config>,
+        config: Arc<amp_config::Config>,
         metadata_db: MetadataDb,
         data_store: Store,
         dataset_store: DatasetStore,
@@ -102,7 +102,7 @@ impl Drop for DaemonWorker {
 }
 
 /// Convert config::Config to worker::config::Config for tests
-fn worker_config_from_common(config: &config::Config) -> Config {
+fn worker_config_from_common(config: &amp_config::Config) -> Config {
     Config {
         microbatch_max_interval: config.microbatch_max_interval,
         poll_interval: config.poll_interval,