Skip to content

Commit

Permalink
Fix OTLP waitForReady, not set from config (open-telemetry#1254)
Browse files Browse the repository at this point in the history
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
  • Loading branch information
bogdandrutu authored and wyTrivail committed Jul 13, 2020
1 parent 094b878 commit 926a151
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions exporter/otlpexporter/exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,19 +97,24 @@ type grpcSender struct {
}

func newGrpcSender(config *Config) (sender, error) {
gs := &grpcSender{}
dialOpts, err := config.GRPCClientSettings.ToDialOptions()
if err != nil {
return nil, err
}

if gs.grpcClientConn, err = grpc.Dial(config.GRPCClientSettings.Endpoint, dialOpts...); err != nil {
var clientConn *grpc.ClientConn
if clientConn, err = grpc.Dial(config.GRPCClientSettings.Endpoint, dialOpts...); err != nil {
return nil, err
}
gs.traceExporter = otlptracecol.NewTraceServiceClient(gs.grpcClientConn)
gs.metricExporter = otlpmetriccol.NewMetricsServiceClient(gs.grpcClientConn)
gs.logExporter = otlplogcol.NewLogServiceClient(gs.grpcClientConn)
gs.metadata = metadata.New(config.GRPCClientSettings.Headers)

gs := &grpcSender{
traceExporter: otlptracecol.NewTraceServiceClient(clientConn),
metricExporter: otlpmetriccol.NewMetricsServiceClient(clientConn),
logExporter: otlplogcol.NewLogServiceClient(clientConn),
grpcClientConn: clientConn,
metadata: metadata.New(config.GRPCClientSettings.Headers),
waitForReady: config.GRPCClientSettings.WaitForReady,
}
return gs, nil
}

Expand Down

0 comments on commit 926a151

Please sign in to comment.