Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.15](backport #5196) [pkg][fix] - Filter non-fatal errors and update go.mod #5261

Merged
merged 4 commits into from
Aug 9, 2024
Merged

[8.15](backport #5196) [pkg][fix] - Filter non-fatal errors and update go.mod #5261

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c048f8
[pkg][fix] - Filter non-fatal errors and update go.mod (#5196)
VihasMakwana Aug 6, 2024
30cf801
fix: merge conflice
VihasMakwana Aug 6, 2024
f75a7f8
fix: go mod tidy
VihasMakwana Aug 6, 2024
425e580
fix: notice
VihasMakwana Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1490,11 +1490,19 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l

--------------------------------------------------------------------------------
Dependency : github.com/elastic/elastic-agent-system-metrics
<<<<<<< HEAD
Version: v0.10.4
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/LICENSE.txt:
=======
Version: v0.11.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/LICENSE.txt:
>>>>>>> a1fd2c9d9a ([pkg][fix] - Filter non-fatal errors and update go.mod (#5196))

Apache License
Version 2.0, January 2004
Expand Down
4 changes: 4 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ require (
github.com/elastic/elastic-agent-autodiscover v0.8.1
github.com/elastic/elastic-agent-client/v7 v7.14.0
github.com/elastic/elastic-agent-libs v0.9.15
<<<<<<< HEAD
github.com/elastic/elastic-agent-system-metrics v0.10.4
=======
github.com/elastic/elastic-agent-system-metrics v0.11.0
>>>>>>> a1fd2c9d9a ([pkg][fix] - Filter non-fatal errors and update go.mod (#5196))
github.com/elastic/elastic-transport-go/v8 v8.6.0
github.com/elastic/go-elasticsearch/v8 v8.14.0
github.com/elastic/go-licenser v0.4.2
Expand Down
5 changes: 5 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,13 @@ github.com/elastic/elastic-agent-client/v7 v7.14.0 h1:X6S2RyjZNKsDCvA2igch2I5dgH
github.com/elastic/elastic-agent-client/v7 v7.14.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI=
github.com/elastic/elastic-agent-libs v0.9.15 h1:WCLtuErafUxczT/rXJa4Vr6mxwC8dgtqMbEq+qWGD4M=
github.com/elastic/elastic-agent-libs v0.9.15/go.mod h1:2VgYxHaeM+cCDBjiS2wbmTvzPGbnlXAtYrlcLefheS8=
<<<<<<< HEAD
github.com/elastic/elastic-agent-system-metrics v0.10.4 h1:Tmb1rPRDyVv9M453YlPyl/gwUm9s4nSiI2xH76GGEz4=
github.com/elastic/elastic-agent-system-metrics v0.10.4/go.mod h1:cd7YgcTEjBNeLGnH/C9cEvP/YexohwS6CpmN9Ju58Mw=
=======
github.com/elastic/elastic-agent-system-metrics v0.11.0 h1:/bWrgTsHZWLUhdT7WPNuQDFkrSfm+A4qf6QDQnZo9d8=
github.com/elastic/elastic-agent-system-metrics v0.11.0/go.mod h1:3QiMu9wTKJFvpCN+5klgGqasTMNKJbgY3xcoN1KQXJk=
>>>>>>> a1fd2c9d9a ([pkg][fix] - Filter non-fatal errors and update go.mod (#5196))
github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA=
github.com/elastic/elastic-transport-go/v8 v8.6.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
github.com/elastic/go-docappender/v2 v2.2.0 h1:Pq6w+R0ZbWlqZHoqzoujR2ElKBfaPUf3M/cJvPVSrfA=
Expand Down
2 changes: 1 addition & 1 deletion pkg/testing/fixture_install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ func getProcesses(t *gotesting.T, regex string) []runningProcess {
}

_, pids, err := procStats.FetchPids()
if !assert.NoError(t, err, "error fetching process information") {
if err != nil && assert.Truef(t, errors.Is(err, agentsystemprocess.NonFatalErr{}), "error fetching process information: %v", err) {
// we failed a bit further
return nil
}
Expand Down
4 changes: 3 additions & 1 deletion pkg/utils/watcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
package utils

import (
"errors"
"fmt"
"path/filepath"
"strings"
Expand All @@ -24,7 +25,8 @@ func GetWatcherPIDs() ([]int, error) {
return nil, fmt.Errorf("failed to initialize process.Stats: %w", err)
}
pidMap, _, err := procStats.FetchPids()
if err != nil {
if err != nil && !errors.Is(err, process.NonFatalErr{}) {
// return only if the error is fatal in nature
return nil, fmt.Errorf("failed to fetch pids: %w", err)
}
var pids []int
Expand Down
Loading