From fe959e73da3d7c8686ed3a2651cb2d0f67a4ae66 Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Sun, 27 Oct 2024 19:28:26 +0530 Subject: [PATCH 1/3] [cmd/opampsupervisor]: do not log err when last received doesn't exist --- cmd/opampsupervisor/supervisor/supervisor.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/opampsupervisor/supervisor/supervisor.go b/cmd/opampsupervisor/supervisor/supervisor.go index 8d683e5b09b4..e9da882b867a 100644 --- a/cmd/opampsupervisor/supervisor/supervisor.go +++ b/cmd/opampsupervisor/supervisor/supervisor.go @@ -774,6 +774,8 @@ func (s *Supervisor) loadAndWriteInitialMergedConfig() error { } else { s.remoteConfig = config } + } else if errors.Is(err, os.ErrNotExist) { + s.logger.Info("No last received remote config found") } else { s.logger.Error("error while reading last received config", zap.Error(err)) } From 8fb14c75cc07995d09021d1f9675c8b5b81cfdd3 Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Thu, 31 Oct 2024 02:20:41 +0530 Subject: [PATCH 2/3] if-else to switch --- cmd/opampsupervisor/supervisor/supervisor.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/opampsupervisor/supervisor/supervisor.go b/cmd/opampsupervisor/supervisor/supervisor.go index e9da882b867a..43dd978b5f4e 100644 --- a/cmd/opampsupervisor/supervisor/supervisor.go +++ b/cmd/opampsupervisor/supervisor/supervisor.go @@ -766,7 +766,8 @@ func (s *Supervisor) loadAndWriteInitialMergedConfig() error { if s.config.Capabilities.AcceptsRemoteConfig { // Try to load the last received remote config if it exists. lastRecvRemoteConfig, err = os.ReadFile(filepath.Join(s.config.Storage.Directory, lastRecvRemoteConfigFile)) - if err == nil { + switch { + case err == nil: config := &protobufs.AgentRemoteConfig{} err = proto.Unmarshal(lastRecvRemoteConfig, config) if err != nil { @@ -774,9 +775,9 @@ func (s *Supervisor) loadAndWriteInitialMergedConfig() error { } else { s.remoteConfig = config } - } else if errors.Is(err, os.ErrNotExist) { + case errors.Is(err, os.ErrNotExist): s.logger.Info("No last received remote config found") - } else { + default: s.logger.Error("error while reading last received config", zap.Error(err)) } } else { From bc385613c5b57b834afc3302b2a210aa386cdcec Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Thu, 31 Oct 2024 02:23:48 +0530 Subject: [PATCH 3/3] Add CHANGELOG entry --- ...do_not_log_when_no_prev_config_exists.yaml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .chloggen/36014_do_not_log_when_no_prev_config_exists.yaml diff --git a/.chloggen/36014_do_not_log_when_no_prev_config_exists.yaml b/.chloggen/36014_do_not_log_when_no_prev_config_exists.yaml new file mode 100644 index 000000000000..3e203c92262c --- /dev/null +++ b/.chloggen/36014_do_not_log_when_no_prev_config_exists.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: cmd/opampsupervisor + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Do not log err if the last received doesn't exist + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [36013] + +# (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: []