Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(prover): Move prover_autoscaler config into crate #3222

Merged
merged 7 commits into from
Nov 5, 2024
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
6 changes: 0 additions & 6 deletions Cargo.lock

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

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ sqlx = "0.8.1"
static_assertions = "1.1"
structopt = "0.3.20"
strum = "0.26"
strum_macros = "0.26.4"
tempfile = "3.0.2"
test-casing = "0.1.2"
test-log = "0.2.15"
Expand Down
5 changes: 0 additions & 5 deletions core/lib/config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,10 @@ zksync_concurrency.workspace = true
zksync_vlog = { workspace = true, optional = true }
tracing = { workspace = true, optional = true }

url.workspace = true
anyhow.workspace = true
rand.workspace = true
secrecy.workspace = true
serde = { workspace = true, features = ["derive"] }
time = { workspace = true, features = ["serde-human-readable"] }
strum.workspace = true
strum_macros.workspace = true
vise.workspace = true

[dev-dependencies]
serde_json.workspace = true
Expand Down
1 change: 0 additions & 1 deletion core/lib/config/src/configs/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ pub mod house_keeper;
pub mod object_store;
pub mod observability;
pub mod proof_data_handler;
pub mod prover_autoscaler;
pub mod prover_job_monitor;
pub mod pruning;
pub mod secrets;
Expand Down
6 changes: 4 additions & 2 deletions core/lib/config/src/configs/observability.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
use serde::Deserialize;

/// Configuration for the essential observability stack, like
/// logging and sentry integration.
#[derive(Debug, Clone, PartialEq)]
#[derive(Debug, Clone, PartialEq, Deserialize)]
yorik marked this conversation as resolved.
Show resolved Hide resolved
pub struct ObservabilityConfig {
/// URL of the Sentry instance to send events to.
pub sentry_url: Option<String>,
Expand All @@ -15,7 +17,7 @@ pub struct ObservabilityConfig {
pub log_directives: Option<String>,
}

#[derive(Debug, Clone, PartialEq)]
#[derive(Debug, Clone, PartialEq, Deserialize)]
pub struct OpentelemetryConfig {
/// Enables export of span data of specified level (and above) using opentelemetry exporters.
pub level: String,
Expand Down
1 change: 0 additions & 1 deletion core/lib/protobuf_config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ rand.workspace = true
hex.workspace = true
secrecy.workspace = true
tracing.workspace = true
time.workspace = true

[build-dependencies]
zksync_protobuf_build.workspace = true
1 change: 0 additions & 1 deletion core/lib/protobuf_config/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ mod observability;
mod proof_data_handler;
pub mod proto;
mod prover;
mod prover_autoscaler;
mod prover_job_monitor;
mod pruning;
mod secrets;
Expand Down
74 changes: 0 additions & 74 deletions core/lib/protobuf_config/src/proto/config/prover_autoscaler.proto

This file was deleted.

Loading
Loading