Merge pull request #22 from tinythings/isbm-ui-logview-formats

Extended log view

Author: isbm

ljx/src/commands/view/app.rs

@@ -12,13 +12,13 @@ use logjet::{LogjetReader, LogjetWriter, WriterConfig};
 use ratatui::Terminal;
 use ratatui::backend::CrosstermBackend;
 
-use super::detail::{export_ndjson_objects, format_summary, parse_export_selection, render_modal_message};
+use super::detail::{export_ndjson_objects, extract_otlp_log_severity, format_summary, parse_export_selection, render_modal_message};
 use super::scan::{
     follow_appended_matches, open_temp_spool_pair, read_spool_record, remember_summary, scan_field_catalog, scan_matches,
     write_export_selection_to_temp_logjet,
 };
 use super::text::{char_count, delete_char_at, delete_char_before, insert_char_at};
-use super::types::{ActiveScan, DedupUpdate, ExportField, Focus, ScanUpdate, ViewApp, discover_export_format_choices};
+use super::types::{ActiveScan, DedupUpdate, ExportField, Focus, ListRowSummary, ScanUpdate, ViewApp, discover_export_format_choices};
 use crate::cli::ViewArgs;
 use crate::dedup::{DedupMatchMode, DedupMode};
 use crate::error::{Error, Result};
@@ -691,16 +691,16 @@ impl ViewApp {
         Ok(())
     }
 
