Skip to content

Commit 4c4466f

Browse files
djaglowskilokesh.balla
authored andcommitted
[receiver/journald] Fix bug where failed startup could bury error message due to panic during shutdown (open-telemetry#31550)
Fixes open-telemetry#31476
1 parent 9d702f2 commit 4c4466f

File tree

2 files changed

+30
-1
lines changed

2 files changed

+30
-1
lines changed
Lines changed: 27 additions & 0 deletions
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: journaldreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Fix bug where failed startup could bury error message due to panic during shutdown
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: [31476]
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: []

pkg/stanza/operator/input/journald/journald.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,9 @@ func (operator *Input) parseJournalEntry(line []byte) (*entry.Entry, string, err
348348

349349
// Stop will stop generating logs.
350350
func (operator *Input) Stop() error {
351-
operator.cancel()
351+
if operator.cancel != nil {
352+
operator.cancel()
353+
}
352354
operator.wg.Wait()
353355
return nil
354356
}

0 commit comments

Comments
 (0)