Skip to content

Commit

Permalink
Fix context propagation for DisabledBatcher (#12231)
Browse files Browse the repository at this point in the history
Finishes the implementation started in
#12225

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
  • Loading branch information
bogdandrutu authored Feb 1, 2025
1 parent 4ee2b50 commit 7b671b8
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 2 deletions.
25 changes: 25 additions & 0 deletions .chloggen/disabled-batcher-context.yaml
Original file line number Diff line number Diff line change
@@ -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]
4 changes: 2 additions & 2 deletions exporter/internal/queue/disabled_batcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7b671b8

Please sign in to comment.