feat(vlogs service): fix stderr handling and improve number logic validation. #5859
+318
−224
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
dinoallo
requested changes
Aug 25, 2025
bearslyricattack
changed the title
zijiren233
requested changes
Sep 12, 2025
Comment on lines
22
to
30
| httpClient := &http.Client{ | ||
| Transport: &http.Transport{ | ||
| // nosemgrep | ||
| TLSClientConfig: &tls.Config{ | ||
| //nolint:gosec | ||
| InsecureSkipVerify: true, | ||
| }, | ||
| }, | ||
| } |
There was a problem hiding this comment.
Use the http default client since TLS-related configurations are not needed.
| } | ||
| return resp, nil | ||
| } | ||
|
|
||
| func generateReq(query *QueryParams) (*http.Request, error) { | ||
| baseURL, err := url.Parse(query.Path + "/select/logsql/query") |
There was a problem hiding this comment.
please use url joinpath to format url
| if err != nil { | ||
| return nil, err | ||
| } | ||
| resp, err := httpClient.Do(req) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("HTTP req error: %v", err) | ||
| return nil, fmt.Errorf("HTTP req error: %w", err) | ||
| } | ||
| if resp.StatusCode != http.StatusOK { |
There was a problem hiding this comment.
Use defer body close here instead of manually closing it later.
Comment on lines
+37
to
+50
| var builder strings.Builder | ||
| var item string | ||
| if len(req.Time) != 0 { | ||
| item = fmt.Sprintf( | ||
| `{namespace="%s"} _time:%s app:="%s" | Drop _stream_id,_stream,app,job,namespace,node`, | ||
| req.Namespace, | ||
| req.Time, | ||
| req.App, | ||
| ) | ||
| } else { | ||
| item = fmt.Sprintf(`{namespace="%s"} app:="%s" | Drop _stream_id,_stream,app,job,namespace,node`, req.Namespace, req.App) | ||
| } | ||
| builder.WriteString(item) | ||
| v.query += builder.String() |
There was a problem hiding this comment.
Redundant use of strings.Builder.
Comment on lines
+55
to
+58
| var builder strings.Builder | ||
| builder.WriteString(req.Keyword) | ||
| builder.WriteString(" ") | ||
| v.query += builder.String() |
There was a problem hiding this comment.
Redundant use of strings.Builder.
Comment on lines
+157
to
+160
| var builder strings.Builder | ||
| builder.WriteString("| Drop _stream_id,_stream,app,job,namespace,node") | ||
| v.query += builder.String() | ||
| } |
Comment on lines
+163
to
+167
| var builder strings.Builder | ||
| if req.NumberMode == modeTrue { | ||
| item := fmt.Sprintf(" | stats by (_time:1%s) count() logs_total ", req.NumberLevel) | ||
| builder.WriteString(item) | ||
| v.query += builder.String() |
| scanner := bufio.NewScanner(strings.NewReader(string(body))) | ||
| var logs []api.VlogsResponse | ||
|
|
||
| uniquePods := make(map[string]struct{}) | ||
| for scanner.Scan() { | ||
| var entry api.VlogsResponse | ||
| line := scanner.Text() |
There was a problem hiding this comment.
Is there a scanner.Bytes method?
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:
Issue: Current stderr filtering logic causes user confusion due to implementation inconsistency. When users select "stderr" filter with log count limit, there are two possible behaviors:
Filter stderr logs from the latest 500 logs (current implementation)
Fetch the latest 500 stderr logs (expected behavior)
Root Cause: The stderr filter is applied after fetching logs (post-filter), while other filters like keyword search are applied before fetching (pre-filter), creating inconsistent user experience.
Proposed Solution:
Align stderr filtering logic with other filters by implementing pre-filtering
Change the order to: filter stderr logs first → then fetch 500 records