From 5929d8501d6b76f83281a719486d6e1b5a0e037a Mon Sep 17 00:00:00 2001 From: Paulo Janotti Date: Tue, 10 Dec 2024 10:10:38 -0800 Subject: [PATCH 1/3] Skip certain processes on Windows --- extension/sumologicextension/extension.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/extension/sumologicextension/extension.go b/extension/sumologicextension/extension.go index 1fd27cc04499..8313361374c2 100644 --- a/extension/sumologicextension/extension.go +++ b/extension/sumologicextension/extension.go @@ -15,6 +15,7 @@ import ( "net/http" "net/url" "os" + "runtime" "strings" "sync" "time" @@ -728,7 +729,7 @@ var sumoAppProcesses = map[string]string{ "sqlservr": "mssql", // linux SQL Server process } -func filteredProcessList() ([]string, error) { +func (se *SumologicExtension) filteredProcessList() ([]string, error) { var pl []string processes, err := process.Processes() @@ -739,6 +740,12 @@ func filteredProcessList() ([]string, error) { for _, v := range processes { e, err := v.Name() if err != nil { + if runtime.GOOS == "windows" { + // On Windows, we can't get some special process names, so we skip them. + se.logger.Warn("Failed to get executable name, skipping process", zap.Int32("pid", v.Pid), zap.Error(err)) + continue + } + return nil, fmt.Errorf("Error getting executable name: %w", err) } e = strings.ToLower(e) @@ -773,12 +780,12 @@ func filteredProcessList() ([]string, error) { return pl, nil } -func discoverTags() (map[string]any, error) { +func (se *SumologicExtension) discoverTags() (map[string]any, error) { t := map[string]any{ "sumo.disco.enabled": "true", } - pl, err := filteredProcessList() + pl, err := se.filteredProcessList() if err != nil { return t, err } @@ -814,7 +821,7 @@ func (se *SumologicExtension) updateMetadataWithHTTPClient(ctx context.Context, td := map[string]any{} if se.conf.DiscoverCollectorTags { - td, err = discoverTags() + td, err = se.discoverTags() if err != nil { return err } From ebe74e8e0a900278bd8d9908304c5b522cadd4c2 Mon Sep 17 00:00:00 2001 From: Paulo Janotti Date: Tue, 10 Dec 2024 10:35:43 -0800 Subject: [PATCH 2/3] Improve message and comment --- extension/sumologicextension/extension.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/extension/sumologicextension/extension.go b/extension/sumologicextension/extension.go index 8313361374c2..6c1681bb5643 100644 --- a/extension/sumologicextension/extension.go +++ b/extension/sumologicextension/extension.go @@ -741,8 +741,11 @@ func (se *SumologicExtension) filteredProcessList() ([]string, error) { e, err := v.Name() if err != nil { if runtime.GOOS == "windows" { - // On Windows, we can't get some special process names, so we skip them. - se.logger.Warn("Failed to get executable name, skipping process", zap.Int32("pid", v.Pid), zap.Error(err)) + // On Windows, if we can't get a process name, it is likely a zombie process, assume that and skip them. + se.logger.Warn( + "Failed to get executable name, it is likely a zombie process, skipping it", + zap.Int32("pid", v.Pid), + zap.Error(err)) continue } From c8d8633392e27aade36531744203b65254d0e4d8 Mon Sep 17 00:00:00 2001 From: Paulo Janotti Date: Tue, 10 Dec 2024 10:42:58 -0800 Subject: [PATCH 3/3] Add changelog --- ...ip_likely_zombie_processes_on_windows.yaml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .chloggen/sumologicextension_skip_likely_zombie_processes_on_windows.yaml diff --git a/.chloggen/sumologicextension_skip_likely_zombie_processes_on_windows.yaml b/.chloggen/sumologicextension_skip_likely_zombie_processes_on_windows.yaml new file mode 100644 index 000000000000..bb11e9b35400 --- /dev/null +++ b/.chloggen/sumologicextension_skip_likely_zombie_processes_on_windows.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: sumologicextension + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Skip likely zombie processes on Windows. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [36481] + +# (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: []