Skip to content

[beatreceiver] Remove exception for packetbeat when setting shutdown_timeout #52275

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

Merged
khushijain21 merged 2 commits into from
Jul 30, 2026
+8 −32
Merged

[beatreceiver] Remove exception for packetbeat when setting shutdown_timeout #52275

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7f87f2
Remove exception for packetbeat when setting shutdown_timeout
khushijain21 Jul 27, 2026
e8d8550
fix test
khushijain21 Jul 30, 2026
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
20 changes: 8 additions & 12 deletions x-pack/libbeat/cmd/instance/beat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,18 +93,14 @@ func NewBeatForReceiver(settings instance.Settings, receiverConfig map[string]an
}

// Set the default shutdown timeout to 5s. The beat default is 1s, which can be too short for the otel pipeline.
// Packetbeat is excluded because its shutdown_timeout has different semantics.
// See https://github.com/elastic/beats/issues/52031
if b.Info.Beat != "packetbeat" {
switch beatSection := receiverConfig[b.Info.Beat].(type) {
case map[string]any:
if _, alreadySet := beatSection["shutdown_timeout"]; !alreadySet {
beatSection["shutdown_timeout"] = receiverPublisherCloseTimeout.String()
}
case nil:
receiverConfig[b.Info.Beat] = map[string]any{
"shutdown_timeout": receiverPublisherCloseTimeout.String(),
}
switch beatSection := receiverConfig[b.Info.Beat].(type) {
case map[string]any:
if _, alreadySet := beatSection["shutdown_timeout"]; !alreadySet {
beatSection["shutdown_timeout"] = receiverPublisherCloseTimeout.String()
}
case nil:
receiverConfig[b.Info.Beat] = map[string]any{
"shutdown_timeout": receiverPublisherCloseTimeout.String(),
}
}

Expand Down
Loading