Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set wait for ready in Jaeger gRPC exporter #899

Merged
merged 2 commits into from
Apr 30, 2020
Merged

Set wait for ready in Jaeger gRPC exporter #899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5fbaab
Make wait for ready configurable in gRPC exporters
pavolloffay Apr 30, 2020
b711390
Fix
pavolloffay Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions config/configgrpc/configgrpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ type GRPCSettings struct {
// The keepalive parameters for client gRPC. See grpc.WithKeepaliveParams
// (https://godoc.org/google.golang.org/grpc#WithKeepaliveParams).
KeepaliveParameters *KeepaliveConfig `mapstructure:"keepalive"`

// WaitForReady parameter configures client to wait for ready state before sending data.
// (https://github.com/grpc/grpc/blob/master/doc/wait-for-ready.md)
WaitForReady bool `mapstructure:"wait_for_ready"`
}

// KeepaliveConfig exposes the keepalive.ClientParameters to be used by the exporter.
Expand Down
12 changes: 7 additions & 5 deletions exporter/jaegerexporter/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ func New(config *Config) (component.TraceExporter, error) {

collectorServiceClient := jaegerproto.NewCollectorServiceClient(client)
s := &protoGRPCSender{
client: collectorServiceClient,
metadata: metadata.New(config.GRPCSettings.Headers),
client: collectorServiceClient,
metadata: metadata.New(config.GRPCSettings.Headers),
waitForReady: config.WaitForReady,
}

exp, err := exporterhelper.NewTraceExporter(config, s.pushTraceData)
Expand All @@ -58,8 +59,9 @@ func New(config *Config) (component.TraceExporter, error) {
// protoGRPCSender forwards spans encoded in the jaeger proto
// format, to a grpc server.
type protoGRPCSender struct {
client jaegerproto.CollectorServiceClient
metadata metadata.MD
client jaegerproto.CollectorServiceClient
metadata metadata.MD
waitForReady bool
}

func (s *protoGRPCSender) pushTraceData(
Expand All @@ -80,7 +82,7 @@ func (s *protoGRPCSender) pushTraceData(
for _, batch := range batches {
_, err = s.client.PostSpans(
ctx,
&jaegerproto.PostSpansRequest{Batch: *batch})
&jaegerproto.PostSpansRequest{Batch: *batch}, grpc.WaitForReady(s.waitForReady))
if err != nil {
return td.SpanCount() - sentSpans, err
}
Expand Down
4 changes: 2 additions & 2 deletions exporter/otlpexporter/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,14 +211,14 @@ func (e *exporterImp) exportRequest(ctx context.Context, perform func(ctx contex

func (e *exporterImp) exportTrace(ctx context.Context, request *otlptracecol.ExportTraceServiceRequest) error {
return e.exportRequest(ctx, func(ctx context.Context) error {
_, err := e.traceExporter.Export(ctx, request)
_, err := e.traceExporter.Export(ctx, request, grpc.WaitForReady(e.config.WaitForReady))
return err
})
}

func (e *exporterImp) exportMetrics(ctx context.Context, request *otlpmetriccol.ExportMetricsServiceRequest) error {
return e.exportRequest(ctx, func(ctx context.Context) error {
_, err := e.metricExporter.Export(ctx, request)
_, err := e.metricExporter.Export(ctx, request, grpc.WaitForReady(e.config.WaitForReady))
return err
})
}
Expand Down