Skip to content

Commit 413856f

Browse files
authored
fix(zk_toolbox): Clone era observability (#2892)
## What ❔ <!-- What are the changes this PR brings about? --> <!-- Example: This PR adds a PR template to the repo. --> <!-- (For bigger PRs adding more context is appreciated) --> ## Why ❔ <!-- Why are these changes done? What goal do they contribute to? What are the principles behind them? --> <!-- Example: PR templates ensure PR reviewers, observers, and future iterators are in context about the evolution of repos. --> ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [ ] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [ ] Documentation comments have been added / updated. - [ ] Code has been formatted via `zk fmt` and `zk lint`. Signed-off-by: Danil <deniallugo@gmail.com>
1 parent 6d4090f commit 413856f

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

etc/lint-config/ignore.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@ dirs: [
2222
"system-contracts",
2323
"artifacts-zk",
2424
"cache-zk",
25-
"contracts/"
25+
"contracts/",
26+
"era-observability"
2627
]

etc/utils/src/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,16 @@ const IGNORED_DIRS = [
2525
'artifacts-zk',
2626
'cache-zk',
2727
// Ignore directories with OZ and forge submodules.
28-
'contracts/l1-contracts/lib'
28+
'contracts/l1-contracts/lib',
29+
'era-observability'
2930
];
3031
const IGNORED_FILES = ['KeysWithPlonkVerifier.sol', 'TokenInit.sol', '.tslintrc.js', '.prettierrc.js'];
3132

3233
// async executor of shell commands
3334
// spawns a new shell and can execute arbitrary commands, like "ls -la | grep .env"
3435
// returns { stdout, stderr }
3536
const promisified = promisify(_exec);
37+
3638
export function exec(command: string) {
3739
command = command.replace(/\n/g, ' ');
3840
return promisified(command);

zk_toolbox/crates/zk_inception/src/commands/containers.rs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@ use config::{EcosystemConfig, DOCKER_COMPOSE_FILE, ERA_OBSERVABILITY_COMPOSE_FIL
66
use xshell::Shell;
77

88
use super::args::ContainersArgs;
9-
use crate::messages::{
10-
MSG_CONTAINERS_STARTED, MSG_FAILED_TO_FIND_ECOSYSTEM_ERR, MSG_RETRY_START_CONTAINERS_PROMPT,
11-
MSG_STARTING_CONTAINERS, MSG_STARTING_DOCKER_CONTAINERS_SPINNER,
9+
use crate::{
10+
commands::ecosystem::setup_observability,
11+
messages::{
12+
MSG_CONTAINERS_STARTED, MSG_FAILED_TO_FIND_ECOSYSTEM_ERR,
13+
MSG_RETRY_START_CONTAINERS_PROMPT, MSG_STARTING_CONTAINERS,
14+
MSG_STARTING_DOCKER_CONTAINERS_SPINNER,
15+
},
1216
};
1317

1418
pub fn run(shell: &Shell, args: ContainersArgs) -> anyhow::Result<()> {
@@ -20,6 +24,10 @@ pub fn run(shell: &Shell, args: ContainersArgs) -> anyhow::Result<()> {
2024
logger::info(MSG_STARTING_CONTAINERS);
2125

2226
let spinner = Spinner::new(MSG_STARTING_DOCKER_CONTAINERS_SPINNER);
27+
if args.observability {
28+
setup_observability::run(shell)?;
29+
}
30+
2331
start_containers(shell, args.observability)?;
2432
spinner.finish();
2533

zk_toolbox/crates/zk_inception/src/commands/ecosystem/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ mod common;
1313
mod create;
1414
pub mod create_configs;
1515
pub(crate) mod init;
16-
mod setup_observability;
16+
pub(crate) mod setup_observability;
1717
mod utils;
1818

1919
#[derive(Subcommand, Debug)]

0 commit comments

Comments
 (0)