Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wait for the beat to exit during shutdown of beats receivers #42652

Merged
merged 1 commit into from
Feb 10, 2025
Merged

Wait for the beat to exit during shutdown of beats receivers #42652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions x-pack/filebeat/fbreceiver/receiver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package fbreceiver

import (
"context"
"sync"

"github.com/elastic/beats/v7/libbeat/beat"

Expand All @@ -17,10 +18,13 @@ type filebeatReceiver struct {
beat *beat.Beat
beater beat.Beater
logger *zap.Logger
wg sync.WaitGroup
}

func (fb *filebeatReceiver) Start(ctx context.Context, host component.Host) error {
fb.wg.Add(1)
go func() {
defer fb.wg.Done()
fb.logger.Info("starting filebeat receiver")
err := fb.beater.Run(fb.beat)
if err != nil {
Expand All @@ -33,5 +37,6 @@ func (fb *filebeatReceiver) Start(ctx context.Context, host component.Host) erro
func (fb *filebeatReceiver) Shutdown(ctx context.Context) error {
fb.logger.Info("stopping filebeat receiver")
fb.beater.Stop()
fb.wg.Wait()
return nil
}
5 changes: 5 additions & 0 deletions x-pack/metricbeat/mbreceiver/receiver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package mbreceiver

import (
"context"
"sync"

"github.com/elastic/beats/v7/libbeat/beat"

Expand All @@ -17,10 +18,13 @@ type metricbeatReceiver struct {
beat *beat.Beat
beater beat.Beater
logger *zap.Logger
wg sync.WaitGroup
}

func (mb *metricbeatReceiver) Start(ctx context.Context, host component.Host) error {
mb.wg.Add(1)
go func() {
defer mb.wg.Done()
mb.logger.Info("starting metricbeat receiver")
err := mb.beater.Run(mb.beat)
if err != nil {
Expand All @@ -33,5 +37,6 @@ func (mb *metricbeatReceiver) Start(ctx context.Context, host component.Host) er
func (mb *metricbeatReceiver) Shutdown(ctx context.Context) error {
mb.logger.Info("stopping metricbeat receiver")
mb.beater.Stop()
mb.wg.Wait()
return nil
}
Loading