Skip to content

Commit ea6cf95

Browse files
committed
[receiver/kafka] Use proper context for shutdown
1 parent 68f3d7d commit ea6cf95

File tree

2 files changed

+29
-2
lines changed

2 files changed

+29
-2
lines changed
+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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. filelogreceiver)
7+
component: receiver/kafka
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Fix issue where shutdown could hang indefinitely.
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [30789]
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+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

receiver/kafkareceiver/kafka_receiver.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ func createKafkaClient(config Config) (sarama.ConsumerGroup, error) {
157157
return sarama.NewConsumerGroup(config.Brokers, config.GroupID, saramaConfig)
158158
}
159159

160-
func (c *kafkaTracesConsumer) Start(_ context.Context, host component.Host) error {
161-
ctx, cancel := context.WithCancel(context.Background())
160+
func (c *kafkaTracesConsumer) Start(ctx context.Context, host component.Host) error {
161+
ctx, cancel := context.WithCancel(ctx)
162162
c.cancelConsumeLoop = cancel
163163
obsrecv, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{
164164
ReceiverID: c.settings.ID,

0 commit comments

Comments
 (0)