Skip to content
Draft
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
36 changes: 24 additions & 12 deletions lading/src/bin/lading.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
blackhole,
config::{self, Config, Telemetry},
generator, inspector, observer,
target::{self, Behavior, Output},

Check warning on line 17 in lading/src/bin/lading.rs

View workflow job for this annotation

GitHub Actions / Rust Actions (Check/Fmt/Clippy) (macos-latest, fmt)

Diff in /Users/runner/work/lading/lading/lading/src/bin/lading.rs

Check warning on line 17 in lading/src/bin/lading.rs

View workflow job for this annotation

GitHub Actions / Rust Actions (Check/Fmt/Clippy) (ubuntu-latest, fmt)

Diff in /home/runner/work/lading/lading/lading/src/bin/lading.rs
target_metrics,
};
use lading_capture::manager::CaptureManager;
use lading_capture::manager::{CaptureManager, SignalWatchers, DEFAULT_TICK_DURATION_MS};
use metrics::gauge;
use metrics_exporter_prometheus::PrometheusBuilder;
use regex::Regex;
Expand Down Expand Up @@ -446,13 +446,17 @@
format,
} => match format {
config::CaptureFormat::Jsonl { flush_seconds } => {
let signals = SignalWatchers {
shutdown: shutdown_watcher.register()?,
experiment_started: experiment_started_watcher.clone(),
target_running: target_running_watcher.clone(),
};
let mut capture_manager = CaptureManager::new_jsonl(
path,
flush_seconds,
shutdown_watcher.register()?,
experiment_started_watcher.clone(),
target_running_watcher.clone(),
DEFAULT_TICK_DURATION_MS,
expiration,
signals,
)
.await?;
for (k, v) in global_labels {
Expand All @@ -469,14 +473,18 @@
flush_seconds,
compression_level,
} => {
let signals = SignalWatchers {
shutdown: shutdown_watcher.register()?,
experiment_started: experiment_started_watcher.clone(),
target_running: target_running_watcher.clone(),
};
let mut capture_manager = CaptureManager::new_multi(
path,
flush_seconds,
compression_level,
shutdown_watcher.register()?,
experiment_started_watcher.clone(),
target_running_watcher.clone(),
flush_seconds,
DEFAULT_TICK_DURATION_MS,
expiration,
signals,
)
.await
.map_err(io::Error::other)?;
Expand All @@ -494,14 +502,18 @@
flush_seconds,
compression_level,
} => {
let signals = SignalWatchers {
shutdown: shutdown_watcher.register()?,
experiment_started: experiment_started_watcher.clone(),
target_running: target_running_watcher.clone(),
};
let mut capture_manager = CaptureManager::new_parquet(
path,
flush_seconds,
compression_level,
shutdown_watcher.register()?,
experiment_started_watcher.clone(),
target_running_watcher.clone(),
flush_seconds,
DEFAULT_TICK_DURATION_MS,
expiration,
signals,
)
.await
.map_err(io::Error::other)?;
Expand Down
18 changes: 12 additions & 6 deletions lading_capture/src/bin/fuzz_capture_harness.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@

use anyhow::{Context, Result};
use arbitrary::Arbitrary;
use lading_capture::{

Check warning on line 13 in lading_capture/src/bin/fuzz_capture_harness.rs

View workflow job for this annotation

GitHub Actions / Rust Actions (Check/Fmt/Clippy) (macos-latest, fmt)

Diff in /Users/runner/work/lading/lading/lading_capture/src/bin/fuzz_capture_harness.rs

Check warning on line 13 in lading_capture/src/bin/fuzz_capture_harness.rs

View workflow job for this annotation

GitHub Actions / Rust Actions (Check/Fmt/Clippy) (ubuntu-latest, fmt)

Diff in /home/runner/work/lading/lading/lading_capture/src/bin/fuzz_capture_harness.rs
formats::jsonl, line::Line, manager::CaptureManager, manager::RealClock,
test::writer::InMemoryWriter, validate,
formats::jsonl,
line::Line,
manager::{CaptureManager, SignalWatchers, DEFAULT_TICK_DURATION_MS},
test::writer::InMemoryWriter,
validate,
};
use rand::{Rng, SeedableRng, rngs::SmallRng};
use std::io::{self, Read};
Expand Down Expand Up @@ -354,14 +357,17 @@
let (target_watcher, target_broadcast) = lading_signal::signal();

let format = jsonl::Format::new(writer.clone());
let signals = SignalWatchers {
shutdown: shutdown_watcher,
experiment_started: experiment_watcher,
target_running: target_watcher,
};
let manager = CaptureManager::new_with_format(

Check failure on line 365 in lading_capture/src/bin/fuzz_capture_harness.rs

View workflow job for this annotation

GitHub Actions / Test Suite

this function takes 6 arguments but 5 arguments were supplied

Check failure on line 365 in lading_capture/src/bin/fuzz_capture_harness.rs

View workflow job for this annotation

GitHub Actions / Rust Actions (Check/Fmt/Clippy) (ubuntu-latest, clippy)

this function takes 6 arguments but 5 arguments were supplied

Check failure on line 365 in lading_capture/src/bin/fuzz_capture_harness.rs

View workflow job for this annotation

GitHub Actions / Rust Actions (Check/Fmt/Clippy) (macos-latest, check)

this function takes 6 arguments but 5 arguments were supplied

Check failure on line 365 in lading_capture/src/bin/fuzz_capture_harness.rs

View workflow job for this annotation

GitHub Actions / Rust Actions (Check/Fmt/Clippy) (macos-latest, clippy)

this function takes 6 arguments but 5 arguments were supplied

Check failure on line 365 in lading_capture/src/bin/fuzz_capture_harness.rs

View workflow job for this annotation

GitHub Actions / Rust Actions (Check/Fmt/Clippy) (ubuntu-latest, check)

this function takes 6 arguments but 5 arguments were supplied
format,
1,
shutdown_watcher,
experiment_watcher,
target_watcher,
DEFAULT_TICK_DURATION_MS,
Duration::from_secs(3600),
RealClock::default(),
signals,
);

let start = Instant::now();
Expand Down
Loading
Loading