Skip to content

Add settings dialog #236

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.

Sign up for GitHub

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

Merged
azat merged 7 commits into from
Mar 29, 2026
Merged

Add settings dialog #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1d7bb6a
Add settings dialog accessible via 'S' key and Ctrl+P fuzzy actions
azat Mar 29, 2026
299b1cc
Move Perfetto config defaults from worker.rs to options.rs
azat Mar 29, 2026
324bab3
Make settings dialog interactive with editable fields
azat Mar 29, 2026
f704d0f
Rename "Show settings" to "Settings" and use F3 for shortcut
azat Mar 29, 2026
68bab85
Add start/end time range to settings dialog
azat Mar 29, 2026
d31a6c7
Support humantime format (e.g. '1hour') in settings start/end fields
azat Mar 29, 2026
d693a0c
Add F3/Settings to menu bar
azat Mar 29, 2026
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
10 changes: 10 additions & 0 deletions src/common/relative_date_time.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,16 @@ impl RelativeDateTime {
self.date_time
}

pub fn to_editable_string(&self) -> String {
match (&self.date_time, &self.offset) {
(None, Some(offset)) => {
humantime::format_duration(offset.to_std().unwrap_or_default()).to_string()
}
(Some(dt), _) => dt.format("%Y-%m-%dT%H:%M:%S").to_string(),
(None, None) => String::new(),
}
}

