Skip to content

Commit 26cf970

Browse files
authored
Merge pull request #101 from basvanbeek/thrift
another thrift adventure in go land...
2 parents 4c9fbcb + 3f05268 commit 26cf970

File tree

6 files changed

+43
-16
lines changed

6 files changed

+43
-16
lines changed

collector-kafka_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package zipkintracer
22

33
import (
4+
"context"
45
"errors"
56
"testing"
67
"time"
@@ -167,7 +168,7 @@ func deserializeSpan(t *testing.T, e sarama.Encoder) *zipkincore.Span {
167168
s := zipkincore.NewSpan()
168169
mb := thrift.NewTMemoryBufferLen(len(bytes))
169170
_, _ = mb.Write(bytes)
170-
_ = mb.Flush()
171+
_ = mb.Flush(context.Background())
171172
pt := thrift.NewTBinaryProtocolTransport(mb)
172173
err = s.Read(pt)
173174
if err != nil {

thrift/gen-go/scribe/scribe-consts.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

thrift/gen-go/scribe/scribe-remote/scribe-remote.go

Lines changed: 29 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

thrift/gen-go/scribe/scribe.go

Lines changed: 9 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

thrift/gen-go/zipkincore/zipkinCore-consts.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

thrift/gen-go/zipkincore/zipkinCore.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)