Preserve version one error record scopes

This commit is contained in:
2026-11-17 03:54:41 +00:00
parent 0c2a2164ec
commit c6be2ec20d
7 changed files with 71 additions and 47 deletions

View File

@@ -13,12 +13,13 @@ import (
// RunFailure describes a fatal or output failure without carrying its raw cause.
type RunFailure struct {
Phase string
Reason outcomes.ReasonCode
OutputPath string
Origin *outcomes.Reference
StageIndex *int
HasSection bool
Phase string
Reason outcomes.ReasonCode
OutputPath string
Origin *outcomes.Reference
StageIndex *int
HasSection bool
interruptions []reporting.FailureDetails
}
type BuildInput struct {
@@ -82,7 +83,7 @@ func Build(input BuildInput) reporting.Snapshot {
}
operations := append([]outcomes.Operation(nil), unit.Operations...)
sort.SliceStable(operations, func(i, j int) bool { return operationLess(operations[i], operations[j]) })
var failures []reporting.Failure
var unitFailures []reporting.Failure
unitHasError := false
unitRecoveries := 0
for _, operation := range operations {
@@ -92,7 +93,7 @@ func Build(input BuildInput) reporting.Snapshot {
}
if operation.FailureClass == outcomes.FailureRecoverable {
unitHasError = true
failures = append(failures, mapFailure(operation))
unitFailures = append(unitFailures, mapFailure(operation))
}
}
row := reporting.WorkUnit{StageIndex: unit.ModuleIndex, StageID: unit.StageID, ModuleKey: unit.ModuleKey, ModuleInstance: unit.ModuleInstance,
@@ -101,14 +102,13 @@ func Build(input BuildInput) reporting.Snapshot {
if unitHasError {
row.ErrorCount = 1
stage, chunk, start, end, applied := unit.ModuleIndex, unit.Section.Index, unit.Section.StartSegmentID, unit.Section.EndSegmentID, unit.CorrectionsApplied
snapshot.Errors = append(snapshot.Errors, reporting.ErrorRecord{Scope: "work_unit", StageIndex: &stage, StageID: unit.StageID,
ModuleKey: unit.ModuleKey, ModuleInstance: unit.ModuleInstance, ChunkIndex: &chunk,
StartSegmentID: &start, EndSegmentID: &end, CorrectionsApplied: &applied, Failures: failures})
snapshot.Errors = append(snapshot.Errors, reporting.ErrorRecord{Scope: "work_unit",
FailureDetails: reporting.FailureDetails{StageIndex: &stage, StageID: unit.StageID,
ModuleKey: unit.ModuleKey, ModuleInstance: unit.ModuleInstance, ChunkIndex: &chunk},
StartSegmentID: &start, EndSegmentID: &end, CorrectionsApplied: &applied, Failures: unitFailures})
}
if unit.Failure != nil && !errors.Is(input.ProcessingError, unit.Failure) {
record := failureRecord(processingFailure(unit.Failure, "processing"))
record.Scope = "interrupted"
snapshot.Errors = append(snapshot.Errors, record)
if input.ProcessingError != nil && unit.Failure != nil && !errors.Is(input.ProcessingError, unit.Failure) {
failures[0].interruptions = append(failures[0].interruptions, failureDetails(processingFailure(unit.Failure, "processing")))
}
snapshot.WorkUnits = append(snapshot.WorkUnits, row)
for _, repair := range unit.Repairs {
@@ -148,8 +148,13 @@ func Build(input BuildInput) reporting.Snapshot {
}
func failureRecord(failure RunFailure) reporting.ErrorRecord {
record := reporting.ErrorRecord{Scope: "run", Phase: failure.Phase, Reason: string(failure.Reason),
Message: safeMessage(failure.Reason), OutputPath: failure.OutputPath, StageIndex: failure.StageIndex}
return reporting.ErrorRecord{Scope: "run", FailureDetails: failureDetails(failure),
OutputPath: failure.OutputPath, Interruptions: failure.interruptions}
}
func failureDetails(failure RunFailure) reporting.FailureDetails {
record := reporting.FailureDetails{Phase: failure.Phase, Reason: string(failure.Reason),
Message: safeMessage(failure.Reason), StageIndex: failure.StageIndex}
if failure.Origin != nil {
record.ModuleKey, record.ModuleInstance = failure.Origin.ModuleKey, failure.Origin.ModuleInstance
record.StageID = failure.Origin.StageID