-    pub(super) fn summary_for(&mut self, index: usize) -> Result<String> {
+    pub(super) fn summary_for(&mut self, index: usize) -> Result<ListRowSummary> {
         if let Some(summary) = self.summary_cache.get(&index) {
             return Ok(summary.clone());
         }
 
         let Some(scan) = &mut self.current_scan else {
-            return Ok(String::new());
+            return Ok(ListRowSummary { message: String::new(), severity: None });
         };
         let detail = read_spool_record(&mut scan.spool_reader, self.entries[index])?;
-        let summary = format_summary(&detail, self.hex_payload);
+        let summary = ListRowSummary { message: format_summary(&detail, self.hex_payload), severity: extract_otlp_log_severity(&detail.payload) };
         remember_summary(&mut self.summary_cache, &mut self.summary_order, index, summary.clone());
         Ok(summary)
     }

ljx/src/commands/view/detail.rs

@@ -117,6 +117,23 @@ pub(crate) fn extract_otlp_log_message(payload: &[u8]) -> Option<String> {
     None
 }
 
+pub(crate) fn extract_otlp_log_severity(payload: &[u8]) -> Option<String> {
+    let batch = ExportLogsServiceRequest::decode(payload).ok()?;
+    for resource_logs in &batch.resource_logs {
+        for scope_logs in &resource_logs.scope_logs {
+            for log_record in &scope_logs.log_records {
+                if !log_record.severity_text.is_empty() {
+                    return Some(log_record.severity_text.clone());
+                }
+                if let Some(severity) = severity_number_label(log_record.severity_number) {
+                    return Some(severity.to_string());
+                }
+            }
+        }
+    }
+    None
+}
+
 pub(crate) fn render_modal_message(detail: &DetailRecord, hex_payload: bool) -> String {
     if let Some(message) = extract_otlp_log_message(&detail.payload) {
         return message;
@@ -597,7 +614,7 @@ fn key_value_line(label: &str, value: String, value_style: Style) -> Line<'stati
     Line::from(vec![Span::styled(format!("{label:<12} "), Style::default().fg(Color::Indexed(136))), Span::styled(value, value_style)])
 }
 
-fn severity_style(value: &str) -> Style {
+pub(super) fn severity_style(value: &str) -> Style {
     let upper = value.to_ascii_uppercase();
     let color = if upper.contains("ERROR") || upper.contains("ERR") || upper.contains("FATAL") {
         Color::LightRed
@@ -615,6 +632,10 @@ fn severity_style(value: &str) -> Style {
     Style::default().fg(color).add_modifier(Modifier::BOLD)
 }
 
+pub(super) fn severity_initial(value: &str) -> String {
+    value.chars().find(|c| c.is_ascii_alphabetic()).map(|c| c.to_ascii_uppercase().to_string()).unwrap_or_else(|| " ".to_string())
+}
+
 pub(super) fn format_timestamp(ts_unix_ns: u64) -> String {
     let secs = (ts_unix_ns / 1_000_000_000) as i64;
     let nanos = (ts_unix_ns % 1_000_000_000) as u32;
@@ -624,6 +645,27 @@ pub(super) fn format_timestamp(ts_unix_ns: u64) -> String {
     }
 }
 
+pub(super) fn format_syslog_timestamp(ts_unix_ns: u64) -> String {
+    let secs = (ts_unix_ns / 1_000_000_000) as i64;
+    let nanos = (ts_unix_ns % 1_000_000_000) as u32;
+    match Utc.timestamp_opt(secs, nanos).single() {
+        Some(ts) => ts.format("%b %e %H:%M:%S").to_string(),
+        None => format!("{ts_unix_ns:<15}").chars().take(15).collect(),
+    }
+}
+
+fn severity_number_label(value: i32) -> Option<&'static str> {
+    match value {
+        1..=4 => Some("TRACE"),
+        5..=8 => Some("DEBUG"),
+        9..=12 => Some("INFO"),
+        13..=16 => Some("WARN"),
+        17..=20 => Some("ERROR"),
+        21..=24 => Some("FATAL"),
+        _ => None,
+    }
+}
+
 pub(super) fn fit_modal_body(message: &str, width: usize) -> (String, u16) {
     let wrapped = smart_wrap(message, width);
     let line_count = wrapped.lines().count() as u16;

ljx/src/commands/view/render.rs

@@ -5,7 +5,8 @@ use ratatui::text::{Line, Span, Text};
 use ratatui::widgets::{Block, BorderType, Borders, Clear, Gauge, Paragraph, Scrollbar, ScrollbarOrientation, ScrollbarState, Wrap};
 
 use super::detail::{
-    fit_line, fit_modal_body, modal_info_line, render_detail_lines, render_modal_footer, render_modal_footer_placeholder, render_modal_info_entries,
+    fit_line, fit_modal_body, format_syslog_timestamp, modal_info_line, render_detail_lines, render_modal_footer, render_modal_footer_placeholder,
+    render_modal_info_entries, severity_initial, severity_style,
 };
 use super::text::{fit_to_width, trim_single_line};
 use super::types::{ExportField, Focus, ViewApp};
@@ -23,6 +24,8 @@ const EXPORT_RANGE_HELP: &str = "Range:  a / all  |  c / current / 0  |  N  |  N
 const EXPORT_ORDER_HELP: &str = "Uses the current filtered view order.";
 const EXPORT_FORMAT_HELP_WIDTH: u16 = 55;
 const EXPORT_PROMPT_MIN_WIDTH: u16 = EXPORT_FORMAT_HELP_WIDTH + 2;
+const LIST_TIMESTAMP_WIDTH: usize = 15;
+const LIST_SEVERITY_WIDTH: usize = 1;
 
 impl ViewApp {
     pub(super) fn render(&mut self, frame: &mut Frame<'_>) {
@@ -109,7 +112,7 @@ impl ViewApp {
             let end = (self.list_offset + visible_rows).min(self.entries.len());
             let row_width = area.width.saturating_sub(1) as usize;
             for index in self.list_offset..end {
-                let style = if self.tail_mode && self.tail_marker_index == Some(index) {
+                let row_style = if self.tail_mode && self.tail_marker_index == Some(index) {
                     Style::default().fg(Color::White).bg(Color::Red).add_modifier(Modifier::BOLD)
                 } else if index == self.selected {
                     if self.focus == Focus::Search {
@@ -120,8 +123,14 @@ impl ViewApp {
                 } else {
                     Style::default().fg(Color::White)
                 };
-                let summary = self.summary_for(index).unwrap_or_else(|_| "<failed to render summary>".to_string());
-                lines.push(Line::from(Span::styled(fit_line(&summary, row_width), style)));
+                let summary = self
+                    .summary_for(index)
+                    .unwrap_or_else(|_| super::types::ListRowSummary { message: "<failed to render summary>".to_string(), severity: None });
+                if self.details_visible {
+                    lines.push(Line::from(Span::styled(fit_line(&summary.message, row_width), row_style)));
+                } else {
+                    lines.push(self.render_list_table_row(index, &summary, row_width, row_style));
+                }
             }
         }
 
@@ -134,6 +143,24 @@ impl ViewApp {
         }
     }
 
+    fn render_list_table_row(&self, index: usize, summary: &super::types::ListRowSummary, row_width: usize, row_style: Style) -> Line<'static> {
+        let timestamp = format_syslog_timestamp(self.entries[index].ts_unix_ns);
+        let timestamp = fit_to_width(&timestamp, LIST_TIMESTAMP_WIDTH);
+        let severity = summary.severity.as_deref().unwrap_or("");
+        let severity_style = severity_style(severity).bg(row_style.bg.unwrap_or(Color::Reset));
+        let severity = fit_to_width(&severity_initial(severity), LIST_SEVERITY_WIDTH);
+        let prefix_width = LIST_TIMESTAMP_WIDTH + 1 + LIST_SEVERITY_WIDTH + 2;
+        let message_width = row_width.saturating_sub(prefix_width);
+
+        Line::from(vec![
+            Span::styled(timestamp, row_style.fg(Color::LightBlue)),
+            Span::styled(" ", row_style),
+            Span::styled(severity, severity_style),
+            Span::styled("  ", row_style),
+            Span::styled(fit_line(&summary.message, message_width), row_style),
+        ])
+    }
+
     fn render_details(&self, frame: &mut Frame<'_>, area: Rect) {
         let block = pane_block(" Info ", false);
         let inner = block.inner(area);

ljx/src/commands/view/scan.rs

@@ -15,7 +15,7 @@ use opentelemetry_proto::tonic::common::v1::AnyValue;
 use opentelemetry_proto::tonic::common::v1::any_value::Value;
 use prost::Message;
 
-use super::types::{ActiveScan, DetailRecord, EntryMeta, FieldCatalog, SCAN_BATCH_SIZE, ScanUpdate};
+use super::types::{ActiveScan, DetailRecord, EntryMeta, FieldCatalog, ListRowSummary, SCAN_BATCH_SIZE, ScanUpdate};
 use crate::error::{Error, Result};
 use crate::input::InputHandle;
 
@@ -164,7 +164,7 @@ pub(crate) fn open_temp_spool_pair() -> Result<(PathBuf, File, File)> {
     Ok((spool_path, spool_reader, spool_writer))
 }
 
-pub(super) fn remember_summary(cache: &mut HashMap<usize, String>, order: &mut VecDeque<usize>, index: usize, summary: String) {
+pub(super) fn remember_summary(cache: &mut HashMap<usize, ListRowSummary>, order: &mut VecDeque<usize>, index: usize, summary: ListRowSummary) {
     cache.insert(index, summary);
     order.push_back(index);
     while order.len() > super::types::SUMMARY_CACHE_LIMIT {

ljx/src/commands/view/types.rs

@@ -52,6 +52,12 @@ pub(crate) struct DetailRecord {
     pub(crate) payload: Vec<u8>,
 }
 
+#[derive(Debug, Clone)]
+pub(crate) struct ListRowSummary {
+    pub(crate) message: String,
+    pub(crate) severity: Option<String>,
+}
+
 #[derive(Debug, Clone)]
 pub(crate) enum ScanUpdate {
     Batch(Vec<EntryMeta>),
@@ -217,7 +223,7 @@ pub(crate) struct ViewApp {
     pub(super) modal_info_visible: bool,
     pub(super) details_visible: bool,
     pub(super) detail_scroll: u16,
-    pub(super) summary_cache: HashMap<usize, String>,
+    pub(super) summary_cache: HashMap<usize, ListRowSummary>,
     pub(super) summary_order: VecDeque<usize>,
     pub(super) selected_detail: Option<DetailRecord>,
     pub(super) modal_text: Option<String>,