Skip to content

Commit a298c5a

Browse files
authored
[receiver/haproxy] fix reading more than 4096 bytes (#32661)
This makes sure to read the whole data when interacting over the socket with haproxy. Fixes #32652
1 parent 1c120df commit a298c5a

File tree

3 files changed

+29
-3
lines changed

3 files changed

+29
-3
lines changed

.chloggen/haproxy_readall.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: haproxyreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Fix reading stats larger than 4096 bytes
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [32652]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

receiver/haproxyreceiver/scraper.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,10 @@ func (s *scraper) scrape(ctx context.Context) (pmetric.Metrics, error) {
7070
if err != nil {
7171
return pmetric.NewMetrics(), err
7272
}
73-
buf := make([]byte, 4096)
74-
n, err := c.Read(buf)
73+
buf, err := io.ReadAll(c)
7574
if err != nil {
7675
return pmetric.NewMetrics(), err
7776
}
78-
buf = buf[0:n]
7977
records, err = s.readStats(buf)
8078
if err != nil {
8179
return pmetric.NewMetrics(), fmt.Errorf("error reading stats: %w", err)

receiver/haproxyreceiver/scraper_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ func Test_scraper_readStats(t *testing.T) {
4141
require.NoError(t, err2)
4242
_, err2 = c.Write(stats)
4343
require.NoError(t, err2)
44+
require.NoError(t, c.Close())
4445
default:
4546
require.Fail(t, fmt.Sprintf("invalid message: %v", data))
4647
}

0 commit comments

Comments
 (0)