Skip to content
This repository has been archived by the owner on May 23, 2024. It is now read-only.

Crossdock crash fix #228

Closed
wants to merge 7 commits into from
Closed

Crossdock crash fix #228

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4a1b431
Fix nil dereference in crossdock
Nov 14, 2017
81fa5cd
Propose release for version 2.10.0
Nov 14, 2017
abffe4e
Minor fixes for changelog
Nov 14, 2017
0db06a3
Merge remote-tracking branch 'upstream/master'
Nov 14, 2017
0bc9636
Back to development
Nov 14, 2017
1cd5c5e
Merge remote-tracking branch 'upstream/master'
Nov 14, 2017
9b7a475
Merge branch 'master' into crossdock-crash-fix
Nov 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crossdock/client/trace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ func (c *Client) trace(t crossdock.T) {
}
}

traceID := resp.Span.TraceId
if traceID == "" {
if resp.Span == nil || resp.Span.TraceId == "" {
t.Errorf("Trace ID is empty in S1(%s)", server1)
return
}

traceID := resp.Span.TraceId
success := validateTrace(t, level1.Downstream, resp, server1, 1, traceID, sampled, baggage)
if success {
t.Successf("trace checks out")
Expand Down