Skip to content
This repository was archived by the owner on Nov 7, 2022. It is now read-only.

Commit f37ba81

Browse files
committed
Fixed Jaeger GRPC exporter (#622)
The exporter was essentially crashing itself unconditionally
1 parent 6de0938 commit f37ba81

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

cmd/occollector/app/sender/jaeger_proto_grpc_sender.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ var _ consumer.TraceConsumer = (*JaegerThriftHTTPSender)(nil)
4040
// The collector endpoint should be of the form "hostname:14250".
4141
func NewJaegerProtoGRPCSender(collectorEndpoint string, zlogger *zap.Logger) *JaegerProtoGRPCSender {
4242
client, err := grpc.Dial(collectorEndpoint, grpc.WithInsecure())
43-
zlogger.Fatal("Failed to dail grpc connection", zap.Error(err))
43+
if err != nil {
44+
zlogger.Fatal("Failed to dail grpc connection", zap.Error(err))
45+
}
4446
collectorServiceClient := jaegerproto.NewCollectorServiceClient(client)
4547
s := &JaegerProtoGRPCSender{
4648
client: collectorServiceClient,

go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,5 @@ require (
5959
gopkg.in/DataDog/dd-trace-go.v1 v1.12.1 // indirect
6060
gopkg.in/yaml.v2 v2.2.2
6161
)
62+
63+
replace git.apache.org/thrift.git => github.com/apache/thrift v0.12.0

go.sum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
5151
github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7 h1:Fv9bK1Q+ly/ROk4aJsVMeuIwPel4bEnD8EPiI91nZMg=
5252
github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
5353
github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
54+
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
5455
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I=
5556
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
5657
github.com/aws/aws-sdk-go v0.0.0-20180507225419-00862f899353/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k=

0 commit comments

Comments
 (0)