Skip to content

Commit 7b671b8

Browse files
authored
Fix context propagation for DisabledBatcher (#12231)
Finishes the implementation started in #12225 Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
1 parent 4ee2b50 commit 7b671b8

2 files changed

Lines changed: 27 additions & 2 deletions

File tree

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: exporterhelper
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Fix context propagation for DisabledBatcher
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [12231]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: [user]

exporter/internal/queue/disabled_batcher.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ func (qb *DisabledBatcher) Start(_ context.Context, _ component.Host) error {
3030
go func() {
3131
defer qb.stopWG.Done()
3232
for {
33-
_, req, done, ok := qb.queue.Read(context.Background())
33+
ctx, req, done, ok := qb.queue.Read(context.Background())
3434
if !ok {
3535
return
3636
}
37-
qb.flush(context.Background(), req, []exporterqueue.DoneCallback{done})
37+
qb.flush(ctx, req, []exporterqueue.DoneCallback{done})
3838
}
3939
}()
4040
return nil

0 commit comments

Comments
 (0)