Skip to content

Build context pipeline into Jaeger upload process #1809

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

Merged
MrAlias merged 6 commits into from
Apr 19, 2021
Merged

Build context pipeline into Jaeger upload process #1809

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e36f8fa
Build context pipeline in Jaeger upload process
MrAlias Apr 13, 2021
43df9c2
Merge branch 'main' into jaeger-ctx-pipe
MrAlias Apr 14, 2021
4f2ca11
Merge branch 'main' into jaeger-ctx-pipe
MrAlias Apr 14, 2021
b867a22
Merge branch 'main' into jaeger-ctx-pipe
MrAlias Apr 16, 2021
8ca485d
Merge branch 'main' into jaeger-ctx-pipe
MrAlias Apr 17, 2021
7cf9043
Merge branch 'main' into jaeger-ctx-pipe
MrAlias Apr 17, 2021
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: 2 additions & 2 deletions exporters/trace/jaeger/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ func newAgentClientUDP(params agentClientUDPParams) (*agentClientUDP, error) {
}

// EmitBatch implements EmitBatch() of Agent interface
func (a *agentClientUDP) EmitBatch(batch *gen.Batch) error {
func (a *agentClientUDP) EmitBatch(ctx context.Context, batch *gen.Batch) error {
a.thriftBuffer.Reset()
if err := a.client.EmitBatch(context.Background(), batch); err != nil {
if err := a.client.EmitBatch(ctx, batch); err != nil {
return err
}
if a.thriftBuffer.Len() > a.maxPacketSize {
Expand Down
3 changes: 2 additions & 1 deletion exporters/trace/jaeger/jaeger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,8 @@ func (e *Exporter) Flush() {
func (e *Exporter) upload(spans []*sdktrace.SpanSnapshot) error {
batchList := jaegerBatchList(spans, e.defaultServiceName)
for _, batch := range batchList {
err := e.uploader.upload(batch)
// TODO (MrAlias): pass an appropriate context (#1799, #1803).
err := e.uploader.upload(context.TODO(), batch)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion exporters/trace/jaeger/jaeger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ type testCollectorEndpoint struct {
batchesUploaded []*gen.Batch
}

func (c *testCollectorEndpoint) upload(batch *gen.Batch) error {
func (c *testCollectorEndpoint) upload(_ context.Context, batch *gen.Batch) error {
c.batchesUploaded = append(c.batchesUploaded, batch)
return nil
}
Expand Down
10 changes: 5 additions & 5 deletions exporters/trace/jaeger/uploader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (

// batchUploader send a batch of spans to Jaeger
type batchUploader interface {
upload(batch *gen.Batch) error
upload(ctx context.Context, batch *gen.Batch) error
}

type EndpointOption func() (batchUploader, error)
Expand Down Expand Up @@ -187,8 +187,8 @@ type agentUploader struct {

var _ batchUploader = (*agentUploader)(nil)

func (a *agentUploader) upload(batch *gen.Batch) error {
return a.client.EmitBatch(batch)
func (a *agentUploader) upload(ctx context.Context, batch *gen.Batch) error {
return a.client.EmitBatch(ctx, batch)
}

// collectorUploader implements batchUploader interface sending batches to
Expand All @@ -202,12 +202,12 @@ type collectorUploader struct {

var _ batchUploader = (*collectorUploader)(nil)

func (c *collectorUploader) upload(batch *gen.Batch) error {
func (c *collectorUploader) upload(ctx context.Context, batch *gen.Batch) error {
body, err := serialize(batch)
if err != nil {
return err
}
req, err := http.NewRequest("POST", c.endpoint, body)
req, err := http.NewRequestWithContext(ctx, "POST", c.endpoint, body)
if err != nil {
return err
}
Expand Down