Merge pull request #101 from basvanbeek/thrift

another thrift adventure in go land...
openzipkin-contrib · Mar 13, 2018 · 26cf970 · 26cf970
2 parents 4c9fbcb + 3f05268
commit 26cf970
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 16 deletions.
diff --git a/collector-kafka_test.go b/collector-kafka_test.go
@@ -1,6 +1,7 @@
 package zipkintracer
 
 import (
+ "context"
  "errors"
  "testing"
  "time"
@@ -167,7 +168,7 @@ func deserializeSpan(t *testing.T, e sarama.Encoder) *zipkincore.Span {
  s := zipkincore.NewSpan()
  mb := thrift.NewTMemoryBufferLen(len(bytes))
  _, _ = mb.Write(bytes)
- _ = mb.Flush()
+ _ = mb.Flush(context.Background())
  pt := thrift.NewTBinaryProtocolTransport(mb)
  err = s.Read(pt)
  if err != nil {

diff --git a/thrift/gen-go/scribe/scribe-consts.go b/thrift/gen-go/scribe/scribe-consts.go
diff --git a/thrift/gen-go/scribe/scribe-remote/scribe-remote.go b/thrift/gen-go/scribe/scribe-remote/scribe-remote.go
diff --git a/thrift/gen-go/scribe/scribe.go b/thrift/gen-go/scribe/scribe.go
diff --git a/thrift/gen-go/zipkincore/zipkinCore-consts.go b/thrift/gen-go/zipkincore/zipkinCore-consts.go
diff --git a/thrift/gen-go/zipkincore/zipkinCore.go b/thrift/gen-go/zipkincore/zipkinCore.go