pre-release/v6

.github/workflows/linux_inmemory.yml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        php: ["8.4"]
+        php: ["8.5"]
         go: [stable]
         os: ["ubuntu-latest"]
     steps:
@@ -65,23 +65,13 @@ jobs:
         run: |
           cd tests
           mkdir ./coverage-ci
-
-          docker compose -f env/docker-compose-otel.yaml up -d
-          sleep 30
-          if [ "$(docker ps -q -f status=running -f name=otel_collector)" ]; then
-          echo "Memory Docker container started successfully."
-             else
-                 echo "Failed to start Memory Docker container."
-                 exit 1
-          fi
-          go test -timeout 20m -v -race -cover -tags=debug -failfast -coverpkg=$(cat pkgs.txt) -coverprofile=./coverage-ci/memory_kv.out -covermode=atomic kv_memory_test.go
-          docker compose -f env/docker-compose-otel.yaml down
+          go test -timeout 20m -v -race -cover -tags=debug -failfast -coverpkg=github.com/roadrunner-server/memory/v6/... -coverprofile=./coverage-ci/memory_kv.out -covermode=atomic kv_memory_test.go
 
       - name: Archive code coverage results
         uses: actions/upload-artifact@v7
         with:
-          name: coverage
-          path: ./tests/coverage-ci/memory_kv.out
+          name: coverage-kv
+          path: ./tests/coverage-ci
 
   codecov:
     name: Upload codecov
@@ -91,15 +81,28 @@ jobs:
 
     timeout-minutes: 60
     steps:
+      - name: Check out code
+        uses: actions/checkout@v6
       - name: Download code coverage results
         uses: actions/download-artifact@v8
+        with:
+          pattern: coverage-*
+          path: coverage
+          merge-multiple: true
       - 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\/memory\/v6\// {
+              sub(/^github\.com\/roadrunner-server\/memory\/v6\//, "", $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>
+        uses: codecov/codecov-action@v5
         with:
           files: summary.txt
           fail_ci_if_error: false

.github/workflows/linux_jobs.yml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        php: ["8.4"]
+        php: ["8.5"]
         go: [stable]
         os: ["ubuntu-latest"]
     steps:
@@ -65,23 +65,13 @@ jobs:
         run: |
           cd tests
           mkdir ./coverage-ci
-
-          docker compose -f env/docker-compose-otel.yaml up -d
-          sleep 30
-          if [ "$(docker ps -q -f status=running -f name=otel_collector)" ]; then
-          echo "Memory Docker container started successfully."
-             else
-                 echo "Failed to start Memory Docker container."
-                 exit 1
-          fi
-          go test -timeout 20m -v -race -cover -tags=debug -failfast -coverpkg=$(cat pkgs.txt) -coverprofile=./coverage-ci/memory_jobs.out -covermode=atomic jobs_memory_test.go
-          docker compose -f env/docker-compose-otel.yaml down
+          go test -timeout 20m -v -race -cover -tags=debug -failfast -coverpkg=github.com/roadrunner-server/memory/v6/... -coverprofile=./coverage-ci/memory_jobs.out -covermode=atomic jobs_memory_test.go
 
       - name: Archive code coverage results
         uses: actions/upload-artifact@v7
         with:
-          name: coverage
-          path: ./tests/coverage-ci/memory_jobs.out
+          name: coverage-jobs
+          path: ./tests/coverage-ci
 
   codecov:
     name: Upload codecov
@@ -91,15 +81,28 @@ jobs:
 
     timeout-minutes: 60
     steps:
+      - name: Check out code
+        uses: actions/checkout@v6
       - name: Download code coverage results
         uses: actions/download-artifact@v8
+        with:
+          pattern: coverage-*
+          path: coverage
+          merge-multiple: true
       - 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\/memory\/v6\// {
+              sub(/^github\.com\/roadrunner-server\/memory\/v6\//, "", $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>
+        uses: codecov/codecov-action@v5
         with:
           files: summary.txt
           fail_ci_if_error: false

.golangci.yml

@@ -13,6 +13,7 @@ linters:
     - exhaustive
     - gochecknoglobals
     - gochecknoinits
+    - gocognit
     - goconst
     - gocritic
     - goprintffuncname
@@ -61,13 +62,6 @@ linters:
       - common-false-positives
       - legacy
       - std-error-handling
-    rules:
-      - linters:
-          - dupl
-          - funlen
-          - gocognit
-          - scopelint
-        path: _test\.go
     paths:
       - .github
       - .git

go.mod

@@ -1,12 +1,9 @@
-module github.com/roadrunner-server/memory/v5
+module github.com/roadrunner-server/memory/v6
 
 go 1.26
 
-toolchain go1.26.0
-
 require (
-	github.com/goccy/go-json v0.10.5
-	github.com/roadrunner-server/api/v4 v4.23.0
+	github.com/roadrunner-server/api-plugins/v6 v6.0.0-beta.1
 	github.com/roadrunner-server/endure/v2 v2.6.2
 	github.com/roadrunner-server/errors v1.4.1
 	go.opentelemetry.io/contrib/propagators/jaeger v1.42.0

go.sum

@@ -7,16 +7,14 @@ github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
 github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
-github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/roadrunner-server/api/v4 v4.23.0 h1:lrVXgP4ozD/H5DrIdT181ldVhD1R9QT5qsi8qWUTDF4=
-github.com/roadrunner-server/api/v4 v4.23.0/go.mod h1:AlHuVVOklb7XF33Cf7IfmwOn3j4gGg37on9Xi6j08Bg=
+github.com/roadrunner-server/api-plugins/v6 v6.0.0-beta.1 h1:IypW4r2Z3flZ2QnhYBf9yv0pyiQi3SdOjurIHtdNcLY=
+github.com/roadrunner-server/api-plugins/v6 v6.0.0-beta.1/go.mod h1:U3Cm4fS+etjtxRgUFINh33FJB/du1d2VEhIKgg43/tc=
 github.com/roadrunner-server/endure/v2 v2.6.2 h1:sIB4kTyE7gtT3fDhuYWUYn6Vt/dcPtiA6FoNS1eS+84=
 github.com/roadrunner-server/endure/v2 v2.6.2/go.mod h1:t/2+xpNYgGBwhzn83y2MDhvhZ19UVq1REcvqn7j7RB8=
 github.com/roadrunner-server/errors v1.4.1 h1:LKNeaCGiwd3t8IaL840ZNF3UA9yDQlpvHnKddnh0YRQ=