[#212]: fix: use gzip only

Author: rustatian

.github/workflows/linux.yml

@@ -1,5 +1,4 @@
 name: gzip
-
 on:
   push:
     branches:
@@ -9,86 +8,85 @@ on:
     branches:
       - master
       - stable
-
 jobs:
   gzip_test:
     name: GZIP plugin (Go ${{ matrix.go }}, PHP ${{ matrix.php }}, OS ${{matrix.os}})
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     strategy:
       matrix:
-        php: [ "8.4" ]
-        go: [ stable ]
-        os: [ "ubuntu-latest" ]
+        php: ["8.5"]
+        go: [stable]
+        os: ["ubuntu-latest"]
     steps:
       - name: Set up Go ${{ matrix.go }}
         uses: actions/setup-go@v6 # action page: <https://github.com/actions/setup-go>
         with:
           go-version: ${{ matrix.go }}
-
       - name: Set up PHP ${{ matrix.php }}
         uses: shivammathur/setup-php@v2 # action page: <https://github.com/shivammathur/setup-php>
         with:
           php-version: ${{ matrix.php }}
           extensions: sockets
-
       - name: Check out code
         uses: actions/checkout@v6
-
       - name: Get Composer Cache Directory
         id: composer-cache
         run: |
           cd tests/php_test_files
           echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
       - name: Init Composer Cache # Docs: <https://git.io/JfAKn#php---composer>
         uses: actions/cache@v5
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
-
       - name: Install Composer dependencies
         run: cd tests/php_test_files && composer update --prefer-dist --no-progress --ansi
-
       - name: Init Go modules Cache # Docs: <https://git.io/JfAKn#go---modules>
         uses: actions/cache@v5
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: ${{ runner.os }}-go-
-
       - name: Install Go dependencies
         run: go mod download
-
       - name: Run golang tests with coverage
         run: |
           cd tests
           mkdir ./coverage-ci
 
           go test -timeout 20m -v -race -cover -tags=debug -failfast -coverpkg=$(cat pkgs.txt) -coverprofile=./coverage-ci/gzip.out -covermode=atomic plugin_test.go
-
       - name: Archive code coverage results
         uses: actions/upload-artifact@v6
         with:
           name: coverage
-          path: ./tests/coverage-ci/gzip.out
-
+          path: ./tests/coverage-ci
   codecov:
     name: Upload codecov
     runs-on: ubuntu-latest
     needs:
       - gzip_test
-
     timeout-minutes: 60
     steps:
+      - name: Check out code
+        uses: actions/checkout@v6
       - name: Download code coverage results
         uses: actions/download-artifact@v7
+        with:
+          name: coverage
+          path: coverage
       - run: |
           echo 'mode: atomic' > summary.txt
-          tail -q -n +2 *.out >> summary.txt
-          sed -i '2,${/roadrunner/!d}' summary.txt
-
+          tail -q -n +2 coverage/*.out >> summary.txt
+          awk '
+            NR == 1 { print; next }
+            /^github\.com\/roadrunner-server\/gzip\/v5\// {
+              sub(/^github\.com\/roadrunner-server\/gzip\/v5\//, "", $0)
+              print
+            }
+          ' summary.txt > summary.filtered.txt
+          mv summary.filtered.txt summary.txt
       - name: upload to codecov
         uses: codecov/codecov-action@v5 # Docs: <https://github.com/codecov/codecov-action>
         with:

.golangci.yml

@@ -57,6 +57,11 @@ linters:
       for-loops: true
     wsl:
       allow-assign-and-anything: true
+    revive:
+      enable-default-rules: true
+      rules:
+        - name: var-naming
+          disabled: true
   exclusions:
     generated: lax
     presets:

doc.go

@@ -0,0 +1,2 @@
+// Package gzip provides the RoadRunner Gzip plugin.
+package gzip

go.mod

@@ -1,8 +1,6 @@
 module github.com/roadrunner-server/gzip/v5
 
-go 1.25
-
-toolchain go1.25.7
+go 1.26
 
 require (
 	github.com/klauspost/compress v1.18.4

go.work

@@ -1,4 +1,4 @@
-go 1.25
+go 1.26
 
 use (
 	.

plugin.go

@@ -2,6 +2,7 @@ package gzip
 
 import (
 	"net/http"
+	"sync"
 
 	"github.com/klauspost/compress/gzhttp"
 	rrcontext "github.com/roadrunner-server/context"
@@ -20,14 +21,30 @@ type Plugin struct {
 	prop propagation.TextMapPropagator
 }
 
+var onceDefault sync.Once                              //nolint:gochecknoglobals
+var defaultWrapper func(http.Handler) http.HandlerFunc //nolint:gochecknoglobals
+
+// GzipHandler allows to easily wrap an http handler with default settings.
+func gzipHandler(h http.Handler) http.HandlerFunc {
+	onceDefault.Do(func() {
+		var err error
+		defaultWrapper, err = gzhttp.NewWrapper(gzhttp.PreferZstd(false), gzhttp.EnableZstd(false), gzhttp.EnableGzip(true))
+		if err != nil {
+			panic(err)
+		}
+	})
+
+	return defaultWrapper(h)
+}
+
 func (g *Plugin) Init() error {
 	g.prop = propagation.NewCompositeTextMapPropagator(propagation.TraceContext{}, propagation.Baggage{}, jprop.Jaeger{})
 
 	return nil
 }
 
 func (g *Plugin) Middleware(next http.Handler) http.Handler {
-	return gzhttp.GzipHandler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	return gzipHandler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if val, ok := r.Context().Value(rrcontext.OtelTracerNameKey).(string); ok {
 			tp := trace.SpanFromContext(r.Context()).TracerProvider()
 			ctx, span := tp.Tracer(val, trace.WithSchemaURL(semconv.SchemaURL),

tests/doc.go

@@ -0,0 +1,2 @@
+// Package gzip contains integration tests for the RoadRunner Gzip plugin.
+package gzip

tests/mock/doc.go

@@ -0,0 +1,2 @@
+// Package mocklogger provides test logger mocks and observed log utilities.
+package mocklogger