Add report timestamps

crates/trippy-tui/Cargo.toml

@@ -18,7 +18,7 @@ trippy-core.workspace = true
 trippy-privilege.workspace = true
 trippy-dns.workspace = true
 anyhow.workspace = true
-chrono = { workspace = true, default-features = false, features = ["clock"] }
+chrono = { workspace = true, default-features = false, features = ["clock", "serde"] }
 clap = { workspace = true, default-features = false, features = ["cargo", "derive", "wrap_help", "usage", "unstable-styles", "color", "suggestions", "error-context"] }
 clap_complete.workspace = true
 clap_mangen.workspace = true

crates/trippy-tui/src/report/csv.rs

@@ -3,9 +3,11 @@ use crate::report::types::fixed_width;
 use itertools::Itertools;
 use serde::Serialize;
 use std::net::IpAddr;
+use tracing::instrument;
 use trippy_dns::Resolver;
 
 /// Generate a CSV report of trace data.
+#[instrument(skip_all, level = "trace")]
 pub fn report<R: Resolver>(
     info: &TraceInfo,
     report_cycles: usize,

crates/trippy-tui/src/report/dot.rs

@@ -3,9 +3,11 @@ use petgraph::dot::{Config, Dot};
 use petgraph::graphmap::DiGraphMap;
 use std::fmt::{Debug, Formatter};
 use std::net::{IpAddr, Ipv4Addr};
+use tracing::instrument;
 use trippy_core::FlowEntry;
 
 /// Run a trace and generate a dot file.
+#[instrument(skip_all, level = "trace")]
 pub fn report(info: &TraceInfo, report_cycles: usize) -> anyhow::Result<()> {
     struct DotWrapper<'a>(Dot<'a, &'a DiGraphMap<IpAddr, ()>>);
     impl Debug for DotWrapper<'_> {

crates/trippy-tui/src/report/flows.rs

@@ -1,6 +1,8 @@
 use crate::app::TraceInfo;
+use tracing::instrument;
 
 /// Run a trace and report all flows observed.
+#[instrument(skip_all, level = "trace")]
 pub fn report(info: &TraceInfo, report_cycles: usize) -> anyhow::Result<()> {
     super::wait_for_round(&info.data, report_cycles)?;
     let trace = info.data.snapshot();

crates/trippy-tui/src/report/json.rs

@@ -1,14 +1,18 @@
 use crate::app::TraceInfo;
 use crate::report::types::{Hop, Host, Info, Report};
+use tracing::instrument;
 use trippy_dns::Resolver;
 
 /// Generate a json report of trace data.
+#[instrument(skip_all, level = "trace")]
 pub fn report<R: Resolver>(
     info: &TraceInfo,
     report_cycles: usize,
     resolver: &R,
 ) -> anyhow::Result<()> {
+    let start_timestamp = chrono::Utc::now();
     let trace = super::wait_for_round(&info.data, report_cycles)?;
+    let end_timestamp = chrono::Utc::now();
     let hops: Vec<Hop> = trace
         .hops()
         .iter()
@@ -20,8 +24,11 @@ pub fn report<R: Resolver>(
                 ip: info.data.target_addr(),
                 hostname: info.target_hostname.to_string(),
             },
+            start_timestamp,
+            end_timestamp,
         },
         hops,
     };
-    Ok(serde_json::to_writer_pretty(std::io::stdout(), &report)?)
+    serde_json::to_writer_pretty(std::io::stdout(), &report)?;
+    Ok(())
 }

crates/trippy-tui/src/report/silent.rs

@@ -1,6 +1,8 @@
 use crate::app::TraceInfo;
+use tracing::instrument;
 
 /// Run a trace without generating any output.
+#[instrument(skip_all, level = "trace")]
 pub fn report(info: &TraceInfo, report_cycles: usize) -> anyhow::Result<()> {
     super::wait_for_round(&info.data, report_cycles)?;
     Ok(())

crates/trippy-tui/src/report/stream.rs

@@ -2,9 +2,11 @@ use crate::app::TraceInfo;
 use crate::report::types::Hop;
 use anyhow::anyhow;
 use std::thread::sleep;
+use tracing::instrument;
 use trippy_dns::Resolver;
 
 /// Display a continuous stream of trace data.
+#[instrument(skip_all, level = "trace")]
 pub fn report<R: Resolver>(info: &TraceInfo, resolver: &R) -> anyhow::Result<()> {
     println!(
         "Tracing to {} ({})",

crates/trippy-tui/src/report/table.rs

@@ -2,9 +2,11 @@ use crate::app::TraceInfo;
 use comfy_table::presets::{ASCII_MARKDOWN, UTF8_FULL};
 use comfy_table::{ContentArrangement, Table};
 use itertools::Itertools;
+use tracing::instrument;
 use trippy_dns::Resolver;
 
 /// Generate a Markdown table report of trace data.
+#[instrument(skip_all, level = "trace")]
 pub fn report_md<R: Resolver>(
     info: &TraceInfo,
     report_cycles: usize,
@@ -14,6 +16,7 @@ pub fn report_md<R: Resolver>(
 }
 
 /// Generate a pretty table report of trace data.
+#[instrument(skip_all, level = "trace")]
 pub fn report_pretty<R: Resolver>(
     info: &TraceInfo,
     report_cycles: usize,

crates/trippy-tui/src/report/types.rs

@@ -1,3 +1,4 @@
+use chrono::Utc;
 use itertools::Itertools;
 use serde::{Serialize, Serializer};
 use std::fmt::{Display, Formatter};
@@ -14,6 +15,8 @@ pub struct Report {
 #[derive(Serialize)]
 pub struct Info {
     pub target: Host,
+    pub start_timestamp: chrono::DateTime<Utc>,
+    pub end_timestamp: chrono::DateTime<Utc>,
 }
 
 #[derive(Serialize)]