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

Create nil cgroups reader for processor, improve error handling #41198

Merged

Conversation

fearful-symmetry
Copy link
Contributor

@fearful-symmetry fearful-symmetry commented Oct 10, 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.

@fearful-symmetry fearful-symmetry self-assigned this Oct 10, 2024
@fearful-symmetry fearful-symmetry requested a review from a team as a code owner October 10, 2024 21:56
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 10, 2024
@fearful-symmetry fearful-symmetry added the Team:Security-Linux Platform Linux Platform Team in Security Solution label Oct 10, 2024
@elasticmachine
Copy link
Collaborator

Pinging @elastic/sec-linux-platform (Team:Security-Linux Platform)

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

mergify bot commented Oct 10, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @fearful-symmetry? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit

Copy link
Contributor

mergify bot commented Oct 10, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Oct 10, 2024
@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Oct 11, 2024
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@pierrehilbert pierrehilbert merged commit 764ba96 into elastic:main Oct 11, 2024
141 checks passed
mergify bot pushed a commit that referenced this pull request Oct 11, 2024
* 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
fearful-symmetry added a commit that referenced this pull request Oct 14, 2024
fearful-symmetry added a commit that referenced this pull request Oct 14, 2024
* create nil reader, improve error handling

* add test, clean up

* linter
pierrehilbert pushed a commit that referenced this pull request Oct 15, 2024
…ve error handling (#41205)

* Create nil cgroups reader for processor, improve error handling (#41198)

* 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

* Revert "Create nil cgroups reader for processor, improve error handling (#41198)"

This reverts commit 0b886fc.

* Create nil cgroups reader for processor, improve error handling (#41198)

* create nil reader, improve error handling

* add test, clean up

* linter

---------

Co-authored-by: Alex K <8418476+fearful-symmetry@users.noreply.github.com>
Co-authored-by: fearful-symmetry <alexpkristiansen@icloud.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.x Automated backport to the 8.x branch with mergify Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team Team:Security-Linux Platform Linux Platform Team in Security Solution
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants