Skip to content

Commit 08ac5e2

Browse files
aorithaorith
committed
chore: update svg-sequence
1 parent 24a2b79 commit 08ac5e2

File tree

3 files changed

+31
-29
lines changed

3 files changed

+31
-29
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ module github.com/aorith/varnishlog-parser
33
go 1.25.3
44

55
require (
6-
github.com/aorith/svg-sequence v0.0.14
6+
github.com/aorith/svg-sequence v0.0.15
77
github.com/aorith/svg-timeline v0.2.1
88
)

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@ github.com/aorith/svg-sequence v0.0.13 h1:bRLN27OSoK0wsXOvzkNmpAdMuZDBueXxU14sFN
22
github.com/aorith/svg-sequence v0.0.13/go.mod h1:8PeIQFIE65/ZgSbPwUvv5lfuaiv80V9x2t4NNRhI2jQ=
33
github.com/aorith/svg-sequence v0.0.14 h1:DCoSHVg37o7W3eRqbhEeAsIq/jbzrpkvCS2XTPg0XfI=
44
github.com/aorith/svg-sequence v0.0.14/go.mod h1:8PeIQFIE65/ZgSbPwUvv5lfuaiv80V9x2t4NNRhI2jQ=
5+
github.com/aorith/svg-sequence v0.0.15 h1:E9kH4/WE9+BiQFmOqP3oCuP6e79Cqg1MygetofqTZTs=
6+
github.com/aorith/svg-sequence v0.0.15/go.mod h1:8PeIQFIE65/ZgSbPwUvv5lfuaiv80V9x2t4NNRhI2jQ=
57
github.com/aorith/svg-timeline v0.2.1 h1:BKog2X8drlpTeIXZXa89OnxVaFr4IUhVA4/9q3BUsHE=
68
github.com/aorith/svg-timeline v0.2.1/go.mod h1:haohFRiwc0+Po6714AgYlsoeolDqRTNkI+d62k51qjo=

