-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
2493b6e
commit b7080a2
Showing
17 changed files
with
149 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
exporter/exporterhelper/internal/batcher/merged_context.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package batcher // import "go.opentelemetry.io/collector/exporter/internal/queue" | ||
| import ( | ||
| "context" | ||
| "time" | ||
|
|
||
| "go.opentelemetry.io/otel/trace" | ||
| ) | ||
|
|
||
| type mergedContext struct { | ||
| deadline time.Time | ||
| deadlineOk bool | ||
| ctx context.Context | ||
| } | ||
|
|
||
| func NewMergedContext(ctx context.Context) mergedContext { | ||
| deadline, ok := ctx.Deadline() | ||
| return mergedContext{ | ||
| deadline: deadline, | ||
| deadlineOk: ok, | ||
| ctx: ctx, | ||
| } | ||
| } | ||
|
|
||
| // ContextWithSpan returns a copy of parent with span set as the current Span. | ||
| func (mc *mergedContext) Merge(other context.Context) mergedContext { | ||
| deadline, deadlineOk := mc.Deadline() | ||
| if otherDeadline, ok := other.Deadline(); ok { | ||
| deadlineOk = true | ||
| if deadline.Before(otherDeadline) { | ||
| deadline = otherDeadline | ||
| } | ||
| } | ||
| trace.SpanFromContext(other).AddLink(trace.LinkFromContext(mc.ctx)) | ||
| return mergedContext{ | ||
| deadline: deadline, | ||
| deadlineOk: deadlineOk, | ||
| ctx: mc.ctx, | ||
| } | ||
| } | ||
|
|
||
| func (mc mergedContext) Deadline() (time.Time, bool) { | ||
| return mc.deadline, mc.deadlineOk | ||
| } | ||
|
|
||
| func (mc mergedContext) Done() <-chan struct{} { | ||
| return nil | ||
| } | ||
|
|
||
| func (mc mergedContext) Err() error { | ||
| return nil | ||
| } | ||
|
|
||
| func (mc mergedContext) Value(key any) any { | ||
| return mc.ctx.Value(key) | ||
| } |
65 changes: 65 additions & 0 deletions
65
exporter/exporterhelper/internal/batcher/merged_context_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package batcher | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| "go.opentelemetry.io/collector/component/componenttest" | ||
| sdktrace "go.opentelemetry.io/otel/sdk/trace" | ||
| "go.opentelemetry.io/otel/trace" | ||
| ) | ||
|
|
||
| func TestMergedContextDeadline(t *testing.T) { | ||
| now := time.Now() | ||
| ctx1 := context.Background() | ||
| mergedContext := NewMergedContext(ctx1) | ||
|
|
||
| deadline, ok := mergedContext.Deadline() | ||
| require.False(t, ok) | ||
|
|
||
| ctx2, cancel2 := context.WithDeadline(context.Background(), now.Add(200)) | ||
| defer cancel2() | ||
| mergedContext = mergedContext.Merge(ctx2) | ||
|
|
||
| deadline, ok = mergedContext.Deadline() | ||
| require.True(t, ok) | ||
| require.Equal(t, now.Add(200), deadline) | ||
|
|
||
| ctx3, cancel3 := context.WithDeadline(context.Background(), now.Add(300)) | ||
| defer cancel3() | ||
| ctx4, cancel4 := context.WithDeadline(context.Background(), now.Add(100)) | ||
| defer cancel4() | ||
| mergedContext = mergedContext.Merge(ctx3) | ||
| mergedContext = mergedContext.Merge(ctx4) | ||
|
|
||
| deadline, ok = mergedContext.Deadline() | ||
| require.True(t, ok) | ||
| require.Equal(t, now.Add(300), deadline) | ||
| } | ||
|
|
||
| func TestMergedContextLink(t *testing.T) { | ||
| tracerProvider := componenttest.NewTelemetry().NewTelemetrySettings().TracerProvider | ||
| tracer := tracerProvider.Tracer("go.opentelemetry.io/collector/exporter/exporterhelper") | ||
|
|
||
| ctx1 := context.WithValue(context.Background(), "key", "value") | ||
| ctx2, span2 := tracer.Start(ctx1, "span2") | ||
|
|
||
| mergedContext := NewMergedContext(ctx2) | ||
| ctx3, span3 := tracer.Start(ctx1, "span3") | ||
| mergedContext = mergedContext.Merge(ctx3) | ||
| ctx4, span4 := tracer.Start(ctx1, "span3") | ||
| mergedContext = mergedContext.Merge(ctx4) | ||
|
|
||
| span2.AddEvent("This is an event.") | ||
|
|
||
| spanFromMergedContext := trace.SpanFromContext(mergedContext) | ||
| require.Equal(t, span2, spanFromMergedContext) | ||
|
|
||
| require.Equal(t, trace.SpanContextFromContext(ctx2), span3.(sdktrace.ReadOnlySpan).Links()[0].SpanContext) | ||
| require.Equal(t, trace.SpanContextFromContext(ctx2), span4.(sdktrace.ReadOnlySpan).Links()[0].SpanContext) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.