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
14 changes: 14 additions & 0 deletions datafusion-tracing/src/exec_instrument_macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,34 +112,47 @@ macro_rules! instrument_with_spans {
datafusion.boundedness = tracing::field::Empty,
datafusion.preview = tracing::field::Empty,
datafusion.preview_rows = tracing::field::Empty,
datafusion.metrics.aggregate_arguments_time = tracing::field::Empty,
datafusion.metrics.aggregation_time = tracing::field::Empty,
datafusion.metrics.batches_split = tracing::field::Empty,
datafusion.metrics.bloom_filter_eval_time = tracing::field::Empty,
datafusion.metrics.build_input_batches = tracing::field::Empty,
datafusion.metrics.build_input_rows = tracing::field::Empty,
datafusion.metrics.build_mem_used = tracing::field::Empty,
datafusion.metrics.build_time = tracing::field::Empty,
datafusion.metrics.bytes_scanned = tracing::field::Empty,
datafusion.metrics.elapsed_compute = tracing::field::Empty,
datafusion.metrics.emitting_time = tracing::field::Empty,
datafusion.metrics.end_timestamp = tracing::field::Empty,
datafusion.metrics.fetch_time = tracing::field::Empty,
datafusion.metrics.file_open_errors = tracing::field::Empty,
datafusion.metrics.file_scan_errors = tracing::field::Empty,
datafusion.metrics.input_batches = tracing::field::Empty,
datafusion.metrics.input_rows = tracing::field::Empty,
datafusion.metrics.join_time = tracing::field::Empty,
datafusion.metrics.left_input_batches = tracing::field::Empty,
datafusion.metrics.left_input_rows = tracing::field::Empty,
datafusion.metrics.max_mem_used = tracing::field::Empty,
datafusion.metrics.max_queued = tracing::field::Empty,
datafusion.metrics.mem_used = tracing::field::Empty,
datafusion.metrics.metadata_load_time = tracing::field::Empty,
datafusion.metrics.num_bytes = tracing::field::Empty,
datafusion.metrics.num_predicate_creation_errors = tracing::field::Empty,
datafusion.metrics.output_batches = tracing::field::Empty,
datafusion.metrics.output_bytes = tracing::field::Empty,
datafusion.metrics.output_rows = tracing::field::Empty,
datafusion.metrics.page_index_eval_time = tracing::field::Empty,
datafusion.metrics.page_index_rows_matched = tracing::field::Empty,
datafusion.metrics.page_index_rows_pruned = tracing::field::Empty,
datafusion.metrics.peak_mem_used = tracing::field::Empty,
datafusion.metrics.predicate_cache_inner_records = tracing::field::Empty,
datafusion.metrics.predicate_cache_records = tracing::field::Empty,
datafusion.metrics.predicate_evaluation_errors = tracing::field::Empty,
datafusion.metrics.pushdown_rows_matched = tracing::field::Empty,
datafusion.metrics.pushdown_rows_pruned = tracing::field::Empty,
datafusion.metrics.repartition_time = tracing::field::Empty,
datafusion.metrics.right_input_batches = tracing::field::Empty,
datafusion.metrics.right_input_rows = tracing::field::Empty,
datafusion.metrics.row_groups_matched_bloom_filter = tracing::field::Empty,
datafusion.metrics.row_groups_matched_statistics = tracing::field::Empty,
datafusion.metrics.row_groups_pruned_bloom_filter = tracing::field::Empty,
Expand All @@ -154,6 +167,7 @@ macro_rules! instrument_with_spans {
datafusion.metrics.start_timestamp = tracing::field::Empty,
datafusion.metrics.statistics_eval_time = tracing::field::Empty,
datafusion.metrics.stream_memory_usage = tracing::field::Empty,
datafusion.metrics.time_calculating_group_ids = tracing::field::Empty,
datafusion.metrics.time_elapsed_opening = tracing::field::Empty,
datafusion.metrics.time_elapsed_processing = tracing::field::Empty,
datafusion.metrics.time_elapsed_scanning_total = tracing::field::Empty,
Expand Down
2 changes: 2 additions & 0 deletions tests/snapshots/02_basic_metrics_trace.snap
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
source: tests/integration_tests.rs
assertion_line: 250
expression: json_lines
---
[
Expand Down Expand Up @@ -1452,6 +1453,7 @@ expression: json_lines
"datafusion.metrics.elapsed_compute": "0.00ms",
"datafusion.metrics.end_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.metrics.output_batches": "1",
"datafusion.metrics.output_bytes": "8.0 B",
"datafusion.metrics.output_rows": "1",
"datafusion.metrics.start_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.node": "ProjectionExec: expr=[1 as Int64(1)]",
Expand Down
2 changes: 2 additions & 0 deletions tests/snapshots/05_basic_all_options_trace.snap
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
source: tests/integration_tests.rs
assertion_line: 250
expression: json_lines
---
[
Expand Down Expand Up @@ -1453,6 +1454,7 @@ expression: json_lines
"datafusion.metrics.elapsed_compute": "0.00ms",
"datafusion.metrics.end_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.metrics.output_batches": "1",
"datafusion.metrics.output_bytes": "8.0 B",
"datafusion.metrics.output_rows": "1",
"datafusion.metrics.start_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.node": "ProjectionExec: expr=[1 as Int64(1)]",
Expand Down
6 changes: 6 additions & 0 deletions tests/snapshots/06_object_store_all_options_trace.snap
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
source: tests/integration_tests.rs
assertion_line: 250
expression: json_lines
---
[
Expand Down Expand Up @@ -2165,6 +2166,7 @@ expression: json_lines
"span": {
"datafusion.boundedness": "Bounded",
"datafusion.emission_type": "Incremental",
"datafusion.metrics.batches_split": "0",
"datafusion.metrics.bloom_filter_eval_time": "0.00ms",
"datafusion.metrics.bytes_scanned": "1.71 K",
"datafusion.metrics.elapsed_compute": "0.00ms",
Expand All @@ -2174,9 +2176,12 @@ expression: json_lines
"datafusion.metrics.metadata_load_time": "0.00ms",
"datafusion.metrics.num_predicate_creation_errors": "0",
"datafusion.metrics.output_batches": "1",
"datafusion.metrics.output_bytes": "3.4 KB",
"datafusion.metrics.output_rows": "25",
"datafusion.metrics.page_index_eval_time": "0.00ms",
"datafusion.metrics.page_index_rows_pruned": "0 total → 0 matched",
"datafusion.metrics.predicate_cache_inner_records": "0",
"datafusion.metrics.predicate_cache_records": "0",
"datafusion.metrics.predicate_evaluation_errors": "0",
"datafusion.metrics.pushdown_rows_matched": "0",
"datafusion.metrics.pushdown_rows_pruned": "0",
Expand Down Expand Up @@ -2220,6 +2225,7 @@ expression: json_lines
"datafusion.metrics.elapsed_compute": "0.00ms",
"datafusion.metrics.end_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.metrics.output_batches": "0",
"datafusion.metrics.output_bytes": "0.0 B",
"datafusion.metrics.output_rows": "25",
"datafusion.metrics.spill_count": "0",
"datafusion.metrics.spilled_bytes": "0.0 B",
Expand Down
15 changes: 15 additions & 0 deletions tests/snapshots/09_recursive_all_options_trace.snap
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
source: tests/integration_tests.rs
assertion_line: 250
expression: json_lines
---
[
Expand Down Expand Up @@ -2135,6 +2136,7 @@ expression: json_lines
"datafusion.metrics.end_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.metrics.fetch_time": "0.00ms",
"datafusion.metrics.output_batches": "1",
"datafusion.metrics.output_bytes": "64.0 KB",
"datafusion.metrics.output_rows": "1",
"datafusion.metrics.repartition_time": "0.00ms",
"datafusion.metrics.send_time": "0.00ms",
Expand Down Expand Up @@ -2182,6 +2184,7 @@ expression: json_lines
"datafusion.metrics.elapsed_compute": "0.00ms",
"datafusion.metrics.end_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.metrics.output_batches": "1",
"datafusion.metrics.output_bytes": "64.0 KB",
"datafusion.metrics.output_rows": "1",
"datafusion.metrics.start_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.node": "FilterExec: n@0 < 3",
Expand Down Expand Up @@ -2224,6 +2227,7 @@ expression: json_lines
"datafusion.metrics.elapsed_compute": "0.00ms",
"datafusion.metrics.end_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.metrics.output_batches": "1",
"datafusion.metrics.output_bytes": "8.0 B",
"datafusion.metrics.output_rows": "1",
"datafusion.metrics.start_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.node": "ProjectionExec: expr=[n@0 + 1 as numbers.n + Int64(1)]",
Expand Down Expand Up @@ -2266,6 +2270,7 @@ expression: json_lines
"datafusion.metrics.elapsed_compute": "0.00ms",
"datafusion.metrics.end_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.metrics.output_batches": "1",
"datafusion.metrics.output_bytes": "8.0 B",
"datafusion.metrics.output_rows": "1",
"datafusion.metrics.start_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.node": "CoalescePartitionsExec",
Expand Down Expand Up @@ -2346,6 +2351,7 @@ expression: json_lines
"datafusion.metrics.end_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.metrics.fetch_time": "0.00ms",
"datafusion.metrics.output_batches": "1",
"datafusion.metrics.output_bytes": "64.0 KB",
"datafusion.metrics.output_rows": "1",
"datafusion.metrics.repartition_time": "0.00ms",
"datafusion.metrics.send_time": "0.00ms",
Expand Down Expand Up @@ -2393,6 +2399,7 @@ expression: json_lines
"datafusion.metrics.elapsed_compute": "0.00ms",
"datafusion.metrics.end_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.metrics.output_batches": "1",
"datafusion.metrics.output_bytes": "64.0 KB",
"datafusion.metrics.output_rows": "1",
"datafusion.metrics.start_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.node": "FilterExec: n@0 < 3",
Expand Down Expand Up @@ -2435,6 +2442,7 @@ expression: json_lines
"datafusion.metrics.elapsed_compute": "0.00ms",
"datafusion.metrics.end_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.metrics.output_batches": "1",
"datafusion.metrics.output_bytes": "8.0 B",
"datafusion.metrics.output_rows": "1",
"datafusion.metrics.start_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.node": "ProjectionExec: expr=[n@0 + 1 as numbers.n + Int64(1)]",
Expand Down Expand Up @@ -2477,6 +2485,7 @@ expression: json_lines
"datafusion.metrics.elapsed_compute": "0.00ms",
"datafusion.metrics.end_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.metrics.output_batches": "1",
"datafusion.metrics.output_bytes": "8.0 B",
"datafusion.metrics.output_rows": "1",
"datafusion.metrics.start_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.node": "CoalescePartitionsExec",
Expand Down Expand Up @@ -2557,6 +2566,7 @@ expression: json_lines
"datafusion.metrics.end_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.metrics.fetch_time": "0.00ms",
"datafusion.metrics.output_batches": "1",
"datafusion.metrics.output_bytes": "64.0 KB",
"datafusion.metrics.output_rows": "1",
"datafusion.metrics.repartition_time": "0.00ms",
"datafusion.metrics.send_time": "0.00ms",
Expand Down Expand Up @@ -2604,6 +2614,7 @@ expression: json_lines
"datafusion.metrics.elapsed_compute": "0.00ms",
"datafusion.metrics.end_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.metrics.output_batches": "0",
"datafusion.metrics.output_bytes": "0.0 B",
"datafusion.metrics.output_rows": "0",
"datafusion.metrics.start_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.node": "FilterExec: n@0 < 3",
Expand Down Expand Up @@ -2645,6 +2656,7 @@ expression: json_lines
"datafusion.metrics.elapsed_compute": "0.00ms",
"datafusion.metrics.end_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.metrics.output_batches": "0",
"datafusion.metrics.output_bytes": "0.0 B",
"datafusion.metrics.output_rows": "0",
"datafusion.metrics.start_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.node": "ProjectionExec: expr=[n@0 + 1 as numbers.n + Int64(1)]",
Expand Down Expand Up @@ -2686,6 +2698,7 @@ expression: json_lines
"datafusion.metrics.elapsed_compute": "0.00ms",
"datafusion.metrics.end_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.metrics.output_batches": "0",
"datafusion.metrics.output_bytes": "0.0 B",
"datafusion.metrics.output_rows": "0",
"datafusion.metrics.start_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.node": "CoalescePartitionsExec",
Expand Down Expand Up @@ -2755,6 +2768,7 @@ expression: json_lines
"datafusion.metrics.elapsed_compute": "0.00ms",
"datafusion.metrics.end_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.metrics.output_batches": "1",
"datafusion.metrics.output_bytes": "8.0 B",
"datafusion.metrics.output_rows": "1",
"datafusion.metrics.start_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.node": "ProjectionExec: expr=[1 as n]",
Expand Down Expand Up @@ -2788,6 +2802,7 @@ expression: json_lines
"datafusion.metrics.elapsed_compute": "0.00ms",
"datafusion.metrics.end_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.metrics.output_batches": "3",
"datafusion.metrics.output_bytes": "24.0 B",
"datafusion.metrics.output_rows": "3",
"datafusion.metrics.start_timestamp": "1970-01-01 00:00:00 UTC",
"datafusion.node": "RecursiveQueryExec: name=numbers, is_distinct=false",
Expand Down
Loading