Skip to content

Zstd Compression Support #113

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

Open
felixbuenemann wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Zstd Compression Support #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/basecamp/thruster
go 1.26

require (
github.com/klauspost/compress v1.18.2
github.com/klauspost/compress v1.18.4
github.com/stretchr/testify v1.8.4
golang.org/x/crypto v0.46.0
golang.org/x/net v0.48.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/klauspost/compress v1.18.2 h1:iiPHWW0YrcFgpBYhsA6D1+fqHssJscY/Tm/y2Uqnapk=
github.com/klauspost/compress v1.18.2/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
github.com/klauspost/compress v1.18.4 h1:RPhnKRAQ4Fh8zU2FY/6ZFDwTVTxgJ/EMydqSTzE9a2c=
github.com/klauspost/compress v1.18.4/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
Expand Down
34 changes: 33 additions & 1 deletion internal/compression_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"strings"
"testing"

"github.com/klauspost/compress/zstd"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand All @@ -21,7 +22,7 @@ func TestCompressionHandler(t *testing.T) {
require.NoError(t, err)
})

t.Run("compresses responses", func(t *testing.T) {
t.Run("compresses responses with gzip", func(t *testing.T) {
handler := NewCompressionHandler(0, false, upstream)

req := httptest.NewRequest("GET", "/", nil)
Expand All @@ -40,6 +41,37 @@ func TestCompressionHandler(t *testing.T) {
assert.Equal(t, largeBody, string(body))
})

t.Run("compresses responses with zstd", func(t *testing.T) {
handler := NewCompressionHandler(0, false, upstream)

req := httptest.NewRequest("GET", "/", nil)
req.Header.Set("Accept-Encoding", "zstd")
rr := httptest.NewRecorder()

handler.ServeHTTP(rr, req)

assert.Equal(t, "zstd", rr.Header().Get("Content-Encoding"))

reader, err := zstd.NewReader(rr.Body)
require.NoError(t, err)
defer reader.Close()
body, err := io.ReadAll(reader)
require.NoError(t, err)
assert.Equal(t, largeBody, string(body))
})

t.Run("prefers zstd when client accepts both", func(t *testing.T) {
handler := NewCompressionHandler(0, false, upstream)

req := httptest.NewRequest("GET", "/", nil)
req.Header.Set("Accept-Encoding", "gzip, zstd")
rr := httptest.NewRecorder()

handler.ServeHTTP(rr, req)

assert.Equal(t, "zstd", rr.Header().Get("Content-Encoding"))
})

t.Run("applies jitter when configured", func(t *testing.T) {
handler := NewCompressionHandler(32, false, upstream)

Expand Down