pub fn to_sql_datetime_64(&self) -> Option<String> {
match (self.date_time, self.offset) {
(Some(date_time), Some(offset)) => Some(format!(
Expand Down
60 changes: 37 additions & 23 deletions src/interpreter/options.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,16 +286,30 @@ pub struct ServiceOptions {
pub chdig_config: Option<String>,
}

#[derive(Deserialize, Default, Clone)]
#[derive(Deserialize, Clone)]
#[serde(default)]
pub struct ChDigPerfettoConfig {
pub opentelemetry_span_log: Option<bool>,
pub trace_log: Option<bool>,
pub query_metric_log: Option<bool>,
pub part_log: Option<bool>,
pub query_thread_log: Option<bool>,
pub text_log: Option<bool>,
pub per_server: Option<bool>,
pub opentelemetry_span_log: bool,
pub trace_log: bool,
pub query_metric_log: bool,
pub part_log: bool,
pub query_thread_log: bool,
pub text_log: bool,
pub per_server: bool,
}

impl Default for ChDigPerfettoConfig {
fn default() -> Self {
Self {
opentelemetry_span_log: true,
trace_log: true,
query_metric_log: false,
part_log: true,
query_thread_log: true,
text_log: true,
per_server: true,
}
}
}

#[derive(Deserialize, Default)]
Expand Down Expand Up @@ -1289,31 +1303,31 @@ mod tests {
fn test_chdig_config_perfetto() {
let config = read_chdig_config("tests/configs/chdig_basic.yaml").unwrap();

assert_eq!(config.perfetto.opentelemetry_span_log, Some(true));
assert_eq!(config.perfetto.trace_log, Some(true));
assert_eq!(config.perfetto.query_metric_log, Some(true));
assert_eq!(config.perfetto.part_log, Some(false));
assert_eq!(config.perfetto.query_thread_log, Some(true));
assert_eq!(config.perfetto.text_log, Some(false));
assert_eq!(config.perfetto.opentelemetry_span_log, true);
assert_eq!(config.perfetto.trace_log, true);
assert_eq!(config.perfetto.query_metric_log, true);
assert_eq!(config.perfetto.part_log, false);
assert_eq!(config.perfetto.query_thread_log, true);
assert_eq!(config.perfetto.text_log, false);

let mut options = ChDigOptions::parse_from(["chdig"]);
apply_chdig_config(&mut options, &config);

assert_eq!(options.perfetto.opentelemetry_span_log, Some(true));
assert_eq!(options.perfetto.part_log, Some(false));
assert_eq!(options.perfetto.query_metric_log, Some(true));
assert_eq!(options.perfetto.opentelemetry_span_log, true);
assert_eq!(options.perfetto.part_log, false);
assert_eq!(options.perfetto.query_metric_log, true);
}

#[test]
fn test_chdig_config_perfetto_defaults() {
let config = read_chdig_config("tests/configs/chdig_empty.yaml").unwrap();

assert!(config.perfetto.opentelemetry_span_log.is_none());
assert!(config.perfetto.trace_log.is_none());
assert!(config.perfetto.query_metric_log.is_none());
assert!(config.perfetto.part_log.is_none());
assert!(config.perfetto.query_thread_log.is_none());
assert!(config.perfetto.text_log.is_none());
assert_eq!(config.perfetto.opentelemetry_span_log, true);
assert_eq!(config.perfetto.trace_log, true);
assert_eq!(config.perfetto.query_metric_log, false);
assert_eq!(config.perfetto.part_log, true);
assert_eq!(config.perfetto.query_thread_log, true);
assert_eq!(config.perfetto.text_log, true);
}

#[test]
Expand Down
16 changes: 8 additions & 8 deletions src/interpreter/worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ async fn process_event(context: ContextArc, event: Event, need_clear: &mut bool)
}
Event::PerfettoExport(queries, query_ids, start, end) => {
let perfetto_cfg = context.lock().unwrap().options.perfetto.clone();
let mut builder = PerfettoTraceBuilder::new(perfetto_cfg.per_server.unwrap_or(true));
let mut builder = PerfettoTraceBuilder::new(perfetto_cfg.per_server);

for q in &queries {
log::info!(
Expand All @@ -795,7 +795,7 @@ async fn process_event(context: ContextArc, event: Event, need_clear: &mut bool)

let (otel, trace_log, metrics, parts, threads, stack_traces, text_logs) = tokio::join!(
async {
if perfetto_cfg.opentelemetry_span_log.unwrap_or(true) {
if perfetto_cfg.opentelemetry_span_log {
Some(
clickhouse
.get_otel_spans_for_perfetto(&query_ids, start, end_time)
Expand All @@ -806,7 +806,7 @@ async fn process_event(context: ContextArc, event: Event, need_clear: &mut bool)
}
},
async {
if perfetto_cfg.trace_log.unwrap_or(true) {
if perfetto_cfg.trace_log {
Some(
clickhouse
.get_trace_log_counters_for_perfetto(&query_ids, start, end_time)
Expand All @@ -818,7 +818,7 @@ async fn process_event(context: ContextArc, event: Event, need_clear: &mut bool)
},
async {
// Consider using ProfileEvents instead
if perfetto_cfg.query_metric_log.unwrap_or(false) {
if perfetto_cfg.query_metric_log {
Some(
clickhouse
.get_query_metrics_for_perfetto(&query_ids, start, end_time)
Expand All @@ -829,7 +829,7 @@ async fn process_event(context: ContextArc, event: Event, need_clear: &mut bool)
}
},
async {
if perfetto_cfg.part_log.unwrap_or(true) {
if perfetto_cfg.part_log {
Some(
clickhouse
.get_part_log_for_perfetto(&query_ids, start, end_time)
Expand All @@ -840,7 +840,7 @@ async fn process_event(context: ContextArc, event: Event, need_clear: &mut bool)
}
},
async {
if perfetto_cfg.query_thread_log.unwrap_or(true) {
if perfetto_cfg.query_thread_log {
Some(
clickhouse
.get_query_thread_log_for_perfetto(&query_ids, start, end_time)
Expand All @@ -851,7 +851,7 @@ async fn process_event(context: ContextArc, event: Event, need_clear: &mut bool)
}
},
async {
if perfetto_cfg.trace_log.unwrap_or(true) {
if perfetto_cfg.trace_log {
Some(
clickhouse
.get_stack_traces_for_perfetto(&query_ids, start, end_time)
Expand All @@ -862,7 +862,7 @@ async fn process_event(context: ContextArc, event: Event, need_clear: &mut bool)
}
},
async {
if perfetto_cfg.text_log.unwrap_or(true) {
if perfetto_cfg.text_log {
Some(
clickhouse
.get_text_log_for_perfetto(&query_ids, start, end_time)
Expand Down
Loading
Loading