Merge pull request #171 from signalfx/fix_thrift_include

golib: fix import path for thrift
signalfx · Jan 21, 2020 · 951e406 · 951e406
2 parents d0a2adb + 409be4c
commit 951e406
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 7 deletions.
diff --git a/disco/calc_test.go b/disco/calc_test.go
diff --git a/disco/thrift.go b/disco/thrift.go
@@ -5,10 +5,10 @@ import (
 	"net"
 	"time"
 
+	"git.apache.org/thrift.git/lib/go/thrift"
 	"github.com/signalfx/golib/v3/errors"
 	"github.com/signalfx/golib/v3/log"
 	"github.com/signalfx/golib/v3/logkey"
-	"github.com/signalfx/thrift/lib/go/thrift"
 )
 
 // ThriftTransport can be used as the transport layer for thrift, connecting to services discovered

diff --git a/disco/thrift_test.go b/disco/thrift_test.go
@@ -10,12 +10,12 @@ import (
 
 	"sync/atomic"
 
+	"git.apache.org/thrift.git/lib/go/thrift"
 	"github.com/samuel/go-zookeeper/zk"
 	"github.com/signalfx/golib/v3/log"
 	"github.com/signalfx/golib/v3/nettest"
 	"github.com/signalfx/golib/v3/zkplus"
 	"github.com/signalfx/golib/v3/zkplus/zktest"
-	"github.com/signalfx/thrift/lib/go/thrift"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/go.mod b/go.mod
@@ -5,8 +5,10 @@ go 1.13
 replace git.apache.org/thrift.git => github.com/signalfx/thrift v0.0.0-20181211001559-3838fa316492
 
 require (
+	git.apache.org/thrift.git v0.0.0-00010101000000-000000000000
 	github.com/boltdb/bolt v1.3.1
 	github.com/dropbox/godropbox v0.0.0-20180512210157-31879d3884b9
+	github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
 	github.com/facebookgo/stackerr v0.0.0-20150612192056-c2fcf88613f4
 	github.com/go-kit/kit v0.9.0
 	github.com/go-logfmt/logfmt v0.4.0
@@ -22,8 +24,7 @@ require (
 	github.com/signalfx/com_signalfx_metrics_protobuf v0.0.0-20190222193949-1fb69526e884
 	github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083
 	github.com/signalfx/gomemcache v0.0.0-20180823214636-4f7ef64c72a9
-	github.com/signalfx/sapm-proto v0.2.0
-	github.com/signalfx/thrift v0.0.0-20181211001559-3838fa316492
+	github.com/signalfx/sapm-proto v0.4.0
 	github.com/smartystreets/goconvey v1.6.4-0.20190306220146-200a235640ff
 	github.com/stretchr/testify v1.4.0
 	github.com/vaughan0/go-ini v0.0.0-20130923145212-a98ad7ee00ec

diff --git a/go.sum b/go.sum
@@ -91,14 +91,18 @@ github.com/signalfx/com_signalfx_metrics_protobuf v0.0.0-20190222193949-1fb69526
 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.0-20190222193949-1fb69526e884/go.mod h1:muYA2clvwCdj7nzAJ5vJIXYpJsUumhAl4Uu1wUNpWzA=
 github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083 h1:WsShHmu12ZztYPfh9b+I+VjYD1o8iOHhB67WZCMEEE8=
 github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083/go.mod h1:adPDS6s7WaajdFBV9mQ7i0dKfQ8xiDnF9ZNETVPpp7c=
-github.com/signalfx/golib v2.5.1+incompatible h1:rw16Flfx5Z29DahDSNGAA3ch8dOeNc3oOMUJm493yao=
 github.com/signalfx/golib/v3 v3.0.0/go.mod h1:p+krygP/cDlWvCBEgdkQp3H16rbP4NW7YQa81TDMRe8=
 github.com/signalfx/gomemcache v0.0.0-20180823214636-4f7ef64c72a9 h1:M3hb9iDDlB3LrR1xI6wiWIA75Ol9eenD5fbV5d3bxjc=
 github.com/signalfx/gomemcache v0.0.0-20180823214636-4f7ef64c72a9/go.mod h1:Ytb8KfCSyuwy/VILnROdgCvbQLA5ch0nkbG7lKT0BXw=
 github.com/signalfx/sapm-proto v0.2.0 h1:uaNhSN9qE8g16YtXSbryPmbkRiyCt8Bw4XTjV/MC5Xg=
 github.com/signalfx/sapm-proto v0.2.0/go.mod h1:X/wS1ofuOAW+OTFhCALiHVZvihqMDiNPhzmbusWCQi8=
+github.com/signalfx/sapm-proto v0.3.1-0.20200117222306-7b55fd81b38c h1:TC0N/wQoHpPphOjob7Cuy8OmRkeqcvh83zzv91+joWY=
+github.com/signalfx/sapm-proto v0.3.1-0.20200117222306-7b55fd81b38c/go.mod h1:x3gtwJ1GRejtkghB4nYpwixh2zqJrLbPU959ZNhM0Fk=
+github.com/signalfx/sapm-proto v0.4.0 h1:5lQX++6FeIjUZEIcnSgBqhOpmSjMkRBW3y/4ZiKMo5E=
+github.com/signalfx/sapm-proto v0.4.0/go.mod h1:x3gtwJ1GRejtkghB4nYpwixh2zqJrLbPU959ZNhM0Fk=
 github.com/signalfx/thrift v0.0.0-20181211001559-3838fa316492 h1:xWH5x1J8QgMdxs1q+jcuVyBKmazAee82UWeS9BPMxzY=
 github.com/signalfx/thrift v0.0.0-20181211001559-3838fa316492/go.mod h1:Xv29nl9fxdk0hmeqcUHgAZZwvYrOhduNW+9qk4H+6K0=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/assertions v0.0.0-20190215210624-980c5ac6f3ac h1:wbW+Bybf9pXxnCFAOWZTqkRjAc7rAIwo2e1ArUhiHxg=
 github.com/smartystreets/assertions v0.0.0-20190215210624-980c5ac6f3ac/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
@@ -137,6 +141,7 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd h1:r7DufRZuZbWB7j439YfAzP8RPDa9unLkpwQKUYbIMPI=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

diff --git a/sfxclient/httpsink.go b/sfxclient/httpsink.go
@@ -26,7 +26,7 @@ import (
 	"github.com/signalfx/golib/v3/sfxclient/spanfilter"
 	"github.com/signalfx/golib/v3/trace"
 	traceformat "github.com/signalfx/golib/v3/trace/format"
-	"github.com/signalfx/sapm-proto/translator"
+	"github.com/signalfx/golib/v3/trace/translator"
 )
 
 const (

diff --git a/translator/batcher.go → trace/translator/batcher.go b/translator/batcher.go → trace/translator/batcher.go
diff --git a/translator/batcher_test.go → trace/translator/batcher_test.go b/translator/batcher_test.go → trace/translator/batcher_test.go
diff --git a/translator/constants.go → trace/translator/constants.go b/translator/constants.go → trace/translator/constants.go
diff --git a/translator/grpc_http_mapper.go → trace/translator/grpc_http_mapper.go b/translator/grpc_http_mapper.go → trace/translator/grpc_http_mapper.go
diff --git a/translator/grpc_http_mapper_test.go → trace/translator/grpc_http_mapper_test.go b/translator/grpc_http_mapper_test.go → trace/translator/grpc_http_mapper_test.go
diff --git a/translator/sfx.go → trace/translator/sfx.go b/translator/sfx.go → trace/translator/sfx.go
diff --git a/translator/sfx_test.go → trace/translator/sfx_test.go b/translator/sfx_test.go → trace/translator/sfx_test.go