‎pkg/render/sequence.go‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,15 @@ func addTransactionLogs(s *svgsequence.Sequence, ts vsl.TransactionSet, tx *vsl.
128128

129129
case vsl.VCLCallRecord:
130130
if cfg.IncludeCalls {
131-
s.AddStep(svgsequence.Step{SourceActor: V, TargetActor: V, Description: "call " + record.GetRawValue(), Color: ColorCall})
131+
s.AddStep(svgsequence.Step{Source: V, Target: V, Text: "call " + record.GetRawValue(), Color: ColorCall})
132132
}
133133

134134
switch r.GetRawValue() {
135135
case "RECV":
136-
s.AddStep(svgsequence.Step{SourceActor: client, TargetActor: V, Description: drawRequest(reqReceived, truncateLen)})
136+
s.AddStep(svgsequence.Step{Source: client, Target: V, Text: drawRequest(reqReceived, truncateLen)})
137137

138138
case "HASH":
139-
s.AddStep(svgsequence.Step{SourceActor: V, TargetActor: H, Description: "HASH"})
139+
s.AddStep(svgsequence.Step{Source: V, Target: H, Text: "HASH"})
140140

141141
case "HIT":
142142
hitRecord := getLastHitRecord(tx, i)
@@ -150,10 +150,10 @@ func addTransactionLogs(s *svgsequence.Sequence, ts vsl.TransactionSet, tx *vsl.
150150
s1 += fmt.Sprintf("%s\n", hitRecord.Tag)
151151
s1 += wrapAndTruncate(hitRecord.String(), truncateLen, 100)
152152
}
153-
s.AddStep(svgsequence.Step{SourceActor: H, TargetActor: V, Description: s1, Color: ColorHit})
153+
s.AddStep(svgsequence.Step{Source: H, Target: V, Text: s1, Color: ColorHit})
154154

155155
case "MISS", "PASS":
156-
s.AddStep(svgsequence.Step{SourceActor: H, TargetActor: V, Description: r.GetRawValue()})
156+
s.AddStep(svgsequence.Step{Source: H, Target: V, Text: r.GetRawValue()})
157157

158158
case "SYNTH":
159159
lastStatus := tx.LastRecordByTag(tags.RespStatus, i)
@@ -165,14 +165,14 @@ func addTransactionLogs(s *svgsequence.Sequence, ts vsl.TransactionSet, tx *vsl.
165165
if lastReason != nil {
166166
s1 += " " + wrapAndTruncate(lastReason.GetRawValue(), truncateLen, 100)
167167
}
168-
s.AddStep(svgsequence.Step{SourceActor: V, TargetActor: V, Description: s1})
168+
s.AddStep(svgsequence.Step{Source: V, Target: V, Text: s1})
169169

170170
case "PIPE":
171-
s.AddStep(svgsequence.Step{SourceActor: V, TargetActor: V, Description: "Open pipe to backend and forward request"})
172-
s.AddStep(svgsequence.Step{SourceActor: B, TargetActor: client, Description: r.GetRawValue()})
171+
s.AddStep(svgsequence.Step{Source: V, Target: V, Text: "Open pipe to backend and forward request"})
172+
s.AddStep(svgsequence.Step{Source: B, Target: client, Text: r.GetRawValue()})
173173

174174
case "BACKEND_FETCH":
175-
s.AddStep(svgsequence.Step{SourceActor: V, TargetActor: B, Description: drawRequest(reqProcessed, truncateLen)})
175+
s.AddStep(svgsequence.Step{Source: V, Target: B, Text: drawRequest(reqProcessed, truncateLen)})
176176

177177
case "BACKEND_RESPONSE":
178178
// handled at return deliver
@@ -181,7 +181,7 @@ func addTransactionLogs(s *svgsequence.Sequence, ts vsl.TransactionSet, tx *vsl.
181181

182182
case vsl.VCLReturnRecord:
183183
if cfg.IncludeReturns {
184-
s.AddStep(svgsequence.Step{SourceActor: V, TargetActor: V, Description: "return " + record.GetRawValue(), Color: ColorReturn})
184+
s.AddStep(svgsequence.Step{Source: V, Target: V, Text: "return " + record.GetRawValue(), Color: ColorReturn})
185185
}
186186

187187
switch r.GetRawValue() {
@@ -196,7 +196,7 @@ func addTransactionLogs(s *svgsequence.Sequence, ts vsl.TransactionSet, tx *vsl.
196196
if lastReason != nil {
197197
s1 += " " + wrapAndTruncate(lastReason.GetRawValue(), truncateLen, 100)
198198
}
199-
s.AddStep(svgsequence.Step{SourceActor: V, TargetActor: client, Description: s1})
199+
s.AddStep(svgsequence.Step{Source: V, Target: client, Text: s1})
200200
}
201201

202202
case vsl.TxTypeBereq:
@@ -209,15 +209,15 @@ func addTransactionLogs(s *svgsequence.Sequence, ts vsl.TransactionSet, tx *vsl.
209209
s1 += " " + wrapAndTruncate(lastReason.GetRawValue(), truncateLen, 100)
210210
}
211211
}
212-
s.AddStep(svgsequence.Step{SourceActor: B, TargetActor: V, Description: s1})
212+
s.AddStep(svgsequence.Step{Source: B, Target: V, Text: s1})
213213

214214
}
215215
}
216216

217217
case vsl.BackendOpenRecord:
218218
s.AddStep(svgsequence.Step{
219-
SourceActor: B, TargetActor: B,
220-
Description: fmt.Sprintf(
219+
Source: B, Target: B,
220+
Text: fmt.Sprintf(
221221
"Backend: %s\n%s %s:%d",
222222
truncateStrMiddle(record.Name, truncateLen),
223223
record.Reason,
@@ -228,8 +228,8 @@ func addTransactionLogs(s *svgsequence.Sequence, ts vsl.TransactionSet, tx *vsl.
228228

229229
case vsl.BackendCloseRecord:
230230
s.AddStep(svgsequence.Step{
231-
SourceActor: B, TargetActor: B,
232-
Description: fmt.Sprintf(
231+
Source: B, Target: B,
232+
Text: fmt.Sprintf(
233233
"Backend: %s\n%s %s",
234234
truncateStrMiddle(record.Name, truncateLen),
235235
record.Reason,
@@ -238,32 +238,32 @@ func addTransactionLogs(s *svgsequence.Sequence, ts vsl.TransactionSet, tx *vsl.
238238
})
239239

240240
case vsl.FetchErrorRecord:
241-
s.AddStep(svgsequence.Step{SourceActor: B, TargetActor: B, Description: wrapAndTruncate(record.GetRawValue(), truncateLen, 100), Color: ColorError})
241+
s.AddStep(svgsequence.Step{Source: B, Target: B, Text: wrapAndTruncate(record.GetRawValue(), truncateLen, 100), Color: ColorError})
242242

243243
case vsl.URLRecord:
244244
if cfg.TrackURLAndHost {
245245
s.AddStep(svgsequence.Step{
246-
SourceActor: V,
247-
TargetActor: V,
248-
Description: truncateStr("URL: "+record.Path()+record.QueryString(), truncateLen),
249-
Color: ColorTrack,
246+
Source: V,
247+
Target: V,
248+
Text: truncateStr("URL: "+record.Path()+record.QueryString(), truncateLen),
249+
Color: ColorTrack,
250250
})
251251
}
252252

253253
case vsl.HeaderRecord:
254254
if cfg.TrackURLAndHost {
255255
// Header name should be already in canonical format
256256
if record.Name == "Host" {
257-
s.AddStep(svgsequence.Step{SourceActor: V, TargetActor: V, Description: truncateStr(record.Name+": "+record.Value, truncateLen), Color: ColorTrack})
257+
s.AddStep(svgsequence.Step{Source: V, Target: V, Text: truncateStr(record.Name+": "+record.Value, truncateLen), Color: ColorTrack})
258258
}
259259
}
260260

261261
case vsl.VCLLogRecord:
262262
s.AddStep(svgsequence.Step{
263-
SourceActor: V,
264-
TargetActor: V,
265-
Description: record.String(),
266-
Color: ColorGray,
263+
Source: V,
264+
Target: V,
265+
Text: record.String(),
266+
Color: ColorGray,
267267
})
268268

269269
case vsl.LinkRecord:
@@ -278,8 +278,8 @@ func addTransactionLogs(s *svgsequence.Sequence, ts vsl.TransactionSet, tx *vsl.
278278
actor = B
279279
}
280280
s.AddStep(svgsequence.Step{
281-
SourceActor: actor, TargetActor: actor,
282-
Description: fmt.Sprintf("%s\n*Linked child tx not found*", record.GetRawLog()),
281+
Source: actor, Target: actor,
282+
Text: fmt.Sprintf("%s\n*Linked child tx not found*", record.GetRawLog()),
283283
})
284284
}
285285
}

0 commit comments

Comments
 (0)