diff --git a/.chloggen/disabled-batcher-context.yaml b/.chloggen/disabled-batcher-context.yaml new file mode 100644 index 00000000000..79a6af80175 --- /dev/null +++ b/.chloggen/disabled-batcher-context.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: exporterhelper + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix context propagation for DisabledBatcher + +# One or more tracking issues or pull requests related to the change +issues: [12231] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [user] diff --git a/exporter/internal/queue/disabled_batcher.go b/exporter/internal/queue/disabled_batcher.go index f90dd6b4636..bd24f04f596 100644 --- a/exporter/internal/queue/disabled_batcher.go +++ b/exporter/internal/queue/disabled_batcher.go @@ -30,11 +30,11 @@ func (qb *DisabledBatcher) Start(_ context.Context, _ component.Host) error { go func() { defer qb.stopWG.Done() for { - _, req, done, ok := qb.queue.Read(context.Background()) + ctx, req, done, ok := qb.queue.Read(context.Background()) if !ok { return } - qb.flush(context.Background(), req, []exporterqueue.DoneCallback{done}) + qb.flush(ctx, req, []exporterqueue.DoneCallback{done}) } }() return nil