support networkobserver e2e #2200
Open
Conversation
This file contains hidden or 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
2. add some steps in e2e engine
There was a problem hiding this comment.
Pull Request Overview
This PR introduces end-to-end support for network observer by enhancing metric checks and extending configuration capabilities for various test scenarios. Key changes include:
- Updating the MetricCheck function to accept a new boolean parameter (ge) for flexible metric comparison and improving error messages.
- Adding new test step definitions for removing local configurations.
- Extending SLSSubscriber and NetworkObserverManager to support additional APM configuration and app info synchronization.
Reviewed Changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| test/engine/verify/count.go | Modified MetricCheck to accept a new parameter and updated error messages for metric count comparisons. |
| test/engine/steps.go | Added new steps for removing local and HTTP configurations, as well as metric count checks for "less than" expectation. |
| test/engine/setup/subscriber/sls.go | Extended configuration for APM gateway support in SLS flusher config and added new fields. |
| test/engine/control/config.go | Added functions to remove local configuration via different environments. |
| core/ebpf/plugin/network_observer/NetworkObserverManager.{h,cpp} | Introduced new API methods for initializing app tag events and updating app info with proper locking. |
| core/ebpf/plugin/network_observer/Connection.cpp | Updated connection to attach L7 metadata using enum name. |
| core/ebpf/include/export.h | Removed host-related fields from export options. |
| core/ebpf/Config.cpp | Added optional parameters for AppId and AppName into network observer configuration. |
Comment on lines
+137
to
+138
| groups, err = subscriber.TestSubscriber.GetData(control.GetQuery(ctx), startTime) | ||
|
|
There was a problem hiding this comment.
The call to GetData using 'startTime' is immediately overwritten by a subsequent call with 'lastScrapeTime'. Consider removing the redundant call or consolidating the logic to avoid unintended data loss.
Suggested change
| groups, err = subscriber.TestSubscriber.GetData(control.GetQuery(ctx), startTime) |
Copilot uses AI. Check for mistakes.
| } | ||
| } else { | ||
| if count >= expect { | ||
| return fmt.Errorf("metric count greate equal than expect, expect %d, got %d, from %d", expect, count, startTime) |
There was a problem hiding this comment.
There is a spelling error in the error message ('greate' should be 'greater').
Suggested change
| return fmt.Errorf("metric count greate equal than expect, expect %d, got %d, from %d", expect, count, startTime) | |
| return fmt.Errorf("metric count greater equal than expect, expect %d, got %d, from %d", expect, count, startTime) |
Copilot uses AI. Check for mistakes.
yyuuttaaoo
reviewed
May 7, 2025
| @@ -115,7 +116,7 @@ func LogCountLess(ctx context.Context, expect int) (context.Context, error) { | |||
| return ctx, nil | |||
| } | |||
|
|
|||
| func MetricCheck(ctx context.Context, expect int, duration int64, checker func([]*protocol.LogGroup) error) (context.Context, error) { | |||
| func MetricCheck(ctx context.Context, expect int, duration int64, ge bool, checker func([]*protocol.LogGroup) error) (context.Context, error) { | |||
There was a problem hiding this comment.
这个方法设计感觉不怎么合理啊。不应该是op可以取5种比较操作符么？
There was a problem hiding this comment.
还有一种不用改动框架代码的的方法，是写SQL，可以参考这种写法
When query through {* | with a as (select count(1) as cnt from e2e) select * from a where cnt < 30000}
Then there is {1} logs
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.
No description provided.