add BackendReuse tag

Author: aorith

render/sequence.go

@@ -218,7 +218,7 @@ func addTransactionLogs(s *svgsequence.Sequence, ts vsl.TransactionSet, tx *vsl.
 			s.AddStep(svgsequence.Step{
 				Source: B, Target: B,
 				Text: fmt.Sprintf(
-					"%s: %s\n%s %s:%d",
+					"%s\n%s\n%s %s:%d",
 					record.GetTag(),
 					truncateStrMiddle(record.Name, truncateLen),
 					record.Reason,
@@ -231,14 +231,25 @@ func addTransactionLogs(s *svgsequence.Sequence, ts vsl.TransactionSet, tx *vsl.
 			s.AddStep(svgsequence.Step{
 				Source: B, Target: B,
 				Text: fmt.Sprintf(
-					"%s: %s\n%s %s",
+					"%s\n%s\n%s %s",
 					record.GetTag(),
 					truncateStrMiddle(record.Name, truncateLen),
 					record.Reason,
 					record.OptionalReason,
 				),
 			})
 
+		// Old varnish versions
+		case vsl.BackendReuseRecord:
+			s.AddStep(svgsequence.Step{
+				Source: B, Target: B,
+				Text: fmt.Sprintf(
+					"%s\n%s",
+					record.GetTag(),
+					truncateStrMiddle(record.Name, truncateLen),
+				),
+			})
+
 		case vsl.FetchErrorRecord:
 			s.AddStep(svgsequence.Step{Source: B, Target: B, Text: wrapAndTruncate(record.GetRawValue(), truncateLen, 100), Color: ColorError})
 

render/timeline.go

@@ -133,7 +133,7 @@ func Timeline(ts vsl.TransactionSet, root *vsl.Transaction, precision, numTicks
 func collectAndSortRecords(ts vsl.TransactionSet, tx *vsl.Transaction, visited map[vsl.VXID]bool) (events []TimelineEvent) {
 	if visited[tx.VXID] {
 		slog.Info("collectAndSortRecords(): loop detected", "txid", tx.TXID)
-		return
+		return events
 	}
 	visited[tx.VXID] = true
 

vsl/parser.go

@@ -236,6 +236,8 @@ func processRecord(line string) (Record, error) {
 		return NewBackendStartRecord(blr)
 	case tags.BackendClose:
 		return NewBackendCloseRecord(blr)
+	case tags.BackendReuse:
+		return NewBackendReuseRecord(blr)
 	case tags.ReqAcct, tags.BereqAcct:
 		return NewAcctRecord(blr)
 	case tags.PipeAcct:

vsl/records.go

@@ -360,6 +360,33 @@ func NewBackendCloseRecord(blr BaseRecord) (BackendCloseRecord, error) {
 	}, nil
 }
 
+// BackendReuseRecord holds information about a backend reuse (keep-alive)
+//
+// Note that this record was deprecated in favor of BackendClose
+type BackendReuseRecord struct {
+	BaseRecord
+	FileDescriptor int    // Connection file descriptor
+	Name           string // Backend display name
+}
+
+func NewBackendReuseRecord(blr BaseRecord) (BackendReuseRecord, error) {
+	record := BackendReuseRecord{BaseRecord: blr}
+
+	parts := strings.Fields(blr.GetRawValue())
+	if len(parts) < 2 {
+		return record, nil
+	}
+
+	fileDesc, err := strconv.Atoi(parts[0])
+	if err != nil {
+		return record, nil
+	}
+
+	record.FileDescriptor = fileDesc
+	record.Name = parts[1]
+	return record, nil
+}
+
 // AcctRecord holds accounting information for ReqAcct and BereqAcct tags
 type AcctRecord struct {
 	BaseRecord

vsl/tags/tags.go

@@ -42,6 +42,8 @@ const (
 	BackendOpen = "BackendOpen"
 	// Logged when a backend connection is started
 	BackendStart = "BackendStart"
+	// Logged when a backend connection is reused (keep-alive)
+	BackendReuse = "BackendReuse"
 	// Contains byte counters from backend request processing
 	BereqAcct = "BereqAcct"
 	// Backend request method