refactor!: sidecars to inetrface

[mojtaba-esk]

Closes #431

Summary by CodeRabbit

• New Features

  • Introduced a new NetShaper component to manage network shaping configurations and interactions with the BitTwister sidecar, enhancing performance control.
  • Implemented comprehensive test suites for the NetShaper, Observability, and ReverseProxy components, improving validation and reliability.
  • Enhanced observability features with OpenTelemetry integration for better monitoring and tracing capabilities.

• Bug Fixes

  • Improved error handling with specific messages for various failure scenarios related to the BitTwister service and observability components.

• Documentation

  • Added documentation for the new NetShaper functionalities, observability features, and error types to facilitate user understanding.

• Refactor

  • Enhanced the architecture of tests and components for better encapsulation and maintainability while streamlining the Instance management process.

[coderabbitai]

Walkthrough

The changes significantly refactor the sidecar architecture by implementing interfaces to enhance modularity and clarity. A comprehensive test suite for the NetShaper sidecar ensures robust validation, while improved error handling and configuration management bolster reliability. This integration streamlines coordination with network management systems and paves the way for future sidecar enhancements.

Changes

Files	Change Summary
e2e/basic/reverse_proxy_test.go, e2e/netshaper/netshaper_test.go, e2e/netshaper/suite_setup_test.go	Added and modified tests to support the new netshaper sidecar, enhancing validation and robustness.
pkg/sidecars/netshaper/*	Introduced new helper functions and error handling mechanisms for managing network shaping configurations via NetShaper.
pkg/sidecars/netshaper/errors.go, pkg/sidecars/netshaper/helpers.go, pkg/sidecars/netshaper/netshaper.go	Established error types and methods for NetShaper, enhancing encapsulation and modularity in sidecar management.
.github/workflows/knuu_testing.yml	Updated workflow to change testing focus from BitTwister to NetShaper, adjusting timeout settings accordingly.
pkg/instance/*	Refactored instance management to utilize SidecarManager, improving overall structure and encapsulation.

Assessment against linked issues

Objective	Addressed	Explanation
Refactor sidecars to an interface (Issue #431)	✅
Enhance code structure and modularity with sidecars	✅
Implement better error handling for sidecar operations	✅
Ensure robust configuration management	✅
Maintain backward compatibility with existing functionalities	❌	Some previous functionalities are not preserved.

Poem

Hop along with joy and cheer,
Sidecars now are crystal clear!
With interfaces, oh what a sight,
Our codebase feels just right!
Error handling, oh so grand,
Let’s celebrate, a hop, a stand! 🐇✨

---

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

• X
• Mastodon
• Reddit
• LinkedIn

Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>.
  • Generate unit testing code for this file.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai generate unit testing code for this file.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai generate interesting stats about this repository and render them as a table.
  • @coderabbitai show all the console.log statements in this repository.
  • @coderabbitai read src/utils.ts and generate unit testing code.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configuration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.

[coderabbitai]

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 7d12d70 and 6714ba0.

Files selected for processing (5)

• e2e/basic/obsy_test.go (1 hunks)
• pkg/instance/instance.go (12 hunks)
• pkg/k8s/pod.go (4 hunks)
• pkg/sidecars/obsy/obsy.go (1 hunks)
• pkg/sidecars/obsy/otel.go (1 hunks)

Files skipped from review due to trivial changes (1)

• pkg/sidecars/obsy/obsy.go

Files skipped from review as they are similar to previous changes (2)

• e2e/basic/obsy_test.go
• pkg/sidecars/obsy/otel.go

Additional comments not posted (10)

pkg/k8s/pod.go (4)

Line range hint 555-555:
Verify the function call to preparePodSpec.

Ensure that the function call to preparePodSpec is correctly updated to handle sidecar containers appropriately.

Verification successful

---

The function call to preparePodSpec is correctly updated to handle sidecar containers.

• preparePodSpec is called within the preparePod function.
• The logic for handling sidecar containers is present and correctly implemented.

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the function call to `preparePodSpec`.

# Test: Search for the function usage. Expect: Correct function call with updated logic for sidecar containers.
rg --type go -A 5 $'preparePod'

Length of output: 2840

---

494-494: Verify the function call to buildContainerVolumes.

Ensure that the function call to buildContainerVolumes is correctly updated to include the new files parameter.

Verification successful

---

Verified: The function call to buildContainerVolumes is correctly updated to include the new files parameter.

• prepareContainer function correctly passes config.Name, config.Volumes, and config.Files to buildContainerVolumes.

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify that the function call to `buildContainerVolumes` is correctly updated.

# Test: Search for the function usage. Expect: Correct function call with the new parameter.
rg --type go -A 5 $'prepareContainer'

Length of output: 1110

---

Script:

#!/bin/bash
# Description: Verify the `buildContainerVolumes` function call within `prepareContainer`.

# Test: Search for the `buildContainerVolumes` function call within the `prepareContainer` function.
rg --type go -A 10 'func prepareContainer' pkg/k8s/pod.go

Length of output: 579

---

538-541: Verify the preparation and appending of sidecar containers.

Ensure that the sidecar containers are correctly prepared and appended to the pod spec.

Verification successful

---

Verified the preparation and appending of sidecar containers.

The prepareContainer and preparePodVolumes functions correctly prepare the sidecar container and volumes based on the provided configuration. The preparePodSpec function then appends the prepared sidecar container to the pod specification as expected.

• pkg/k8s/pod.go:
  • prepareContainer implementation: lines 487-501
  • preparePodVolumes implementation: lines 523-525

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the preparation and appending of sidecar containers.

# Test: Search for the function usage. Expect: Correct preparation and appending of sidecar containers.
rg --type go -A 5 $'preparePodSpec'

Length of output: 1010

---

Script:

#!/bin/bash
# Search for the implementation of the prepareContainer function
ast-grep --lang go --pattern 'func prepareContainer($_) $_'

# Search for the implementation of the preparePodVolumes function
ast-grep --lang go --pattern 'func preparePodVolumes($_) $_'

Length of output: 1250

---

Line range hint 366-398:
Verify the logic for handling file mounts.

The logic for handling file mounts appears to be correct, ensuring that file mounts do not conflict with volume mounts. However, it is crucial to verify that this logic is tested thoroughly.

pkg/instance/instance.go (6)

920-929: Verify the logic for verifying sidecar states.

Ensure that the function correctly verifies that all sidecars are in the state Committed or Stopped.

Verification successful

---

The logic for verifying sidecar states is correctly implemented.

The function verifySidecarsStates ensures that all sidecars are in either the Committed or Stopped state before proceeding. The usage of this function in the codebase confirms that it is correctly verifying the states of sidecars.

• pkg/instance/instance.go: Lines 920-929

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the logic for verifying sidecar states.

# Test: Search for the function usage. Expect: Correct verification of sidecar states.
rg --type go -A 5 $'verifySidecarsStates'

Length of output: 1049

---

1092-1092: Verify the logic for cloning instances.

Ensure that the function correctly clones the instance and its sidecars.

Verification successful

Verify the implementation of the CloneWithSuffix function in pkg/instance/helper.go.

Ensure that the function correctly clones the instance and its sidecars by reviewing the function's implementation.

---

The CloneWithSuffix function correctly clones instances and their sidecars.

The implementation in pkg/instance/helper.go ensures that the instance and its sidecars are properly cloned, with a deep copy of the security context and other relevant fields.

• pkg/instance/helper.go:375-412

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the logic for cloning instances.

# Test: Search for the function usage. Expect: Correct cloning of instances and sidecars.
rg --type go -A 5 $'Clone'

Length of output: 10343

---

Script:

#!/bin/bash
# Description: Verify the implementation of the `CloneWithSuffix` function in `pkg/instance/helper.go`.

# Search for the implementation of the `CloneWithSuffix` function in the `pkg/instance/helper.go` file.
ast-grep --lang go --pattern 'func (i *Instance) CloneWithSuffix(suffix string) *Instance' pkg/instance/helper.go

Length of output: 2513

---

931-947: Verify the logic for deploying resources for committed state.

Ensure that the function correctly handles resource deployment for both instances and sidecars.

Verification successful

---

The function deployResourcesForCommittedState correctly handles resource deployment for both instances and sidecars.

The implementations of the PreStart and Instance methods in various sidecar types confirm that the function logic is sound and handles the required operations appropriately.

• deployResources method in Instance is implemented in pkg/instance/helper.go.
• applyFunctionToSidecars function is implemented in pkg/instance/helper.go.
• PreStart methods are implemented in sidecar types like Tshark, Obsy, and BitTwister.
• Instance methods are implemented in sidecar types like Tshark, Obsy, and BitTwister.

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the logic for deploying resources for committed state.

# Test: Search for the function usage. Expect: Correct handling of resource deployment for instances and sidecars.
rg --type go -A 5 $'deployResourcesForCommittedState'

Length of output: 999

---

Script:

#!/bin/bash
# Description: Gather information about the implementations related to deployResourcesForCommittedState.

# Search for the implementation of deployResources method in Instance
ast-grep --lang go --pattern $'func (i *Instance) deployResources($_) $_' 

# Search for the implementation of applyFunctionToSidecars
rg --type go 'applyFunctionToSidecars'

# Search for the implementation of PreStart method in SidecarManager
ast-grep --lang go --pattern $'func (sc SidecarManager) PreStart($_) $_'

# Search for the implementation of deployResources method in Instance
ast-grep --lang go --pattern $'func (sc SidecarManager) Instance() $_'

Length of output: 2650

---

Script:

#!/bin/bash
# Description: Gather information about the implementations of PreStart and Instance methods in SidecarManager.

# Search for the implementation of PreStart method in SidecarManager
ast-grep --lang go --pattern $'func (sc SidecarManager) PreStart($_) $_'

# Search for the implementation of Instance method in SidecarManager
ast-grep --lang go --pattern $'func (sc SidecarManager) Instance() $_'

Length of output: 145

---

Script:

#!/bin/bash
# Description: Broaden the search to locate PreStart and Instance methods in the codebase.

# Search for the definition of PreStart method
rg --type go 'PreStart'

# Search for the definition of Instance method
rg --type go 'Instance'

Length of output: 53877

---

885-912: Verify the incorporation of verifySidecarsStates.

Ensure that the function correctly incorporates the verifySidecarsStates method and handles sidecar readiness appropriately.

---

1111-1111: Verify the logic for cloning instances with a given name.

Ensure that the function correctly clones the instance with the given name and its sidecars.

Verification successful

Verify the implementation of CloneWithName in pkg/instance/instance.go.

Ensure that the function correctly handles the cloning logic, including sidecars.

---

Verify the implementation of CloneWithSuffix method to ensure sidecars are cloned.

Ensure that the CloneWithSuffix method correctly handles the cloning of sidecars.

---

The CloneWithName method correctly clones instances with the given name and sidecars.

• The CloneWithSuffix method, which is used in CloneWithName, ensures that sidecars are cloned properly.

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the logic for cloning instances with a given name.

# Test: Search for the function usage. Expect: Correct cloning of instances with a given name and sidecars.
rg --type go -A 5 $'CloneWithName'

Length of output: 4104

---

Script:

#!/bin/bash
# Description: Verify the implementation of CloneWithName in pkg/instance/instance.go.

# Test: Search for the complete implementation of CloneWithName. Expect: Correct handling of cloning logic, including sidecars.
ast-grep --lang go --pattern $'func (i *Instance) CloneWithName(name string) (*Instance, error) {
  $$$
}' --search pkg/instance/instance.go

Length of output: 341

---

Script:

#!/bin/bash
# Description: Verify the implementation of CloneWithName in pkg/instance/instance.go.

# Test: Search for the complete implementation of CloneWithName. Expect: Correct handling of cloning logic, including sidecars.
ast-grep --lang go --pattern $'func (i *Instance) CloneWithName(name string) (*Instance, error) {
  $$$
}' pkg/instance/instance.go

Length of output: 1066

---

Script:

#!/bin/bash
# Description: Verify the implementation of CloneWithSuffix method to ensure sidecars are cloned.

# Test: Search for the complete implementation of CloneWithSuffix. Expect: Correct handling of cloning sidecars.
ast-grep --lang go --pattern $'func (i *Instance) CloneWithSuffix(suffix string) *Instance {
  $$$
}' pkg/instance/instance.go

Length of output: 127

---

Script:

#!/bin/bash
# Description: Verify the implementation of CloneWithSuffix method to ensure sidecars are cloned.

# Test: Search for the complete implementation of CloneWithSuffix. Expect: Correct handling of cloning sidecars.
ast-grep --lang go --pattern $'func (i *Instance) CloneWithSuffix(suffix string) *Instance {
  $$$
}'

Length of output: 2576

---

798-823: Verify the logic for adding sidecars.

Ensure that the function correctly handles the new SidecarManager type and performs the necessary checks to validate the sidecar instance.

Verification successful

Verify the SidecarManager interface and its methods.

Ensure that the SidecarManager interface and its methods (Initialize and Instance) are correctly implemented and used.

---

Verify the SidecarManager interface and its methods.

Ensure that the SidecarManager interface and its methods (Initialize and Instance) are correctly implemented and used.

---

Verified: The AddSidecar function correctly handles the SidecarManager type and performs the necessary checks.

• The SidecarManager interface and its methods (Initialize and Instance) are correctly implemented and used in the AddSidecar function.

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the logic for adding sidecars.

# Test: Search for the function usage. Expect: Correct handling of the new `SidecarManager` type.
rg --type go -A 5 $'AddSidecar'

Length of output: 4573

---

Script:

#!/bin/bash
# Description: Verify the `SidecarManager` interface and its methods.

# Search for the definition of the `SidecarManager` interface.
rg --type go 'type SidecarManager interface'

# Search for the implementation of the `Initialize` method.
rg --type go 'func (.*) Initialize(ctx context.Context, sysDeps system.SystemDependencies) error'

# Search for the implementation of the `Instance` method.
rg --type go 'func (.*) Instance()'

Length of output: 1157

---

Script:

#!/bin/bash
# Description: Retrieve the definition of the `SidecarManager` interface and the implementations of the `Initialize` and `Instance` methods.

# Print the definition of the `SidecarManager` interface.
rg --type go -A 10 'type SidecarManager interface' pkg/instance/sidecar.go

# Print the implementation of the `Initialize` method in the relevant files.
rg --type go -A 10 'func (.*) Initialize(ctx context.Context, sysDeps system.SystemDependencies) error' pkg/sidecars/tshark/tshark.go pkg/sidecars/obsy/obsy.go pkg/sidecars/bittwister/bittwister.go

# Print the implementation of the `Instance` method in the relevant files.
rg --type go -A 5 'func (.*) Instance()' pkg/sidecars/tshark/tshark.go pkg/sidecars/obsy/obsy.go pkg/sidecars/bittwister/bittwister.go

Length of output: 1700

[coderabbitai]

Actionable comments posted: 0

Outside diff range, codebase verification and nitpick comments (1)

pkg/sidecars/netshaper/netshaper_test.go (1)

74-76: TestPreStart Method Skipped

The TestPreStart method is skipped as it is tested in end-to-end tests. Ensure that this is documented and the end-to-end tests cover all scenarios.

Consider adding a comment to reference the end-to-end tests that cover this method.

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 6714ba0 and d6fba55.

Files selected for processing (8)

• e2e/basic/reverse_proxy_test.go (3 hunks)
• e2e/netshaper/netshaper_test.go (18 hunks)
• e2e/netshaper/suite_setup_test.go (1 hunks)
• go.mod (2 hunks)
• pkg/sidecars/netshaper/errors.go (1 hunks)
• pkg/sidecars/netshaper/helpers.go (1 hunks)
• pkg/sidecars/netshaper/netshaper.go (1 hunks)
• pkg/sidecars/netshaper/netshaper_test.go (1 hunks)

Files skipped from review due to trivial changes (1)

• e2e/netshaper/suite_setup_test.go

Files skipped from review as they are similar to previous changes (1)

• e2e/basic/reverse_proxy_test.go

Additional comments not posted (44)

pkg/sidecars/netshaper/errors.go (3)

1-5: LGTM!

The package and import statements are correct.

---

7-7: LGTM!

The alias for errors.Error is correctly defined.

---

9-30: LGTM!

The error messages are well-defined and consistent.

pkg/sidecars/netshaper/netshaper.go (9)

1-12: LGTM!

The package and import statements are correct.

---

14-23: LGTM!

The constants are well-defined and appropriately named.

---

25-31: LGTM!

The NetShaper struct is well-defined.

---

33-33: LGTM!

The interface implementation check is correctly defined.

---

35-41: LGTM!

The New function is correctly defined.

---

43-80: Ensure proper error handling for Initialize method.

The Initialize method is well-structured, but ensure that all errors are properly logged or handled in the calling code.

---

82-97: LGTM!

The PreStart method is correctly defined.

---

99-101: LGTM!

The Instance method is correctly defined.

---

103-110: LGTM!

The CloneWithSuffix method is correctly defined.

pkg/sidecars/netshaper/helpers.go (11)

1-9: LGTM!

The package and import statements are correct.

---

11-14: LGTM!

The setNewClientByURL method is correctly defined.

---

16-18: LGTM!

The SetPort method is correctly defined.

---

20-22: LGTM!

The SetImage method is correctly defined.

---

24-26: LGTM!

The SetNetworkInterface method is correctly defined.

---

28-46: Ensure proper error handling for SetBandwidthLimit method.

The SetBandwidthLimit method is well-structured, but ensure that all errors are properly logged or handled in the calling code.

---

48-66: Ensure proper error handling for SetLatencyAndJitter method.

The SetLatencyAndJitter method is well-structured, but ensure that all errors are properly logged or handled in the calling code.

---

68-85: Ensure proper error handling for SetPacketLoss method.

The SetPacketLoss method is well-structured, but ensure that all errors are properly logged or handled in the calling code.

---

87-105: Ensure proper error handling for WaitForStart method.

The WaitForStart method is well-structured, but ensure that all errors are properly logged or handled in the calling code.

---

107-112: LGTM!

The AllServicesStatus method is correctly defined.

---

114-137: Ensure proper error handling for stopIfRunning method.

The stopIfRunning method is well-structured, but ensure that all errors are properly logged or handled in the calling code.

go.mod (2)

13-13: Dependency Update: Verify Compatibility with gopkg.in/yaml.v2

The dependency for gopkg.in/yaml.v2 has been updated to version v2.4.0. Ensure that all usages of this library are compatible with this version.

Verification successful

---

Dependency Update: Verify Compatibility with gopkg.in/yaml.v2

The usage of the yaml.Marshal function from gopkg.in/yaml.v2 in pkg/sidecars/obsy/obsy.go appears to be compatible with version v2.4.0. There are no breaking changes in the yaml.Marshal function that would affect this usage.

• pkg/sidecars/obsy/obsy.go: Usage of yaml.Marshal function.

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify compatibility of `gopkg.in/yaml.v2` version `v2.4.0`.

# Test: Search for usages of `gopkg.in/yaml.v2`. Expect: No breaking changes.
rg --type go -A 5 $'gopkg.in/yaml.v2'

Length of output: 341

---

Script:

#!/bin/bash
# Description: Extract and review usages of `gopkg.in/yaml.v2` in `pkg/sidecars/obsy/obsy.go`.

# Extract lines where `yaml` package functions/methods are used.
rg 'yaml\.' pkg/sidecars/obsy/obsy.go -A 5

Length of output: 399

---

95-95: Dependency Update: Verify Compatibility with gopkg.in/yaml.v3

The dependency for gopkg.in/yaml.v3 has been updated to version v3.0.1. Ensure that all usages of this library are compatible with this version.

pkg/sidecars/netshaper/netshaper_test.go (14)

1-2: Ensure Package Naming Consistency

Ensure that the package name netshaper is consistent with the rest of the project and adheres to naming conventions.

---

3-15: Imports Look Good

The imports include necessary packages for testing and dependencies. Ensure that all imported packages are used in the code.

---

17-23: TestSuite Struct Initialization

The TestSuite struct is well-defined and includes necessary fields for the tests. Ensure that all fields are correctly initialized in the SetupTest method.

---

25-48: SetupTest Method Initialization

The SetupTest method initializes the test suite correctly, including setting up a mock server. Ensure that the mock server's behavior aligns with the test requirements.

---

50-52: TearDownTest Method Cleanup

The TearDownTest method correctly closes the mock server. Ensure that any additional resources are also cleaned up.

---

54-56: Test Suite Runner

The TestBitTwisterTestSuite function runs the test suite using testify/suite. This is a good practice for organizing tests.

---

58-64: TestNew Method

The TestNew method tests the initialization of the NetShaper instance. Ensure that all default values are correctly asserted.

---

66-72: TestInitialize Method

The TestInitialize method tests the initialization process of the NetShaper instance. Ensure that all necessary assertions are covered.

---

78-93: TestCloneWithSuffix Method

The TestCloneWithSuffix method tests the cloning functionality of the NetShaper instance. Ensure that all relevant fields are correctly cloned.

---

95-104: TestSetters Method

The TestSetters method tests the setter methods of the NetShaper instance. Ensure that all setter methods are covered and correctly asserted.

---

106-131: TestSetBandwidthLimit Method

The TestSetBandwidthLimit method tests the bandwidth limit setting functionality. Ensure that all test cases are covered, including error scenarios.

---

133-159: TestSetLatencyAndJitter Method

The TestSetLatencyAndJitter method tests the latency and jitter setting functionality. Ensure that all test cases are covered, including error scenarios.

---

161-186: TestSetPacketLoss Method

The TestSetPacketLoss method tests the packet loss setting functionality. Ensure that all test cases are covered, including error scenarios.

---

188-210: TestWaitForStart Method

The TestWaitForStart method tests the start waiting functionality. Ensure that all test cases are covered, including error scenarios.

e2e/netshaper/netshaper_test.go (5)

Line range hint 1-13:
Ensure Package Naming Consistency

Ensure that the package name netshaper is consistent with the rest of the project and adheres to naming conventions.

---

Line range hint 22-93:
TestNetShaperBandwidth Method

The TestNetShaperBandwidth method tests the bandwidth limit functionality of the NetShaper sidecar. Ensure that all test cases are covered, including setup, execution, and teardown.

---

Line range hint 127-199:
TestNetShaperPacketloss Method

The TestNetShaperPacketloss method tests the packet loss functionality of the NetShaper sidecar. Ensure that all test cases are covered, including setup, execution, and teardown.

---

Line range hint 230-307:
TestNetShaperLatency Method

The TestNetShaperLatency method tests the latency functionality of the NetShaper sidecar. Ensure that all test cases are covered, including setup, execution, and teardown.

---

Line range hint 340-411:
TestNetShaperJitter Method

The TestNetShaperJitter method tests the jitter functionality of the NetShaper sidecar. Ensure that all test cases are covered, including setup, execution, and teardown.

[coderabbitai]

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between d6fba55 and a3964b5.

Files selected for processing (1)

• .github/workflows/knuu_testing.yml (1 hunks)

Additional comments not posted (1)

.github/workflows/knuu_testing.yml (1)

22-22: Verify the new package path and timeout settings.

The package path has been changed to ./e2e/netshaper with a timeout of 60 minutes. Ensure that the ./e2e/netshaper package exists and that the extended timeout is justified.

Verification successful

Verify the overall workflow configuration and timeout setting.

The directory ./e2e/netshaper exists. Now, ensure the overall workflow configuration is correct and verify if the timeout setting of 60 minutes is justified.

---

Verification successful.

• The directory ./e2e/netshaper exists.
• The timeout setting is correctly set to 60 minutes.
• The overall workflow configuration appears to be correct.

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the existence of the `./e2e/netshaper` package and ensure the timeout is appropriate.

# Test: Check if the `./e2e/netshaper` directory exists. Expect: Directory exists.
if [ -d "./e2e/netshaper" ]; then
  echo "Directory ./e2e/netshaper exists."
else
  echo "Directory ./e2e/netshaper does not exist."
  exit 1
fi

Length of output: 105

---

Script:

#!/bin/bash
# Description: Verify the overall workflow configuration and check for timeout settings.

# Test: Check if the timeout setting is present and correctly set to 60 minutes.
grep -A 5 'pkg: "./e2e/netshaper"' .github/workflows/knuu_testing.yml

Length of output: 201

[coderabbitai]

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between a3964b5 and 7cff253.

Files selected for processing (7)

• e2e/netshaper/suite_setup_test.go (1 hunks)
• e2e/tshark/tshark_test.go (3 hunks)
• go.mod (2 hunks)
• pkg/instance/errors.go (1 hunks)
• pkg/instance/helper.go (4 hunks)
• pkg/instance/instance.go (12 hunks)
• pkg/knuu/instance_old.go (2 hunks)

Files skipped from review due to trivial changes (1)

• e2e/netshaper/suite_setup_test.go

Files skipped from review as they are similar to previous changes (6)

• e2e/tshark/tshark_test.go
• go.mod
• pkg/instance/errors.go
• pkg/instance/helper.go
• pkg/instance/instance.go
• pkg/knuu/instance_old.go

[coderabbitai]

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 7cff253 and 45b02d9.

Files selected for processing (7)

• e2e/basic/observability_test.go (1 hunks)
• pkg/instance/instance.go (12 hunks)
• pkg/sidecars/observability/errors.go (1 hunks)
• pkg/sidecars/observability/helpers.go (1 hunks)
• pkg/sidecars/observability/obsy.go (1 hunks)
• pkg/sidecars/observability/obsy_test.go (1 hunks)
• pkg/sidecars/observability/otel.go (1 hunks)

Files skipped from review as they are similar to previous changes (1)

• pkg/instance/instance.go

Additional comments not posted (44)

pkg/sidecars/observability/errors.go (13)

10-10: Clear and descriptive error message.

The error message "error creating otel agent instance" is clear and descriptive.

---

11-11: Clear and descriptive error message.

The error message "error setting image for otel agent instance" is clear and descriptive.

---

12-12: Clear and descriptive error message.

The error message "error adding Otel Agent port" is clear and descriptive.

---

13-13: Clear and descriptive error message.

The error message "error committing otel agent instance" is clear and descriptive.

---

14-14: Clear and descriptive error message.

The error message "error setting environment variable for otel agent instance" is clear and descriptive.

---

15-15: Clear and descriptive error message.

The error message "error setting CPU for otel agent instance" is clear and descriptive.

---

16-16: Clear and descriptive error message.

The error message "error setting memory for otel agent instance" is clear and descriptive.

---

17-17: Clear and descriptive error message.

The error message "error marshaling yaml" is clear and descriptive.

---

18-18: Clear and descriptive error message.

The error message "error adding otel agent config file" is clear and descriptive.

---

19-19: Clear and descriptive error message.

The error message "error setting otel agent command" is clear and descriptive.

---

20-20: Clear and descriptive error message.

The error message "obsy instance not initialized" is clear and descriptive.

---

21-21: Clear and descriptive error message.

The error message "setting %s is only allowed in state 'None'. Current state is '%s'" is clear and descriptive.

---

22-22: Clear and descriptive error message.

The error message "error adding volume" is clear and descriptive.

pkg/sidecars/observability/helpers.go (10)

7-9: LGTM!

The function correctly sets the image for the Obsy instance.

---

11-18: LGTM!

The function correctly sets the OpenTelemetry collector version and handles errors appropriately.

---

20-27: LGTM!

The function correctly sets the OpenTelemetry endpoint and handles errors appropriately.

---

29-38: LGTM!

The function correctly sets the Prometheus endpoint and handles errors appropriately.

---

40-49: LGTM!

The function correctly sets the Jaeger endpoint and handles errors appropriately.

---

51-60: LGTM!

The function correctly sets the OTLP exporter and handles errors appropriately.

---

62-69: LGTM!

The function correctly sets the Jaeger exporter and handles errors appropriately.

---

71-78: LGTM!

The function correctly sets the Prometheus exporter and handles errors appropriately.

---

80-87: LGTM!

The function correctly sets the Prometheus remote write exporter and handles errors appropriately.

---

89-94: LGTM!

The function correctly validates the state for the Obsy instance and handles errors appropriately.

pkg/sidecars/observability/obsy_test.go (7)

19-21: LGTM!

The function correctly initializes the test suite for the Obsy struct.

---

32-40: LGTM!

The function correctly sets up the test environment for the Obsy struct.

---

42-46: LGTM!

The function correctly tests the creation of a new Obsy instance.

---

48-54: LGTM!

The function correctly tests the initialization of the Obsy instance.

---

56-58: LGTM!

The function is correctly marked as skipped as it is tested in e2e tests.

---

60-71: LGTM!

The function correctly tests the cloning of the Obsy instance with a suffix.

---

73-105: LGTM!

The function correctly tests the setter methods for the Obsy instance.

e2e/basic/observability_test.go (5)

59-119: Verify observability sidecar setup and target pod configuration.

Ensure that the observability sidecar is set up correctly and the target pod is configured appropriately.

Verification successful

Verify observability sidecar setup and target pod configuration.

Ensure that the observability sidecar is set up correctly and the target pod is configured appropriately.

---

Verified observability sidecar setup and target pod configuration.

The observability sidecar is set up correctly, and the target pod is configured appropriately.

• Observability sidecar setup: SetOtelEndpoint, SetPrometheusEndpoint, SetJaegerEndpoint, SetOtlpExporter
• Target pod configuration: SetImage, SetCommand, AddSidecar, Commit, Start

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify observability sidecar setup and target pod configuration in `TestObservabilityCollector`.

# Test: Search for observability sidecar setup and target pod configuration. Expect: The sidecar should be set up correctly and the target pod configured appropriately.
rg --type go --file e2e/basic/observability_test.go 'observabilitySidecar.SetOtelEndpoint|observabilitySidecar.SetPrometheusEndpoint|observabilitySidecar.SetJaegerEndpoint|observabilitySidecar.SetOtlpExporter|target.SetImage|target.SetCommand|target.AddSidecar|target.Commit|target.Start'

Length of output: 5138

---

Script:

#!/bin/bash
# Description: Verify observability sidecar setup and target pod configuration in `TestObservabilityCollector`.

# Test: Search for observability sidecar setup and target pod configuration. Expect: The sidecar should be set up correctly and the target pod configured appropriately.
rg --type go 'observabilitySidecar.SetOtelEndpoint|observabilitySidecar.SetPrometheusEndpoint|observabilitySidecar.SetJaegerEndpoint|observabilitySidecar.SetOtlpExporter|target.SetImage|target.SetCommand|target.AddSidecar|target.Commit|target.Start' e2e/basic/observability_test.go

Length of output: 994

---

32-57: Verify Prometheus setup and configuration.

Ensure that Prometheus is set up correctly and the configuration file is appropriate.

Verification successful

Verify Prometheus setup and configuration.

Ensure that Prometheus is set up correctly and the configuration file is appropriate.

---

Verified: Prometheus setup and configuration are correct.

The Prometheus setup and configuration in the provided code snippet are appropriately implemented, with necessary error checks in place.

• prometheus.SetImage(prometheusImage)
• prometheus.AddPortTCP(prometheusPort)
• prometheus.AddHost(prometheusPort)
• prometheus.Commit()
• prometheus.AddFileBytes([]byte(prometheusConfigContent), prometheusConfig, "0:0")
• prometheus.SetArgs(prometheusArgs)
• prometheus.Start()

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify Prometheus setup and configuration in `TestObservabilityCollector`.

# Test: Search for Prometheus setup and configuration. Expect: Prometheus should be set up correctly with the appropriate configuration file.
rg --type go --file e2e/basic/observability_test.go 'prometheus.SetImage|prometheus.AddPortTCP|prometheus.AddHost|prometheus.Commit|prometheus.AddFileBytes|prometheus.SetArgs|prometheus.Start'

Length of output: 5042

---

Script:

#!/bin/bash
# Description: Verify Prometheus setup and configuration in `TestObservabilityCollector`.

# Test: Search for Prometheus setup and configuration. Expect: Prometheus should be set up correctly with the appropriate configuration file.
rg --type go 'prometheus.SetImage|prometheus.AddPortTCP|prometheus.AddHost|prometheus.Commit|prometheus.AddFileBytes|prometheus.SetArgs|prometheus.Start' e2e/basic/observability_test.go

Length of output: 607

---

28-120: Ensure proper error handling and cleanup.

The function sets up and tests the observability collector. Ensure that all errors are handled appropriately and resources are cleaned up.

Verification successful

---

Ensure proper error handling and cleanup.

The function TestObservabilityCollector appropriately handles errors using require.NoError and ensures resource cleanup with t.Cleanup.

• Error handling is implemented at several points using require.NoError.
• Resource cleanup is managed using t.Cleanup.

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify error handling and cleanup in `TestObservabilityCollector`.

# Test: Search for error handling and cleanup. Expect: All errors should be handled and resources cleaned up.
rg --type go --file e2e/basic/observability_test.go 'require.NoError|t.Cleanup'

Length of output: 4929

---

Script:

#!/bin/bash
# Description: Verify error handling and cleanup in `TestObservabilityCollector`.

# Test: Search for error handling and cleanup. Expect: All errors should be handled and resources cleaned up.
rg 'require.NoError|t.Cleanup' e2e/basic/observability_test.go

Length of output: 1217

---

1-16: Ensure all imported packages are necessary.

Verify that all imported packages are utilized within the file to avoid unnecessary dependencies.

Verification successful

---

All imported packages are necessary and used.

The verification confirms that all imported packages in e2e/basic/observability_test.go are utilized within the file, ensuring no unnecessary dependencies.

• context
• fmt
• io/ioutil
• net/http
• os
• testing
• time
• github.com/stretchr/testify/require
• github.com/celestiaorg/knuu/pkg/knuu
• github.com/celestiaorg/knuu/pkg/sidecars/observability

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the usage of imported packages in `e2e/basic/observability_test.go`.

# Test: Search for the usage of each imported package. Expect: All imported packages should be used.
rg --type go --file e2e/basic/observability_test.go 'context|fmt|ioutil|net/http|os|testing|time|github.com/stretchr/testify/require|github.com/celestiaorg/knuu/pkg/knuu|github.com/celestiaorg/knuu/pkg/sidecars/observability'

Length of output: 5075

---

Script:

#!/bin/bash
# Description: Verify the usage of imported packages in `e2e/basic/observability_test.go`.

# Test: Search for the usage of each imported package. Expect: All imported packages should be used.

# Define the file to be checked
file="e2e/basic/observability_test.go"

# List of imported packages to check
packages=(
  "context"
  "fmt"
  "io/ioutil"
  "net/http"
  "os"
  "testing"
  "time"
  "github.com/stretchr/testify/require"
  "github.com/celestiaorg/knuu/pkg/knuu"
  "github.com/celestiaorg/knuu/pkg/sidecars/observability"
)

# Check the usage of each package
for pkg in "${packages[@]}"; do
  echo "Checking usage of package: $pkg"
  rg --type go --file "$file" "$pkg"
done

Length of output: 50721

---

Script:

#!/bin/bash
# Description: Verify the usage of imported packages in `e2e/basic/observability_test.go`.

# Test: Search for the usage of each imported package. Expect: All imported packages should be used.

# Define the file to be checked
file="e2e/basic/observability_test.go"

# List of imported packages to check
packages=(
  "context"
  "fmt"
  "io/ioutil"
  "net/http"
  "os"
  "testing"
  "time"
  "github.com/stretchr/testify/require"
  "github.com/celestiaorg/knuu/pkg/knuu"
  "github.com/celestiaorg/knuu/pkg/sidecars/observability"
)

# Check the usage of each package
for pkg in "${packages[@]}"; do
  echo "Checking usage of package: $pkg"
  rg "$pkg" "$file"
done

Length of output: 3060

---

18-26: Ensure all constants are necessary and used appropriately.

Verify that all declared constants are utilized within the file to avoid unnecessary declarations.

Verification successful

---

All declared constants are utilized appropriately within the file.

The verification confirms that each constant (prometheusPort, prometheusImage, prometheusConfig, prometheusArgs, targetImage, otlpPort) is used in e2e/basic/observability_test.go.

• prometheusPort is used in lines: 2 instances.
• prometheusImage is used in lines: 1 instance.
• prometheusConfig is used in lines: 2 instances.
• prometheusArgs is used in lines: 1 instance.
• targetImage is used in lines: 1 instance.
• otlpPort is used in lines: 2 instances.

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the usage of declared constants in `e2e/basic/observability_test.go`.

# Test: Search for the usage of each declared constant. Expect: All declared constants should be used.
rg --type go --file e2e/basic/observability_test.go 'prometheusPort|prometheusImage|prometheusConfig|prometheusArgs|targetImage|otlpPort'

Length of output: 4987

---

Script:

#!/bin/bash
# Description: Verify the usage of declared constants in `e2e/basic/observability_test.go`.

# Test: Search for the usage of each declared constant. Expect: All declared constants should be used.

# Define the constants to search for
constants=("prometheusPort" "prometheusImage" "prometheusConfig" "prometheusArgs" "targetImage" "otlpPort")

# Loop through each constant and search for its usage in the file
for constant in "${constants[@]}"; do
    echo "Searching for usage of constant: $constant"
    rg --type go --file e2e/basic/observability_test.go "$constant"
done

Length of output: 30439

---

Script:

#!/bin/bash
# Description: Verify the usage of declared constants in `e2e/basic/observability_test.go`.

# Test: Search for the usage of each declared constant. Expect: All declared constants should be used.

# Define the constants to search for
constants=("prometheusPort" "prometheusImage" "prometheusConfig" "prometheusArgs" "targetImage" "otlpPort")

# Loop through each constant and search for its usage in the file
for constant in "${constants[@]}"; do
    echo "Searching for usage of constant: $constant"
    rg "$constant" e2e/basic/observability_test.go
done

Length of output: 2095

pkg/sidecars/observability/obsy.go (5)

43-78: Ensure correct implementation of ObsyConfig struct.

Verify that the ObsyConfig struct is implemented correctly and follows best practices.

Verification successful

---

Ensure correct implementation of ObsyConfig struct.

The ObsyConfig struct is implemented correctly and follows best practices.

• The struct definition includes all the necessary fields.
• There are no obvious issues with the struct itself.

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the implementation of ObsyConfig struct in `pkg/sidecars/observability/obsy.go`.

# Test: Search for the implementation of ObsyConfig struct. Expect: The struct should be implemented correctly and follow best practices.
rg --type go --file pkg/sidecars/observability/obsy.go 'type ObsyConfig'

Length of output: 5841

---

Script:

#!/bin/bash
# Description: Verify the implementation of ObsyConfig struct in `pkg/sidecars/observability/obsy.go`.

# Test: Search for the implementation of ObsyConfig struct. Expect: The struct should be implemented correctly and follow best practices.
ast-grep --lang go --pattern 'type ObsyConfig struct { $$$ }' pkg/sidecars/observability/obsy.go

Length of output: 2924

---

14-27: Ensure all constants are necessary and used appropriately.

Verify that all declared constants are utilized within the file to avoid unnecessary declarations.

---

29-158: Ensure correct implementation of Obsy struct and methods.

Verify that the Obsy struct and its methods are implemented correctly and follow best practices.

---

1-12: Ensure all imported packages are necessary.

Verify that all imported packages are utilized within the file to avoid unnecessary dependencies.

---

Line range hint 200-421:
Ensure correct implementation of helper functions for creating configuration components.

Verify that the helper functions for creating configuration components are implemented correctly and follow best practices.

pkg/sidecars/observability/otel.go (4)

1-5: Ensure all imported packages are necessary.

Verify that all imported packages are utilized within the file to avoid unnecessary dependencies.

Verification successful

---

The imported package fmt is necessary.

The fmt package is used for formatting strings within the file pkg/sidecars/observability/otel.go.

• fmt.Sprintf(localhostEndpoint, o.obsyConfig.otlpPort)
• fmt.Sprintf(localhostEndpoint, o.obsyConfig.prometheusEndpointPort)
• fmt.Sprintf(localhostEndpoint, o.obsyConfig.jaegerGrpcPort)
• fmt.Sprintf(localhostEndpoint, o.obsyConfig.jaegerThriftCompactPort)
• fmt.Sprintf(localhostEndpoint, o.obsyConfig.jaegerThriftHttpPort)

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the usage of imported packages in `pkg/sidecars/observability/otel.go`.

# Test: Search for the usage of each imported package. Expect: All imported packages should be used.
rg --type go --file pkg/sidecars/observability/otel.go 'fmt'

Length of output: 12581

---

Script:

#!/bin/bash
# Description: Verify the usage of imported packages in `pkg/sidecars/observability/otel.go`.

# Test: Search for the usage of the `fmt` package. Expect: All imported packages should be used.
rg 'fmt' pkg/sidecars/observability/otel.go

Length of output: 471

---

7-29: Ensure all constants are necessary and used appropriately.

Verify that all declared constants are utilized within the file to avoid unnecessary declarations.

Verification successful

---

All declared constants are utilized appropriately within the file.

The verification confirms that each constant declared in the specified lines is used within the pkg/sidecars/observability/otel.go file.

• localhostEndpoint
• internalTelemetryEndpoint
• internalTelemetryJobName
• internalTelemetryInterval
• basicTelemetryLevel
• basicAuthOTLPAuthAuthenticator
• otlpReceiverName
• prometheusReceiverName
• jaegerReceiverName
• otlpHttpExporterName
• jaegerExporterName
• prometheusExporterName
• prometheusRemoteWriteExporterName
• attributesProcessorName
• scopeAttributeKey
• insertAction

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the usage of declared constants in `pkg/sidecars/observability/otel.go`.

# Test: Search for the usage of each declared constant. Expect: All declared constants should be used.
rg --type go --file pkg/sidecars/observability/otel.go 'localhostEndpoint|internalTelemetryEndpoint|internalTelemetryJobName|internalTelemetryInterval|basicTelemetryLevel|basicAuthOTLPAuthAuthenticator|otlpReceiverName|prometheusReceiverName|jaegerReceiverName|otlpHttpExporterName|jaegerExporterName|prometheusExporterName|prometheusRemoteWriteExporterName|attributesProcessorName|scopeAttributeKey|insertAction'

Length of output: 12936

---

Script:

#!/bin/bash
# Description: Verify the usage of declared constants in `pkg/sidecars/observability/otel.go`.

# Test: Search for the usage of each declared constant individually.
constants=(
  "localhostEndpoint"
  "internalTelemetryEndpoint"
  "internalTelemetryJobName"
  "internalTelemetryInterval"
  "basicTelemetryLevel"
  "basicAuthOTLPAuthAuthenticator"
  "otlpReceiverName"
  "prometheusReceiverName"
  "jaegerReceiverName"
  "otlpHttpExporterName"
  "jaegerExporterName"
  "prometheusExporterName"
  "prometheusRemoteWriteExporterName"
  "attributesProcessorName"
  "scopeAttributeKey"
  "insertAction"
)

for constant in "${constants[@]}"; do
  echo "Searching for usage of constant: $constant"
  rg --type go --file pkg/sidecars/observability/otel.go "$constant"
done

Length of output: 204497

---

Script:

#!/bin/bash
# Description: Verify the usage of declared constants in `pkg/sidecars/observability/otel.go`.

# Test: Search for the usage of each declared constant individually.
constants=(
  "localhostEndpoint"
  "internalTelemetryEndpoint"
  "internalTelemetryJobName"
  "internalTelemetryInterval"
  "basicTelemetryLevel"
  "basicAuthOTLPAuthAuthenticator"
  "otlpReceiverName"
  "prometheusReceiverName"
  "jaegerReceiverName"
  "otlpHttpExporterName"
  "jaegerExporterName"
  "prometheusExporterName"
  "prometheusRemoteWriteExporterName"
  "attributesProcessorName"
  "scopeAttributeKey"
  "insertAction"
)

for constant in "${constants[@]}"; do
  echo "Searching for usage of constant: $constant"
  rg --type go "$constant" pkg/sidecars/observability/otel.go
done

Length of output: 6277

---

200-421: Ensure correct implementation of helper functions for creating configuration components.

Verify that the helper functions for creating configuration components are implemented correctly and follow best practices.

---

31-198: Ensure correct implementation of OTelConfig struct and related types.

Verify that the OTelConfig struct and related types are implemented correctly and follow best practices.

[coderabbitai]

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 45b02d9 and 1d84f41.

Files selected for processing (1)

• pkg/instance/helper.go (4 hunks)

Files skipped from review as they are similar to previous changes (1)

• pkg/instance/helper.go

[coderabbitai]

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 1d84f41 and 053ac40.

Files selected for processing (2)

• pkg/sidecars/netshaper/helpers.go (1 hunks)
• pkg/sidecars/netshaper/netshaper_test.go (1 hunks)

Files skipped from review as they are similar to previous changes (2)

• pkg/sidecars/netshaper/helpers.go
• pkg/sidecars/netshaper/netshaper_test.go