Skip to content

Use req.Body readers to reduce allocs #489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tigrannajaryan merged 3 commits into from
Jan 13, 2026
Merged

Use req.Body readers to reduce allocs #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02e2768
Use req.Body readers to reduce allocs
michel-laterman Jan 9, 2026
80bb0b0
Fix tests
michel-laterman Jan 9, 2026
67b4b8e
Remove use of sync.Once
michel-laterman Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions server/serverimpl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ func (s *server) handleWSConnection(reqCtx context.Context, wsConn *websocket.Co

// Loop until fail to read from the WebSocket connection.
for {
msgContext := context.Background()
msgContext := context.Background() // reqContext is cancelled when the ServerHTTP method is returned, for WebSockets connections this happens before this loop even starts.
request := protobufs.AgentToServer{}

// Block until the next message can be read.
Expand Down Expand Up @@ -311,8 +311,8 @@ func (s *server) handleWSConnection(reqCtx context.Context, wsConn *websocket.Co
}
}

func decompressGzip(data []byte) ([]byte, error) {
r, err := gzip.NewReader(bytes.NewBuffer(data))
func decompressGzip(data io.Reader) ([]byte, error) {
Comment thread
tigrannajaryan marked this conversation as resolved.
r, err := gzip.NewReader(data)
if err != nil {
return nil, err
}
Expand All @@ -321,15 +321,16 @@ func decompressGzip(data []byte) ([]byte, error) {
}

func (s *server) readReqBody(req *http.Request) ([]byte, error) {
data, err := io.ReadAll(req.Body)
if err != nil {
return nil, err
}
if req.Header.Get(headerContentEncoding) == contentEncodingGzip {
data, err = decompressGzip(data)
data, err := decompressGzip(req.Body)
if err != nil {
return nil, err
}
return data, nil
}
data, err := io.ReadAll(req.Body)
if err != nil {
return nil, err
}
return data, nil
}
Expand Down Expand Up @@ -391,6 +392,7 @@ func (s *server) handlePlainHTTPRequest(req *http.Request, w http.ResponseWriter
}

// Return the CustomCapabilities
// Note that unlike a WebSocket response, this is included in all HTTP responses.
response.CustomCapabilities = &protobufs.CustomCapabilities{
Capabilities: s.settings.CustomCapabilities,
}
Expand Down
5 changes: 1 addition & 4 deletions server/serverimpl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,11 +964,8 @@ func TestServerHonoursAcceptEncoding(t *testing.T) {
// Verify the received message is what was sent.
assert.True(t, proto.Equal(rcvMsg.Load().(proto.Message), &sendMsg))

// Read Server's response.
b, err = io.ReadAll(resp.Body)
require.NoError(t, err)
// Decompress the gzip response
b, err = decompressGzip(b)
b, err = decompressGzip(resp.Body)
require.NoError(t, err)

assert.EqualValues(t, http.StatusOK, resp.StatusCode)
Expand Down
Loading