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.

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.x](backport #41198) Create nil cgroups reader for processor, improve error handling #41205

Merged
merged 5 commits into from
Oct 15, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 11, 2024

Proposed commit message

Continuation of #41189 . This adds a NilCGReader type that makes us a little less likely to hit a nil pointer deref if this code is changed in the future, and also cleans up some of the error handling.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

This is an automatic backport of pull request #41198 done by [Mergify](https://mergify.com).

* create nil reader, improve error handling

* add test, clean up

* linter

(cherry picked from commit 764ba96)

# Conflicts:
#	filebeat/autodiscover/defaults_aix.go
#	libbeat/processors/add_docker_metadata/add_docker_metadata.go
#	libbeat/processors/add_process_metadata/add_process_metadata.go
#	libbeat/processors/add_process_metadata/add_process_metadata_test.go
#	libbeat/processors/add_process_metadata/gosigar_cid_provider.go
@mergify mergify bot requested a review from a team as a code owner October 11, 2024 15:27
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 11, 2024
@mergify mergify bot requested review from belimawr and leehinman and removed request for a team October 11, 2024 15:27
Copy link
Contributor Author

mergify bot commented Oct 11, 2024

Cherry-pick of 764ba96 has failed:

On branch mergify/bp/8.x/pr-41198
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit 764ba96d34.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   filebeat/autodiscover/defaults_aix.go
	both modified:   libbeat/processors/add_docker_metadata/add_docker_metadata.go
	both modified:   libbeat/processors/add_process_metadata/add_process_metadata.go
	both modified:   libbeat/processors/add_process_metadata/add_process_metadata_test.go
	both modified:   libbeat/processors/add_process_metadata/gosigar_cid_provider.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 11, 2024
@botelastic
Copy link

botelastic bot commented Oct 11, 2024

This pull request doesn't have a Team:<team> label.

@pierrehilbert
Copy link
Collaborator

@fearful-symmetry could you please fix the conflicts here?

Copy link
Contributor Author

mergify bot commented Oct 11, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.x/pr-41198 upstream/mergify/bp/8.x/pr-41198
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-41198

Copy link
Contributor Author

mergify bot commented Oct 14, 2024

This pull request has not been merged yet. Could you please review and merge it @fearful-symmetry? 🙏

@pierrehilbert pierrehilbert merged commit 017f613 into 8.x Oct 15, 2024
141 checks passed
@pierrehilbert pierrehilbert deleted the mergify/bp/8.x/pr-41198 branch October 15, 2024 06:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants