Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions crates/config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ license-file.workspace = true

[features]
# JSON Schema generation support for configuration validation
schemars = ["dep:schemars", "amp-worker-core/schemars"]
schemars = ["dep:schemars"]

[dependencies]
amp-common = { package = "common", path = "../core/common" }
amp-monitoring = { package = "monitoring", path = "../core/monitoring" }
amp-object-store = { path = "../core/object-store" }
amp-worker-core = { path = "../core/worker-core" }
figment.workspace = true
fs-err.workspace = true
metadata-db = { path = "../core/metadata-db" }
amp-monitoring = { package = "monitoring", path = "../core/monitoring" }
schemars = { workspace = true, optional = true }
serde.workspace = true
thiserror.workspace = true
Expand Down
6 changes: 4 additions & 2 deletions crates/config/src/config_file.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@

use std::path::{Path, PathBuf};

use amp_worker_core::{ConfigDuration, ParquetConfig};
use figment::{
Figment,
providers::{Env, Format as _, Serialized, Toml},
};

use crate::monitoring::OpenTelemetryConfig;
use crate::{
monitoring::OpenTelemetryConfig,
worker_core::{ConfigDuration, ParquetConfig},
};

/// Default data directory name - stores Parquet files
pub const DEFAULT_DATA_DIRNAME: &str = "data";
Expand Down
9 changes: 7 additions & 2 deletions crates/config/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use std::{
};

use amp_object_store::url::{ObjectStoreUrl, ObjectStoreUrlError};
use amp_worker_core::{ConfigDuration, ParquetConfig};
use fs_err as fs;

mod config_file;
Expand All @@ -13,6 +12,7 @@ pub mod metadb;
pub mod monitoring;
mod redacted;
pub mod server;
pub mod worker_core;

pub use self::{
config_file::{
Expand All @@ -23,7 +23,12 @@ pub use self::{
metadb::{DEFAULT_METADB_CONN_POOL_SIZE, DEFAULT_METADB_DIRNAME, MetadataDbConfig},
redacted::Redacted,
};
use self::{controller::ControllerAddrs, monitoring::OpenTelemetryConfig, server::ServerAddrs};
use self::{
controller::ControllerAddrs,
monitoring::OpenTelemetryConfig,
server::ServerAddrs,
worker_core::{ConfigDuration, ParquetConfig},
};

/// Default amp dir name (created inside the base directory)
pub const DEFAULT_AMP_DIR_NAME: &str = ".amp";
Expand Down
Loading