[metrics] handle non-metrics file better

Author: tstack

src/log_format_impls.cc

@@ -441,6 +441,7 @@ class metrics_log_format : public log_format {
     {
         this->lf_multiline = false;
         this->lf_is_metric = true;
+        this->lf_time_ordered = false;
     }
 
     const intern_string_t get_name() const override
@@ -500,13 +501,15 @@ class metrics_log_format : public log_format {
             if (cell_len > stats.lvs_width) {
                 stats.lvs_width = cell_len;
             }
-            parse_cell(iter).match(
-                [](empty_cell) {},
-                [&stats](int64_t i) {
-                    stats.add_value(static_cast<double>(i));
-                },
-                [&stats](double d) { stats.add_value(d); },
-                [&stats](humanized_cell hc) { stats.add_value(hc.value); });
+            parse_cell(iter, parse_context::scan)
+                .match(
+                    [](empty_cell) {},
+                    [&stats](int64_t i) {
+                        stats.add_value(static_cast<double>(i));
+                    },
+                    [&stats](double d) { stats.add_value(d); },
+                    [&stats](humanized_cell hc) { stats.add_value(hc.value); },
+                    [](const text_cell& tc) {});
         }
         if (field_index < this->mlf_field_defs.size()) {
             return scan_error{fmt::format(
@@ -515,6 +518,15 @@ class metrics_log_format : public log_format {
                 field_index,
                 this->mlf_field_defs.size())};
         }
+        if (!this->lf_specialized) {
+            auto number_cells = 0;
+            for (const auto& stats : sbc.sbc_value_stats) {
+                number_cells += stats.lvs_count;
+            }
+            if (number_cells == 0) {
+                return scan_error{"metric row has no numeric fields"};
+            }
+        }
 
         return scan_match{500};
     }
@@ -531,11 +543,9 @@ class metrics_log_format : public log_format {
         // post-clear scan arrives here with an empty `dst`.  Seed
         // from epoch rather than reading `dst.back()` on an empty
         // vector.
-        const auto prev_time = dst.empty()
-            ? std::chrono::microseconds::zero()
-            : dst.back().get_time<>();
-        dst.emplace_back(
-            li.li_file_range.fr_offset, prev_time, LEVEL_STATS);
+        const auto prev_time = dst.empty() ? std::chrono::microseconds::zero()
+                                           : dst.back().get_time<>();
+        dst.emplace_back(li.li_file_range.fr_offset, prev_time, LEVEL_STATS);
         auto retval = this->parse_line(line_sf, dst, sbc);
         if (!retval.is<scan_match>()) {
             dst.pop_back();
@@ -560,8 +570,7 @@ class metrics_log_format : public log_format {
         // subsequent timestamp parses against the wrong zone.
         {
             auto file_options = lf.get_file_options();
-            this->lf_date_time.dts_default_zone
-                = file_options
+            this->lf_date_time.dts_default_zone = file_options
                 ? file_options->second.fo_default_zone.pp_value
                 : nullptr;
         }
@@ -734,18 +743,24 @@ class metrics_log_format : public log_format {
             if (mlf_hidden_columns.count(meta.lvm_name) != 0) {
                 meta.lvm_user_hidden = true;
             }
-            parse_cell(iter).match(
-                [&](empty_cell) { values.lvv_values.emplace_back(meta); },
-                [&](int64_t i) { values.lvv_values.emplace_back(meta, i); },
-                [&](double d) { values.lvv_values.emplace_back(meta, d); },
-                [&](humanized_cell hc) {
-                    // Carry the detected unit on the per-value meta so
-                    // downstream renderers can call humanize::format
-                    // against the base-unit value.
-                    auto cell_meta = meta;
-                    cell_meta.lvm_unit_suffix = hc.unit_suffix;
-                    values.lvv_values.emplace_back(cell_meta, hc.value);
-                });
+            parse_cell(iter, parse_context::annotate)
+                .match(
+                    [&](empty_cell) { values.lvv_values.emplace_back(meta); },
+                    [&](int64_t i) { values.lvv_values.emplace_back(meta, i); },
+                    [&](double d) { values.lvv_values.emplace_back(meta, d); },
+                    [&](humanized_cell hc) {
+                        // Carry the detected unit on the per-value meta so
+                        // downstream renderers can call humanize::format
+                        // against the base-unit value.
+                        auto cell_meta = meta;
+                        cell_meta.lvm_unit_suffix = hc.unit_suffix;
+                        values.lvv_values.emplace_back(cell_meta, hc.value);
+                    },
+                    [&](const text_cell& tc) {
+                        values.lvv_values.emplace_back(meta, tc.value);
+                        values.lvv_values.back().lv_meta.lvm_kind
+                            = value_kind_t::VALUE_TEXT;
+                    });
             values.lvv_values.back().lv_origin = lr;
         }
 
@@ -776,10 +791,19 @@ class metrics_log_format : public log_format {
         double value;
         intern_string_t unit_suffix;
     };
-    using parsed_cell_t
-        = mapbox::util::variant<empty_cell, int64_t, double, humanized_cell>;
+    struct text_cell {
+        std::string value;
+    };
+    using parsed_cell_t = mapbox::util::
+        variant<empty_cell, int64_t, double, humanized_cell, text_cell>;
+
+    enum class parse_context {
+        scan,
+        annotate,
+    };
 
-    static parsed_cell_t parse_cell(const separated_string::iterator& iter)
+    static parsed_cell_t parse_cell(const separated_string::iterator& iter,
+                                    parse_context pc)
     {
         const auto field = *iter;
         switch (iter.kind()) {
@@ -812,7 +836,19 @@ class metrics_log_format : public log_format {
             }
             case separated_string::cell_kind::other: {
                 // Plain text; humanize wouldn't have parsed it.
-                return parsed_cell_t{empty_cell{}};
+                switch (pc) {
+                    case parse_context::scan:
+                        // During scanning, treat unparseable text as
+                        // empty so it doesn't mess with stats or
+                        // trigger a type change on the column.
+                        return parsed_cell_t{empty_cell{}};
+                    case parse_context::annotate:
+                        // During annotation, preserve the text so the
+                        // renderer can show it and the user can query
+                        // against it.
+                        return parsed_cell_t{text_cell{
+                            separated_string::unescape_quoted(field)}};
+                }
             }
         }
         return parsed_cell_t{empty_cell{}};

src/logfile.cc

@@ -1053,6 +1053,9 @@ logfile::process_prefix(shared_buffer_ref& sbr,
                         curr->get_name().c_str());
                 },
                 [this, curr](const log_format::scan_error& se) {
+                    if (this->lf_format == nullptr) {
+                        return;
+                    }
                     this->lf_invalid_lines.ili_total += 1;
                     if (this->lf_invalid_lines.ili_lines.size()
                         >= invalid_line_info::MAX_INVALID_LINES)

src/logfile_sub_source.cc

@@ -359,9 +359,6 @@ logfile_sub_source::text_value_for_line(textview_curses& tc,
         auto emit_value = [&](logfile* src_lf,
                               const logline_value& lv,
                               const char* src_data) {
-            if (lv.lv_meta.lvm_kind == value_kind_t::VALUE_NULL) {
-                return;
-            }
             // Respect `:hide-fields metrics_log.<col>` — a user-hidden
             // column drops out of the composed line entirely.
             if (lv.lv_meta.is_hidden()) {
@@ -413,10 +410,13 @@ logfile_sub_source::text_value_for_line(textview_curses& tc,
                 stats != nullptr ? static_cast<size_t>(stats->lvs_width)
                                  : rendered.size());
             const auto value_start = static_cast<int>(composed.size());
-            if (col_width > rendered.size()) {
+            if (have_numeric && col_width > rendered.size()) {
                 composed.append(col_width - rendered.size(), ' ');
             }
             composed.append(rendered);
+            if (!have_numeric && col_width > rendered.size()) {
+                composed.append(col_width - rendered.size(), ' ');
+            }
 
             if (have_numeric && stats != nullptr && stats->lvs_count > 0
                 && col_width > 0)

src/metrics_vtab.cc

@@ -253,10 +253,12 @@ CREATE TABLE lnav_db.all_metrics (
                 } else if (col == 5) {
                     if (lv.lv_meta.lvm_kind == value_kind_t::VALUE_INTEGER) {
                         sqlite3_result_int64(ctx, lv.lv_value.i);
-                    } else if (lv.lv_meta.lvm_kind
-                               == value_kind_t::VALUE_FLOAT)
+                    } else if (lv.lv_meta.lvm_kind == value_kind_t::VALUE_FLOAT)
                     {
                         sqlite3_result_double(ctx, lv.lv_value.d);
+                    } else if (lv.lv_meta.lvm_kind == value_kind_t::VALUE_TEXT)
+                    {
+                        to_sqlite(ctx, lv.text_value_fragment());
                     } else {
                         sqlite3_result_null(ctx);
                     }

test/expected/Makefile.am

@@ -676,6 +676,8 @@ dist_noinst_DATA = \
     test_metric_log.sh_4db8507cd55d807eca20cba3ba401863ae301e7c.out \
     test_metric_log.sh_50f252ff4452cc765fc67436d5692ede72a9e157.err \
     test_metric_log.sh_50f252ff4452cc765fc67436d5692ede72a9e157.out \
+    test_metric_log.sh_5987812b0d6c70a719e43b294aabb6640f29d7d6.err \
+    test_metric_log.sh_5987812b0d6c70a719e43b294aabb6640f29d7d6.out \
     test_metric_log.sh_5d58f57d6c95ff38e484fe5a470bb7bb9b95c31e.err \
     test_metric_log.sh_5d58f57d6c95ff38e484fe5a470bb7bb9b95c31e.out \
     test_metric_log.sh_5e5bf755596469de3f3d01c71379e6bb3a575ffc.err \
@@ -716,10 +718,14 @@ dist_noinst_DATA = \
     test_metric_log.sh_a9380b497697901ab77c8e207c0cc08bcdd031c0.out \
     test_metric_log.sh_ad2750b3c03c59b211b54a76f70d04bcd4c9588d.err \
     test_metric_log.sh_ad2750b3c03c59b211b54a76f70d04bcd4c9588d.out \
+    test_metric_log.sh_b602843dec24ff5f8585162c87fc6921d7ca8635.err \
+    test_metric_log.sh_b602843dec24ff5f8585162c87fc6921d7ca8635.out \
     test_metric_log.sh_b8313adbb4cceee46c1672d8cecac09910eb2a59.err \
     test_metric_log.sh_b8313adbb4cceee46c1672d8cecac09910eb2a59.out \
     test_metric_log.sh_bba1f5ef936f30f029aabc26afbbf2cef3714a03.err \
     test_metric_log.sh_bba1f5ef936f30f029aabc26afbbf2cef3714a03.out \
+    test_metric_log.sh_bce1444a2940943fd594d52e3f1d877b17c62e80.err \
+    test_metric_log.sh_bce1444a2940943fd594d52e3f1d877b17c62e80.out \
     test_metric_log.sh_ccfa12f1625f04c74ff9ab18b2c3432da3f38eb0.err \
     test_metric_log.sh_ccfa12f1625f04c74ff9ab18b2c3432da3f38eb0.out \
     test_metric_log.sh_d7d470a79a1107a0a911ddff6ac8c18e1c939590.err \
@@ -732,10 +738,14 @@ dist_noinst_DATA = \
     test_metric_log.sh_e8e41753e6506f11710937119c931d50deebd0a1.out \
     test_metric_log.sh_f580091f21b2aad05cce6de17088d3ddefd21919.err \
     test_metric_log.sh_f580091f21b2aad05cce6de17088d3ddefd21919.out \
+    test_metric_log.sh_f7220aac78792df8347a4f3f98899dff4e449f7d.err \
+    test_metric_log.sh_f7220aac78792df8347a4f3f98899dff4e449f7d.out \
     test_metric_log.sh_f98800e078b61e68cd4a38e0aa0255e8b7fdd149.err \
     test_metric_log.sh_f98800e078b61e68cd4a38e0aa0255e8b7fdd149.out \
     test_metric_log.sh_fbc1c62d020654cde7bcdca14591e6f7c679c6e0.err \
     test_metric_log.sh_fbc1c62d020654cde7bcdca14591e6f7c679c6e0.out \
+    test_metric_log.sh_fd547d2682d1ac79fd4f78a22d81da698660a3da.err \
+    test_metric_log.sh_fd547d2682d1ac79fd4f78a22d81da698660a3da.out \
     test_metric_log.sh_ff5e772ec1dd920dad2c4d775403573be0d088dd.err \
     test_metric_log.sh_ff5e772ec1dd920dad2c4d775403573be0d088dd.out \
     test_pretty_print.sh_3c255c3c8b28df9d694b329a265e8b8140dae4a2.err \
@@ -826,8 +836,6 @@ dist_noinst_DATA = \
     test_sessions.sh_11283dc874ab809af1d61848ac659b79930c58b5.out \
     test_sessions.sh_13cbceaaa93ddd2756eef4c6a99500c466c60f10.err \
     test_sessions.sh_13cbceaaa93ddd2756eef4c6a99500c466c60f10.out \
-    test_sessions.sh_14aae534ade7470dee4e812297dd719f0725fee4.err \
-    test_sessions.sh_14aae534ade7470dee4e812297dd719f0725fee4.out \
     test_sessions.sh_17b85654b929b2a8fc1705a170ced544783292fa.err \
     test_sessions.sh_17b85654b929b2a8fc1705a170ced544783292fa.out \
     test_sessions.sh_2c01cde634f96b5425df76c8b0adbd5974897d20.err \
@@ -874,6 +882,8 @@ dist_noinst_DATA = \
     test_sessions.sh_7f4805745c6551e9f3ecbb809ffb4cfe8bce9c6f.out \
     test_sessions.sh_858fd0081ed9c46dd81e2f81f1090756f2463558.err \
     test_sessions.sh_858fd0081ed9c46dd81e2f81f1090756f2463558.out \
+    test_sessions.sh_882d7edbe0b797245bbbbd5c7bb7e76a9b5f864d.err \
+    test_sessions.sh_882d7edbe0b797245bbbbd5c7bb7e76a9b5f864d.out \
     test_sessions.sh_903b41c950f5f90d7786d7a09bb6e2f217654b15.err \
     test_sessions.sh_903b41c950f5f90d7786d7a09bb6e2f217654b15.out \
     test_sessions.sh_92a98a3e4e3a10bf1f2371d21a8282c5d3d4baa5.err \
@@ -892,12 +902,8 @@ dist_noinst_DATA = \
     test_sessions.sh_a92822d121a836140a401fd71535dc4a7a8d5b48.out \
     test_sessions.sh_aa301115c684a1ab028aa8a07c684d40e455134c.err \
     test_sessions.sh_aa301115c684a1ab028aa8a07c684d40e455134c.out \
-    test_sessions.sh_b3d71a87fcb4e3487f71ccad8c6ce681db220572.err \
-    test_sessions.sh_b3d71a87fcb4e3487f71ccad8c6ce681db220572.out \
     test_sessions.sh_b932b33dd087b94d4306dd179c5d4f9ddd394960.err \
     test_sessions.sh_b932b33dd087b94d4306dd179c5d4f9ddd394960.out \
-    test_sessions.sh_ba02a743ac8f9af518f28efe2cc832c3fff853dd.err \
-    test_sessions.sh_ba02a743ac8f9af518f28efe2cc832c3fff853dd.out \
     test_sessions.sh_ba1ded92531350668301431db64df2d2f4a2e9ee.err \
     test_sessions.sh_ba1ded92531350668301431db64df2d2f4a2e9ee.out \
     test_sessions.sh_bd713216a3fdfe394d0c00346645b7fdd8ac65da.err \
@@ -914,6 +920,8 @@ dist_noinst_DATA = \
     test_sessions.sh_ddf45811e9906de9f3930fe802ac7b2cc6e48106.out \
     test_sessions.sh_de50586d15f64bc767b1d9f64dce5d4ff649f0bd.err \
     test_sessions.sh_de50586d15f64bc767b1d9f64dce5d4ff649f0bd.out \
+    test_sessions.sh_de8750378504977ee44faa266996a26efd7f3a88.err \
+    test_sessions.sh_de8750378504977ee44faa266996a26efd7f3a88.out \
     test_sessions.sh_e47760d896ef5e5eab2a4a15f8e6b8a69cdd5280.err \
     test_sessions.sh_e47760d896ef5e5eab2a4a15f8e6b8a69cdd5280.out \
     test_sessions.sh_e492b83e19ae525a97ef0140f055e2954b69225a.err \

test/expected/test_metric_log.sh_5987812b0d6c70a719e43b294aabb6640f29d7d6.err

@@ -0,0 +1,9 @@
+log_line,log_time,metric,value
+0,2026-04-14T10:00:00.000000,cpu_pct,0
+0,2026-04-14T10:00:00.000000,mem_mb,500
+1,2026-04-14T10:00:10.000000,cpu_pct,10
+1,2026-04-14T10:00:10.000000,mem_mb,1000
+2,2026-04-14T10:00:20.000000,cpu_pct,20
+2,2026-04-14T10:00:20.000000,mem_mb,2000
+3,2026-04-14T10:00:30.000000,cpu_pct,30
+3,2026-04-14T10:00:30.000000,mem_mb,3000

test/expected/test_metric_log.sh_5987812b0d6c70a719e43b294aabb6640f29d7d6.out

@@ -0,0 +1,2 @@
+n
+0