From b083849f441e92594af2f8239a1d79047f1c4376 Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Fri, 26 Apr 2024 12:20:44 -0700 Subject: [PATCH 1/3] [receiver/kafka] Fix bug that was blocking shutdown --- .chloggen/kafkarec_fix_blocking_shutdown.yaml | 27 +++++++++++++++++++ receiver/kafkareceiver/kafka_receiver.go | 7 ++--- 2 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 .chloggen/kafkarec_fix_blocking_shutdown.yaml diff --git a/.chloggen/kafkarec_fix_blocking_shutdown.yaml b/.chloggen/kafkarec_fix_blocking_shutdown.yaml new file mode 100644 index 000000000000..13b3c19537b9 --- /dev/null +++ b/.chloggen/kafkarec_fix_blocking_shutdown.yaml @@ -0,0 +1,27 @@ +# 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. filelogreceiver) +component: kafkareceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix bug that was blocking shutdown + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [30789] + +# (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: + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# 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: [] diff --git a/receiver/kafkareceiver/kafka_receiver.go b/receiver/kafkareceiver/kafka_receiver.go index 6d4f43327c5b..0c45e6706ce7 100644 --- a/receiver/kafkareceiver/kafka_receiver.go +++ b/receiver/kafkareceiver/kafka_receiver.go @@ -5,6 +5,7 @@ package kafkareceiver // import "github.com/open-telemetry/opentelemetry-collect import ( "context" + "errors" "fmt" "strconv" "sync" @@ -126,8 +127,8 @@ func createKafkaClient(config Config) (sarama.ConsumerGroup, error) { return sarama.NewConsumerGroup(config.Brokers, config.GroupID, saramaConfig) } -func (c *kafkaTracesConsumer) Start(_ context.Context, _ component.Host) error { - ctx, cancel := context.WithCancel(context.Background()) +func (c *kafkaTracesConsumer) Start(ctx context.Context, _ component.Host) error { + ctx, cancel := context.WithCancel(ctx) c.cancelConsumeLoop = cancel obsrecv, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{ ReceiverID: c.settings.ID, @@ -160,7 +161,7 @@ func (c *kafkaTracesConsumer) Start(_ context.Context, _ component.Host) error { } } go func() { - if err := c.consumeLoop(ctx, consumerGroup); err != nil { + if err := c.consumeLoop(ctx, consumerGroup); !errors.Is(err, context.Canceled) { c.settings.ReportStatus(component.NewFatalErrorEvent(err)) } }() From 03c2aa98182627607c3854f75c4a7a436b052275 Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Mon, 29 Apr 2024 08:27:07 -0700 Subject: [PATCH 2/3] Update receiver/kafkareceiver/kafka_receiver.go --- receiver/kafkareceiver/kafka_receiver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/receiver/kafkareceiver/kafka_receiver.go b/receiver/kafkareceiver/kafka_receiver.go index 0c45e6706ce7..9f4a13326376 100644 --- a/receiver/kafkareceiver/kafka_receiver.go +++ b/receiver/kafkareceiver/kafka_receiver.go @@ -128,7 +128,7 @@ func createKafkaClient(config Config) (sarama.ConsumerGroup, error) { } func (c *kafkaTracesConsumer) Start(ctx context.Context, _ component.Host) error { - ctx, cancel := context.WithCancel(ctx) + ctx, cancel := context.WithCancel(context.Background()) c.cancelConsumeLoop = cancel obsrecv, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{ ReceiverID: c.settings.ID, From 9f396bbdd640946de28b94c5ab52d8656fffb4b2 Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Mon, 29 Apr 2024 08:27:12 -0700 Subject: [PATCH 3/3] Update receiver/kafkareceiver/kafka_receiver.go --- receiver/kafkareceiver/kafka_receiver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/receiver/kafkareceiver/kafka_receiver.go b/receiver/kafkareceiver/kafka_receiver.go index 9f4a13326376..2b5b29549183 100644 --- a/receiver/kafkareceiver/kafka_receiver.go +++ b/receiver/kafkareceiver/kafka_receiver.go @@ -127,7 +127,7 @@ func createKafkaClient(config Config) (sarama.ConsumerGroup, error) { return sarama.NewConsumerGroup(config.Brokers, config.GroupID, saramaConfig) } -func (c *kafkaTracesConsumer) Start(ctx context.Context, _ component.Host) error { +func (c *kafkaTracesConsumer) Start(_ context.Context, _ component.Host) error { ctx, cancel := context.WithCancel(context.Background()) c.cancelConsumeLoop = cancel obsrecv, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{