Allow to ignore process arguments #1898
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
erthalion
force-pushed
the
feature/ignore-arguments
branch
3 times, most recently
from
b474823
to
330b1d4
Compare
Molter73
approved these changes
Oct 21, 2024
| @@ -52,6 +56,8 @@ class ProcessSignalFormatter : public ProtoSignalFormatter<sensor::SignalStreamM | |||
| const EventNames& event_names_; | |||
| std::unique_ptr<system_inspector::EventExtractor> event_extractor_; | |||
| ContainerMetadata container_metadata_; | |||
|
|
|||
| const CollectorConfig* config_; | |||
There was a problem hiding this comment.
Could we store this as a reference to make it clear it can never be null and it won't be reassigned? (at least for now).
Suggested change
| const CollectorConfig* config_; | |
| const CollectorConfig& config_; |
collector/lib/ProcessSignalHandler.h
Outdated
| @@ -34,6 +42,8 @@ class ProcessSignalHandler : public SignalHandler { | |||
| ProcessSignalFormatter formatter_; | |||
| system_inspector::Stats* stats_; | |||
| RateLimitCache rate_limiter_; | |||
|
|
|||
| const CollectorConfig* config_; | |||
Comment on lines
17
to
33
| class MockCollectorConfig : public CollectorConfig { | ||
| public: | ||
| MockCollectorConfig() = default; | ||
|
|
||
| void SetDisableProcessArguments(bool value) { | ||
| disable_process_arguments_ = value; | ||
| } | ||
| }; | ||
|
|
||
| class MockProcessSignalFormatter : public ProcessSignalFormatter { | ||
| public: | ||
| MockProcessSignalFormatter(sinsp* inspector, const CollectorConfig& config) : ProcessSignalFormatter(inspector, config) {}; | ||
|
|
||
| ProcessSignal* MockCreateProcessSignal(sinsp_evt* event) { | ||
| return CreateProcessSignal(event); | ||
| } | ||
| }; |
There was a problem hiding this comment.
Could we use FRIEND_TEST definitions here instead of mocks? Ideally, we would have an easy way to create a config object with any configuration we want without any of these methods, but for now, I think I prefer not having mocks when all we are using them for is access to private/protected fields, WDYT?
http://google.github.io/googletest/reference/testing.html#FRIEND_TEST
There was a problem hiding this comment.
Yeah, why not. It sorts of leaks tests details into the implementation, but it's not so bad.
Pass CollectorConfig to the ProcessSignalHandler and ProcessSignalFormatter. It's needed for the future work, involving conditional logic in the process handler.
erthalion
force-pushed
the
feature/ignore-arguments
branch
from
330b1d4
to
22a9998
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Add an internal option to not collect process arguments, as a workaround for ROX-25845.
Checklist
Automated testing
Testing Performed
Previous evaluation in the field with the debugging image.