Skip to content

Commit de3b9c0

Browse files
authored
[receiver/activedirectoryds] Fix panic on Shutdown without corresponding Start call (#29505)
**Description:** The `activedirectorydsreceiver` is panicking when Shutdown is called without a previous call to Start. This can happen when some component fails to be created or started. **Link to tracking Issue:** Required for #28679 **Testing:** Ran test locally and `Run Windows` on my fork. **Documentation:** .chloggen for bug fix.
1 parent 506813e commit de3b9c0

File tree

3 files changed

+32
-1
lines changed

3 files changed

+32
-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: 'receiver/activedirectoryds'
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Fix shutdown of `activedirectorydsreceiver` when shutdown was called right after creation, without a corresponding start call.
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: [29505]
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/activedirectorydsreceiver/counters.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func (w *watchers) Scrape(name string) (float64, error) {
7070
}
7171

7272
func (w *watchers) Close() error {
73-
if w.closed {
73+
if w == nil || w.closed {
7474
return nil
7575
}
7676

receiver/activedirectorydsreceiver/factory_windows_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,9 @@ func TestCreateMetricsReceiver(t *testing.T) {
3939

4040
require.NoError(t, err)
4141
require.NotNil(t, recv)
42+
43+
// The receiver must be able to shutdown cleanly without a Start call.
44+
err = recv.Shutdown(context.Background())
45+
require.NoError(t, err)
4246
})
4347
}

0 commit comments

Comments
 (0)