diff --git a/bible-local/10-decisions.md b/bible-local/10-decisions.md index d64d303..4a618e3 100644 --- a/bible-local/10-decisions.md +++ b/bible-local/10-decisions.md @@ -2045,3 +2045,29 @@ BDF numbering. - `CPU0` remains distinct from missing affinity. - On systems with Sub-NUMA Clustering, the value represents physical CPU affinity rather than an operating-system NUMA-domain ID. + +--- + +## ADL-070 — Parse time never becomes a data timestamp + +**Date:** 2026-09-28 +**Context:** Several parsers stamped events with `time.Now()`: Inspur +component.log memory/fan status, IDL/H3C SEL entries with unparsable time, +NVIDIA summary/bug-report detection events, generic/XigmaNAS/Unraid info +events, Redfish replay health/collection warnings. Yearless syslog lines took +the current year. An August dump opened in September showed "not detected" +DIMM warnings dated the day of analysis. + +**Decision:** Dump data is always historical. Parsers leave `Timestamp` zero +when an event has no time of its own, and it stays zero: no stage substitutes +parse time or collection time for an event time. Yearless syslog timestamps +use `parser.ParseYearlessInDefaultArchiveLocation`, which takes the year from +the collection time and yields zero when it is unknown. Archive and +uploaded-snapshot `CollectedAt` is never defaulted to now; only live API +collection may use the current time, because it is the collection time. + +**Consequences:** +- An archive with no datable content keeps `collected_at` unset. +- `time.Now()` stays legitimate only for job bookkeeping, export metadata + (`exported_at`, `generated_at`), live-collection timing and the Redfish + live log-entry window. diff --git a/internal/collector/redfish_replay.go b/internal/collector/redfish_replay.go index a34d4f6..d78641d 100644 --- a/internal/collector/redfish_replay.go +++ b/internal/collector/redfish_replay.go @@ -255,7 +255,6 @@ func appendMissingServerModelWarning(result *models.AnalysisResult, systemDoc ma } result.Events = append(result.Events, models.Event{ - Timestamp: time.Now(), Source: "Redfish", EventType: "Collection Warning", Severity: models.SeverityWarning, @@ -330,7 +329,6 @@ func buildDriveFetchWarningEvents(rawPayloads map[string]any) []models.Event { return []models.Event{ { - Timestamp: time.Now(), Source: "Redfish", EventType: "Collection Warning", Severity: models.SeverityWarning, @@ -481,10 +479,7 @@ func redfishSlotStatusLooksPresent(status string) bool { } func replayEventTimestamp(collectedAt time.Time) time.Time { - if !collectedAt.IsZero() { - return collectedAt - } - return time.Now() + return collectedAt } func (r redfishSnapshotReader) collectFirmwareInventory() []models.FirmwareInfo { @@ -697,7 +692,6 @@ func parseDiscreteSensorEvent(doc map[string]interface{}) (models.Event, bool) { return models.Event{}, false } return models.Event{ - Timestamp: time.Now(), Source: "Redfish", SensorName: name, EventType: "Discrete Sensor Status", @@ -915,7 +909,6 @@ func (r redfishSnapshotReader) collectHealthSummaryEvents(chassisPaths []string) } raw, _ := json.Marshal(doc) out = append(out, models.Event{ - Timestamp: time.Now(), Source: "Redfish", EventType: "Health Summary", Severity: models.SeverityWarning, diff --git a/internal/parser/parser.go b/internal/parser/parser.go index 57c6245..4316a55 100644 --- a/internal/parser/parser.go +++ b/internal/parser/parser.go @@ -72,7 +72,7 @@ func (p *BMCParser) parseFiles() error { result.PrivacyScan = scan } if result.CollectedAt.IsZero() { - if ts := inferCollectedAtFromExtractedFiles(p.files); !ts.IsZero() { + if ts := InferCollectedAtFromExtractedFiles(p.files); !ts.IsZero() { result.CollectedAt = ts.UTC() } } @@ -103,7 +103,9 @@ func runPrivacyScan(files []ExtractedFile) *models.PrivacyScan { return privacy.Scan(in) } -func inferCollectedAtFromExtractedFiles(files []ExtractedFile) time.Time { +// InferCollectedAtFromExtractedFiles returns the latest archive member mtime, +// which approximates when the dump was produced. +func InferCollectedAtFromExtractedFiles(files []ExtractedFile) time.Time { var latestReliable time.Time var latestAny time.Time for _, f := range files { @@ -150,7 +152,6 @@ func appendExtractionWarnings(result *models.AnalysisResult, files []ExtractedFi } result.Events = append(result.Events, models.Event{ - Timestamp: time.Now(), Source: "LOGPile", EventType: "Analysis Warning", Severity: models.SeverityWarning, diff --git a/internal/parser/parser_test.go b/internal/parser/parser_test.go index 1ff78f2..225cfe7 100644 --- a/internal/parser/parser_test.go +++ b/internal/parser/parser_test.go @@ -41,7 +41,7 @@ func TestInferCollectedAtFromExtractedFiles_PrefersReliableMTime(t *testing.T) { {Path: "c.log", ModTime: time.Date(2026, 2, 28, 4, 18, 18, 0, time.FixedZone("UTC+8", 8*3600))}, } - got := inferCollectedAtFromExtractedFiles(files) + got := InferCollectedAtFromExtractedFiles(files) want := files[2].ModTime if !got.Equal(want) { t.Fatalf("expected %s, got %s", want, got) @@ -54,9 +54,22 @@ func TestInferCollectedAtFromExtractedFiles_FallsBackToAnyMTime(t *testing.T) { {Path: "b.log", ModTime: time.Date(1970, 1, 2, 0, 0, 0, 0, time.UTC)}, } - got := inferCollectedAtFromExtractedFiles(files) + got := InferCollectedAtFromExtractedFiles(files) want := files[0].ModTime if !got.Equal(want) { t.Fatalf("expected fallback %s, got %s", want, got) } } + +func TestParseYearlessInDefaultArchiveLocation(t *testing.T) { + ref := time.Date(2026, 1, 3, 12, 0, 0, 0, time.UTC) + if got := ParseYearlessInDefaultArchiveLocation("Jan 2 15:04:05", "Dec 30 10:00:00", ref); got.Year() != 2025 { + t.Fatalf("expected rollover to previous year, got %s", got) + } + if got := ParseYearlessInDefaultArchiveLocation("Jan 2 15:04:05", "Jan 2 10:00:00", ref); got.Year() != 2026 { + t.Fatalf("expected collection year, got %s", got) + } + if got := ParseYearlessInDefaultArchiveLocation("Jan 2 15:04:05", "Jan 2 10:00:00", time.Time{}); !got.IsZero() { + t.Fatalf("unknown collection time must not invent a year, got %s", got) + } +} diff --git a/internal/parser/timezone.go b/internal/parser/timezone.go index 0ed43f0..ffda2fe 100644 --- a/internal/parser/timezone.go +++ b/internal/parser/timezone.go @@ -1,6 +1,7 @@ package parser import ( + "fmt" "sync" "time" ) @@ -31,3 +32,21 @@ func DefaultArchiveLocation() *time.Location { func ParseInDefaultArchiveLocation(layout, value string) (time.Time, error) { return time.ParseInLocation(layout, value, DefaultArchiveLocation()) } + +// ParseYearlessInDefaultArchiveLocation parses a syslog-style timestamp that +// carries no year (e.g. "Jan 2 15:04:05"). The year is taken from ref, the dump +// collection time, and rolled back one year when the result would land after +// ref. Returns zero when ref is unknown: parse time must never supply the year. +func ParseYearlessInDefaultArchiveLocation(layout, value string, ref time.Time) time.Time { + if ref.IsZero() { + return time.Time{} + } + ts, err := ParseInDefaultArchiveLocation(layout+" 2006", fmt.Sprintf("%s %d", value, ref.Year())) + if err != nil { + return time.Time{} + } + if ts.After(ref.Add(48 * time.Hour)) { + ts = ts.AddDate(-1, 0, 0) + } + return ts +} diff --git a/internal/parser/vendors/generic/parser.go b/internal/parser/vendors/generic/parser.go index 974d75d..9c3a136 100644 --- a/internal/parser/vendors/generic/parser.go +++ b/internal/parser/vendors/generic/parser.go @@ -3,7 +3,6 @@ package generic import ( "strings" - "time" "git.mchus.pro/mchus/logpile/internal/models" "git.mchus.pro/mchus/logpile/internal/parser" @@ -96,7 +95,6 @@ func (p *Parser) Parse(files []parser.ExtractedFile) (*models.AnalysisResult, er // Create a single event with file info result.Events = append(result.Events, models.Event{ - Timestamp: time.Now(), Source: "File", EventType: "Text File", Description: "Generic text file loaded", @@ -122,7 +120,6 @@ func parseNvidiaBugReport(content string, result *models.AnalysisResult) { if strings.Contains(line, "NVRM version:") || strings.Contains(line, "nvidia-smi") { if i+5 < len(lines) { result.Events = append(result.Events, models.Event{ - Timestamp: time.Now(), Source: "NVIDIA Driver", EventType: "Driver Info", Description: "NVIDIA driver information found", @@ -135,7 +132,6 @@ func parseNvidiaBugReport(content string, result *models.AnalysisResult) { // Find GPU devices if strings.Contains(line, "/proc/driver/nvidia/gpus/") && strings.Contains(line, "***") { result.Events = append(result.Events, models.Event{ - Timestamp: time.Now(), Source: "GPU", EventType: "GPU Device", Description: "GPU device detected", diff --git a/internal/parser/vendors/h3c/parser.go b/internal/parser/vendors/h3c/parser.go index 2d71f48..5c70d91 100644 --- a/internal/parser/vendors/h3c/parser.go +++ b/internal/parser/vendors/h3c/parser.go @@ -2011,9 +2011,6 @@ func parseSELJSON(content []byte) []models.Event { events := make([]models.Event, 0, len(entries)) for _, entry := range entries { timestamp := parseH3CTimestamp(entry.Created) - if timestamp.IsZero() { - timestamp = time.Now() - } description := firstNonEmpty(entry.Message, entry.Description) eventType := firstNonEmpty(entry.SensorType, entry.EntryType, "SEL") diff --git a/internal/parser/vendors/inspur/component.go b/internal/parser/vendors/inspur/component.go index fb10653..8b699dc 100644 --- a/internal/parser/vendors/inspur/component.go +++ b/internal/parser/vendors/inspur/component.go @@ -7,7 +7,6 @@ import ( "sort" "strconv" "strings" - "time" "git.mchus.pro/mchus/logpile/internal/models" "git.mchus.pro/mchus/logpile/internal/parser/vendors/pciids" @@ -1081,7 +1080,6 @@ func parseFanEvents(text string) []models.Event { events = append(events, models.Event{ ID: fmt.Sprintf("fan_%d_status", fan.ID), - Timestamp: time.Now(), Source: "Fan", SensorType: "fan", SensorName: name, @@ -1253,7 +1251,6 @@ func parseMemoryEvents(text string) []models.Event { events = append(events, models.Event{ ID: fmt.Sprintf("mem_%d", mem.MemModID), - Timestamp: time.Now(), Source: "Memory", SensorType: "memory", SensorName: mem.MemModSlot, diff --git a/internal/parser/vendors/inspur/idl.go b/internal/parser/vendors/inspur/idl.go index b7f02c9..5be2f07 100644 --- a/internal/parser/vendors/inspur/idl.go +++ b/internal/parser/vendors/inspur/idl.go @@ -38,7 +38,7 @@ func ParseIDLLog(content []byte) []models.Event { // Parse timestamp ts, err := time.Parse("2006-01-02T15:04:05-07:00", timestamp) if err != nil { - ts = time.Now() + ts = time.Time{} } // Map severity diff --git a/internal/parser/vendors/nvidia/summary.go b/internal/parser/vendors/nvidia/summary.go index 61af372..18b98c5 100644 --- a/internal/parser/vendors/nvidia/summary.go +++ b/internal/parser/vendors/nvidia/summary.go @@ -32,7 +32,7 @@ func ParseSummaryJSON(content []byte) []models.Event { } events := make([]models.Event, 0) - timestamp := time.Now() // Use current time as we don't have exact timestamps in summary + var timestamp time.Time // summary has no per-entry time; stamped with CollectedAt later for _, entry := range entries { // Only create events for failures or warnings @@ -61,7 +61,7 @@ func ParseSummaryCSV(content []byte) []models.Event { } events := make([]models.Event, 0) - timestamp := time.Now() + var timestamp time.Time // summary has no per-entry time; stamped with CollectedAt later // Skip header row for i, record := range records { diff --git a/internal/parser/vendors/nvidia_bug_report/errors.go b/internal/parser/vendors/nvidia_bug_report/errors.go index 22b9fcc..44d139a 100644 --- a/internal/parser/vendors/nvidia_bug_report/errors.go +++ b/internal/parser/vendors/nvidia_bug_report/errors.go @@ -77,11 +77,6 @@ func parseXidAndFaultEvents(content string, result *models.AnalysisResult) { scanner := bufio.NewScanner(strings.NewReader(content)) scanner.Buffer(make([]byte, 1024*1024), 1024*1024) - collectedYear := time.Now().Year() - if !result.CollectedAt.IsZero() { - collectedYear = result.CollectedAt.Year() - } - faultsByPCI := make(map[string]*gpuFault) recordFault := func(pci string, severity models.Severity, ts time.Time, description string) { if pci == "" { @@ -105,7 +100,7 @@ func parseXidAndFaultEvents(content string, result *models.AnalysisResult) { continue } timeStr, message := m[1], m[2] - ts := parseSyslogTimestamp(timeStr, collectedYear, result.CollectedAt) + ts := parseSyslogTimestamp(timeStr, result.CollectedAt) if xm := xidRegex.FindStringSubmatch(message); xm != nil { kind, pci, code, rest := xm[1], xm[2], xm[3], strings.TrimSpace(xm[4]) @@ -212,19 +207,7 @@ func applyGPUFaultStatus(result *models.AnalysisResult, faultsByPCI map[string]* } // parseSyslogTimestamp parses a syslog-style "Mon _2 15:04:05" timestamp -// (no year) using collectedYear as the assumed year, then corrects for a -// year rollover if that guess would put the event implausibly after the -// report was collected (e.g. a December log line in a January report). -func parseSyslogTimestamp(raw string, collectedYear int, collectedAt time.Time) time.Time { - ts, err := parser.ParseInDefaultArchiveLocation("Jan _2 15:04:05 2006", fmt.Sprintf("%s %d", raw, collectedYear)) - if err != nil { - return time.Time{} - } - if !collectedAt.IsZero() && ts.After(collectedAt.Add(48*time.Hour)) { - ts, err = parser.ParseInDefaultArchiveLocation("Jan _2 15:04:05 2006", fmt.Sprintf("%s %d", raw, collectedYear-1)) - if err != nil { - return time.Time{} - } - } - return ts +// (no year), taking the year from the bug report collection time. +func parseSyslogTimestamp(raw string, collectedAt time.Time) time.Time { + return parser.ParseYearlessInDefaultArchiveLocation("Jan _2 15:04:05", raw, collectedAt) } diff --git a/internal/parser/vendors/nvidia_bug_report/errors_test.go b/internal/parser/vendors/nvidia_bug_report/errors_test.go index 3096589..b14fe5e 100644 --- a/internal/parser/vendors/nvidia_bug_report/errors_test.go +++ b/internal/parser/vendors/nvidia_bug_report/errors_test.go @@ -192,7 +192,7 @@ func TestParseSyslogTimestamp_HandlesYearRollover(t *testing.T) { // Report collected early January; a log line stamped "Dec 30" must be // attributed to the previous year, not the future. collectedAt := time.Date(2027, 1, 5, 12, 0, 0, 0, time.UTC) - ts := parseSyslogTimestamp("Dec 30 10:00:00", collectedAt.Year(), collectedAt) + ts := parseSyslogTimestamp("Dec 30 10:00:00", collectedAt) if ts.Year() != 2026 { t.Fatalf("expected rollover to previous year 2026, got %d", ts.Year()) } diff --git a/internal/parser/vendors/nvidia_bug_report/gpu.go b/internal/parser/vendors/nvidia_bug_report/gpu.go index 6c469d2..64c3a9d 100644 --- a/internal/parser/vendors/nvidia_bug_report/gpu.go +++ b/internal/parser/vendors/nvidia_bug_report/gpu.go @@ -5,7 +5,6 @@ import ( "regexp" "strconv" "strings" - "time" "git.mchus.pro/mchus/logpile/internal/models" ) @@ -111,7 +110,6 @@ func parseGPUInfo(content string, result *models.AnalysisResult) { // Create event for GPU summary if len(result.Hardware.GPUs) > 0 { result.Events = append(result.Events, models.Event{ - Timestamp: time.Now(), Source: "NVIDIA Driver", EventType: "GPU Detection", Description: "NVIDIA GPUs detected", @@ -136,7 +134,6 @@ func parseDriverVersion(content string, result *models.AnalysisResult) { version := strings.TrimSpace(parts[1]) result.Events = append(result.Events, models.Event{ - Timestamp: time.Now(), Source: "NVIDIA Driver", EventType: "Driver Version", Description: "NVIDIA driver version detected", diff --git a/internal/parser/vendors/nvidia_bug_report/memory.go b/internal/parser/vendors/nvidia_bug_report/memory.go index 0202a8e..892ef3e 100644 --- a/internal/parser/vendors/nvidia_bug_report/memory.go +++ b/internal/parser/vendors/nvidia_bug_report/memory.go @@ -4,7 +4,6 @@ import ( "bufio" "strconv" "strings" - "time" "git.mchus.pro/mchus/logpile/internal/models" ) @@ -103,7 +102,6 @@ func parseMemoryModules(content string, result *models.AnalysisResult) { } result.Events = append(result.Events, models.Event{ - Timestamp: time.Now(), Source: "DMI", EventType: "Memory Configuration", Description: "Memory modules detected", diff --git a/internal/parser/vendors/nvidia_bug_report/parser.go b/internal/parser/vendors/nvidia_bug_report/parser.go index 351a06b..adc893d 100644 --- a/internal/parser/vendors/nvidia_bug_report/parser.go +++ b/internal/parser/vendors/nvidia_bug_report/parser.go @@ -103,6 +103,8 @@ func (p *Parser) Parse(files []parser.ExtractedFile) (*models.AnalysisResult, er if collectedAt, tzOffset, ok := parseBugReportCollectedAt(content); ok { result.CollectedAt = collectedAt.UTC() result.SourceTimezone = tzOffset + } else if ts := parser.InferCollectedAtFromExtractedFiles(files); !ts.IsZero() { + result.CollectedAt = ts.UTC() } // Parse system information diff --git a/internal/parser/vendors/unraid/parser.go b/internal/parser/vendors/unraid/parser.go index f569eeb..2a224d0 100644 --- a/internal/parser/vendors/unraid/parser.go +++ b/internal/parser/vendors/unraid/parser.go @@ -143,7 +143,7 @@ func (p *Parser) Parse(files []parser.ExtractedFile) (*models.AnalysisResult, er parseSMARTFileToMap(content, f.Path, storageBySlot, result) case strings.HasSuffix(path, "/logs/syslog.txt") || strings.HasSuffix(path, "\\logs\\syslog.txt"): - parseSyslog(content, result) + parseSyslog(content, parser.InferCollectedAtFromExtractedFiles(files), result) } } @@ -896,7 +896,6 @@ func parseSMARTFileToMap(content, filePath string, storageBySlot map[string]*mod health := strings.TrimSpace(m[1]) if !strings.EqualFold(health, "PASSED") { result.Events = append(result.Events, models.Event{ - Timestamp: time.Now(), Source: "SMART", EventType: "Disk Health", Severity: models.SeverityWarning, @@ -938,7 +937,7 @@ func parseSMARTFileToMap(content, filePath string, storageBySlot map[string]*mod } } -func parseSyslog(content string, result *models.AnalysisResult) { +func parseSyslog(content string, collectedAt time.Time, result *models.AnalysisResult) { scanner := bufio.NewScanner(strings.NewReader(content)) scanner.Buffer(make([]byte, 0, 64*1024), 1024*1024) lineCount := 0 @@ -952,7 +951,7 @@ func parseSyslog(content string, result *models.AnalysisResult) { // Parse syslog line // Example: Feb 5 23:33:01 box3 kernel: Linux version 6.12.54-Unraid - timestamp, message, severity := parseSyslogLine(line) + timestamp, message, severity := parseSyslogLine(line, collectedAt) result.Events = append(result.Events, models.Event{ Timestamp: timestamp, @@ -968,7 +967,6 @@ func parseSyslog(content string, result *models.AnalysisResult) { if err := scanner.Err(); err != nil { result.Events = append(result.Events, models.Event{ - Timestamp: time.Now(), Source: "syslog", EventType: "System Log", Severity: models.SeverityWarning, @@ -978,10 +976,10 @@ func parseSyslog(content string, result *models.AnalysisResult) { } } -func parseSyslogLine(line string) (time.Time, string, models.Severity) { +func parseSyslogLine(line string, collectedAt time.Time) (time.Time, string, models.Severity) { // Simple syslog parser // Format: Feb 5 23:33:01 hostname process[pid]: message - timestamp := time.Now() + var timestamp time.Time message := line severity := models.SeverityInfo @@ -991,11 +989,8 @@ func parseSyslogLine(line string) (time.Time, string, models.Severity) { timeStr := m[1] message = m[2] - // Parse timestamp (add current year) - year := time.Now().Year() - if ts, err := parser.ParseInDefaultArchiveLocation("Jan 2 15:04:05 2006", timeStr+" "+strconv.Itoa(year)); err == nil { - timestamp = ts - } + // Syslog carries no year: take it from the dump collection time. + timestamp = parser.ParseYearlessInDefaultArchiveLocation("Jan 2 15:04:05", timeStr, collectedAt) } // Classify severity diff --git a/internal/parser/vendors/xigmanas/parser.go b/internal/parser/vendors/xigmanas/parser.go index 5097670..e0ff951 100644 --- a/internal/parser/vendors/xigmanas/parser.go +++ b/internal/parser/vendors/xigmanas/parser.go @@ -86,7 +86,7 @@ func (p *Parser) Parse(files []parser.ExtractedFile) (*models.AnalysisResult, er parseUptime(content, result) parseZFSState(content, result) parseStorageAndSMART(content, result) - parseJournalLogSections(content, result) + parseJournalLogSections(content, parser.InferCollectedAtFromExtractedFiles(files), result) return result, nil } @@ -195,7 +195,6 @@ func parseUptime(content string, result *models.AnalysisResult) { } result.Events = append(result.Events, models.Event{ - Timestamp: time.Now(), Source: "System", EventType: "Uptime", Severity: models.SeverityInfo, @@ -216,7 +215,6 @@ func parseZFSState(content string, result *models.AnalysisResult) { severity = models.SeverityWarning } result.Events = append(result.Events, models.Event{ - Timestamp: time.Now(), Source: "ZFS", EventType: "Pool State", Severity: severity, @@ -296,7 +294,6 @@ func parseStorageAndSMART(content string, result *models.AnalysisResult) { } if info.health != "" && !strings.EqualFold(info.health, "PASSED") { result.Events = append(result.Events, models.Event{ - Timestamp: time.Now(), Source: "SMART", EventType: "Disk Health", Severity: models.SeverityWarning, @@ -338,7 +335,7 @@ func parseStorageAndSMART(content string, result *models.AnalysisResult) { } } -func parseJournalLogSections(content string, result *models.AnalysisResult) { +func parseJournalLogSections(content string, collectedAt time.Time, result *models.AnalysisResult) { sections := []struct { heading string eventType string @@ -367,7 +364,7 @@ func parseJournalLogSections(content string, result *models.AnalysisResult) { } result.Events = append(result.Events, models.Event{ - Timestamp: parseEventTimestamp(line), + Timestamp: parseEventTimestamp(line, collectedAt), Source: sec.source, EventType: sec.eventType, Severity: classifyEventSeverity(line), @@ -420,7 +417,7 @@ func isDashLine(s string) bool { return true } -func parseEventTimestamp(line string) time.Time { +func parseEventTimestamp(line string, collectedAt time.Time) time.Time { isoRe := regexp.MustCompile(`\b\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?[+-]\d{2}:\d{2}\b`) if iso := isoRe.FindString(line); iso != "" { if ts, err := time.Parse(time.RFC3339Nano, iso); err == nil { @@ -430,13 +427,10 @@ func parseEventTimestamp(line string) time.Time { prefixRe := regexp.MustCompile(`^[A-Z][a-z]{2}\s+\d{1,2}\s+\d{2}:\d{2}:\d{2}`) if prefix := prefixRe.FindString(line); prefix != "" { - year := time.Now().Year() - if ts, err := parser.ParseInDefaultArchiveLocation("Jan 2 15:04:05 2006", prefix+" "+strconv.Itoa(year)); err == nil { - return ts - } + return parser.ParseYearlessInDefaultArchiveLocation("Jan 2 15:04:05", prefix, collectedAt) } - return time.Now() + return time.Time{} } func classifyEventSeverity(line string) models.Severity { diff --git a/internal/server/handlers.go b/internal/server/handlers.go index 9fbe7c4..98b0da3 100644 --- a/internal/server/handlers.go +++ b/internal/server/handlers.go @@ -2088,7 +2088,7 @@ func applyArchiveSourceMetadata(result *models.AnalysisResult) { func inferArchiveCollectedAt(result *models.AnalysisResult) time.Time { if result == nil { - return time.Now().UTC() + return time.Time{} } var latestReliable time.Time @@ -2120,7 +2120,7 @@ func inferArchiveCollectedAt(result *models.AnalysisResult) time.Time { if fromFilename, ok := inferCollectedAtFromFilename(result.Filename); ok { return fromFilename.UTC() } - return time.Now().UTC() + return time.Time{} } func isReliableCollectedAtEvent(event models.Event) bool { @@ -2187,7 +2187,7 @@ func inferRawExportCollectedAt(result *models.AnalysisResult, pkg *RawExportPack return pkg.ExportedAt.UTC() } } - return time.Now().UTC() + return time.Time{} } func applyCollectSourceMetadata(result *models.AnalysisResult, req CollectRequest) { @@ -2203,6 +2203,7 @@ func applyCollectSourceMetadata(result *models.AnalysisResult, req CollectReques } } if result.CollectedAt.IsZero() { + // Live collection: the data was fetched just now. result.CollectedAt = time.Now().UTC() } if strings.TrimSpace(result.Filename) == "" { @@ -2248,9 +2249,6 @@ func parseUploadedSnapshot(payload []byte) (*models.AnalysisResult, error) { result.SourceType = models.SourceTypeArchive } } - if result.CollectedAt.IsZero() { - result.CollectedAt = time.Now().UTC() - } if strings.TrimSpace(result.Filename) == "" { result.Filename = "uploaded_snapshot.json" } diff --git a/internal/server/source_metadata_test.go b/internal/server/source_metadata_test.go index 0cb20f0..25d6453 100644 --- a/internal/server/source_metadata_test.go +++ b/internal/server/source_metadata_test.go @@ -25,8 +25,9 @@ func TestApplyArchiveSourceMetadata(t *testing.T) { if result.TargetHost != "" { t.Fatalf("expected empty target host for archive, got %q", result.TargetHost) } - if result.CollectedAt.IsZero() { - t.Fatalf("expected collected_at to be set") + // Nothing in the archive dates it: parse time must not be invented as collection time. + if !result.CollectedAt.IsZero() { + t.Fatalf("expected collected_at to stay unknown, got %s", result.CollectedAt) } }