From 80285596c899a2286babc05b9ac9d6cb60b5a8e7 Mon Sep 17 00:00:00 2001 From: Paulo Janotti Date: Sat, 25 Nov 2023 17:09:05 -0800 Subject: [PATCH 1/3] Receiver must not panic on Shutdown --- receiver/activedirectorydsreceiver/counters.go | 2 +- receiver/activedirectorydsreceiver/factory_windows_test.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/receiver/activedirectorydsreceiver/counters.go b/receiver/activedirectorydsreceiver/counters.go index 8c492ea1f95b..839487534ce9 100644 --- a/receiver/activedirectorydsreceiver/counters.go +++ b/receiver/activedirectorydsreceiver/counters.go @@ -70,7 +70,7 @@ func (w *watchers) Scrape(name string) (float64, error) { } func (w *watchers) Close() error { - if w.closed { + if w == nil || w.closed { return nil } diff --git a/receiver/activedirectorydsreceiver/factory_windows_test.go b/receiver/activedirectorydsreceiver/factory_windows_test.go index 277ce2652c33..58c0ce5befc0 100644 --- a/receiver/activedirectorydsreceiver/factory_windows_test.go +++ b/receiver/activedirectorydsreceiver/factory_windows_test.go @@ -39,5 +39,9 @@ func TestCreateMetricsReceiver(t *testing.T) { require.NoError(t, err) require.NotNil(t, recv) + + // The receiver must be able to shutdown cleanly without a Start call. + err = recv.Shutdown(context.Background()) + require.NoError(t, err) }) } From cb7bbefa72bbe48697bcd4c6f152d91717bf23fa Mon Sep 17 00:00:00 2001 From: Paulo Janotti Date: Sat, 25 Nov 2023 18:03:08 -0800 Subject: [PATCH 2/3] Add .chloggen --- ...torydsreceiver-shutdown-without-start.yaml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .chloggen/fix-activedirectorydsreceiver-shutdown-without-start.yaml diff --git a/.chloggen/fix-activedirectorydsreceiver-shutdown-without-start.yaml b/.chloggen/fix-activedirectorydsreceiver-shutdown-without-start.yaml new file mode 100644 index 000000000000..e742fe4ce36f --- /dev/null +++ b/.chloggen/fix-activedirectorydsreceiver-shutdown-without-start.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: 'receiver/activedirectoryds' + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix shutdown of `activedirectorydsreceiver` when shutdown was called right after creation, without a corresponding start call. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [TBD] + +# (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: [] From 0e476450c264af5acd117c2d4d269b2639af250b Mon Sep 17 00:00:00 2001 From: Paulo Janotti Date: Sat, 25 Nov 2023 19:22:09 -0800 Subject: [PATCH 3/3] Set PR number on .chloggen --- .../fix-activedirectorydsreceiver-shutdown-without-start.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.chloggen/fix-activedirectorydsreceiver-shutdown-without-start.yaml b/.chloggen/fix-activedirectorydsreceiver-shutdown-without-start.yaml index e742fe4ce36f..0af4327314a3 100644 --- a/.chloggen/fix-activedirectorydsreceiver-shutdown-without-start.yaml +++ b/.chloggen/fix-activedirectorydsreceiver-shutdown-without-start.yaml @@ -10,7 +10,7 @@ component: 'receiver/activedirectoryds' note: Fix shutdown of `activedirectorydsreceiver` when shutdown was called right after creation, without a corresponding start call. # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. -issues: [TBD] +issues: [29505] # (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.