Merge pull request 'Update workflows' (#127 ) from atolstikhin/micro-store-redis:master into master

Reviewed-on: #127
Merge branch 'master' into master
2024-12-15 23:09:54 +03:00 · 2024-12-15 22:10:20 +03:00 · 2024-12-15 22:09:59 +03:00 · 2024-12-14 01:52:20 +07:00 · 2024-10-04 00:20:23 +03:00 · 2023-12-12 13:53:00 +03:00
23 changed files with 320 additions and 1088 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
--- a/.github/ISSUE_TEMPLATE/feature-request---enhancement.md
+++ b/.github/ISSUE_TEMPLATE/feature-request---enhancement.md
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
--- a/.gitea/workflows/job_lint.yml
+++ b/.gitea/workflows/job_lint.yml
@@ -0,0 +1,29 @@
+name: lint
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+    - master
+    - v3
+    - v4
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout code
+      uses: actions/checkout@v4
+      with:
+        filter: 'blob:none'
+    - name: setup go
+      uses: actions/setup-go@v5
+      with:
+        cache-dependency-path: "**/*.sum"
+        go-version: 'stable' 
+    - name: setup deps
+      run: go get -v ./...
+    - name: run lint
+      uses: https://github.com/golangci/golangci-lint-action@v6
+      with:
+        version: 'latest'
--- a/.gitea/workflows/job_test.yml
+++ b/.gitea/workflows/job_test.yml
@@ -0,0 +1,34 @@
+name: test
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+    - master
+    - v3
+    - v4
+  push:
+    branches:
+    - master
+    - v3
+    - v4
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout code
+      uses: actions/checkout@v4
+      with:
+        filter: 'blob:none'
+    - name: setup go
+      uses: actions/setup-go@v5
+      with:
+        cache-dependency-path: "**/*.sum"
+        go-version: 'stable'
+    - name: setup deps
+      run: go get -v ./...
+    - name: run test
+      env:
+        INTEGRATION_TESTS: yes
+      run: go test -mod readonly -v ./...
--- a/.gitea/workflows/job_tests.yml
+++ b/.gitea/workflows/job_tests.yml
@@ -0,0 +1,53 @@
+name: test
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+    - master
+    - v3
+    - v4
+  push:
+    branches:
+    - master
+    - v3
+    - v4
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout code
+      uses: actions/checkout@v4
+      with:
+        filter: 'blob:none'
+    - name: checkout tests
+      uses: actions/checkout@v4
+      with:
+        ref: master
+        filter: 'blob:none'
+        repository: unistack-org/micro-tests
+        path: micro-tests
+    - name: setup go
+      uses: actions/setup-go@v5
+      with:
+        cache-dependency-path: "**/*.sum"
+        go-version: 'stable'
+    - name: setup go work
+      env:
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
+      run: |
+        go work init
+        go work use .
+        go work use micro-tests
+    - name: setup deps
+      env:
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
+      run: go get -v ./...
+    - name: run tests
+      env:
+        INTEGRATION_TESTS: yes
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
+      run: |
+        cd micro-tests
+        go test -mod readonly -v ./... || true
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,19 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-
-  # Maintain dependencies for GitHub Actions
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"
-
-  # Maintain dependencies for Golang
-  - package-ecosystem: "gomod"
-    directory: "/"
-    schedule:
-      interval: "daily"
--- a/.github/workflows/autoapprove.yml
+++ b/.github/workflows/autoapprove.yml
@@ -1,20 +0,0 @@
-name: "autoapprove"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  autoapprove:
-    runs-on: ubuntu-latest
-    steps:
-      - name: approve
-        uses: hmarr/auto-approve-action@v3
-        if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
-        id: approve
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -1,21 +0,0 @@
-name: "automerge"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    if: github.actor == 'vtolstov'
-    steps:
-      - name: merge
-        id: merge
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.TOKEN}}
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,47 +0,0 @@
-name: build
-on:
- push:
-    branches:
-    - master
-    - v3
-jobs:
-  test:
-    name: test
-    runs-on: ubuntu-latest
-    steps:
-    - name: setup
-      uses: actions/setup-go@v3
-      with:
-        go-version: 1.17
-    - name: checkout
-      uses: actions/checkout@v3
-    - name: cache
-      uses: actions/cache@v3
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: ${{ runner.os }}-go-
-    - name: deps
-      run: go get -v -t -d ./...
-    - name: test
-      env:
-        INTEGRATION_TESTS: yes
-      run: go test -mod readonly -v ./...
-  lint:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v3
-      - name: lint
-        uses: golangci/golangci-lint-action@v3.4.0
-        continue-on-error: true
-        with:
-          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.30
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-          # Optional: golangci-lint command line arguments.
-          # args: --issues-exit-code=0
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,78 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "codeql"
-
-on:
-  workflow_run:
-    workflows: ["prbuild"]
-    types:
-      - completed
-  push:
-    branches: [ master, v3 ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master, v3 ]
-  schedule:
-    - cron: '34 1 * * 0'
-
-jobs:
-  analyze:
-    name: analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'go' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
-    steps:
-    - name: checkout
-      uses: actions/checkout@v3
-    - name: setup
-      uses: actions/setup-go@v3
-      with:
-        go-version: 1.17
-    # Initializes the CodeQL tools for scanning.
-    - name: init
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: analyze
-      uses: github/codeql-action/analyze@v2
--- a/.github/workflows/dependabot-automerge.yml
+++ b/.github/workflows/dependabot-automerge.yml
@@ -1,27 +0,0 @@
-name: "dependabot-automerge"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    if: github.actor == 'dependabot[bot]'
-    steps:
-      - name: metadata
-        id: metadata
-        uses: dependabot/fetch-metadata@v1.3.6
-        with:
-          github-token: "${{ secrets.TOKEN }}"
-      - name: merge
-        id: merge
-        if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}}
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.TOKEN}}
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -1,47 +0,0 @@
-name: prbuild
-on:
-  pull_request:
-    branches:
-    - master
-    - v3
-jobs:
-  test:
-    name: test
-    runs-on: ubuntu-latest
-    steps:
-    - name: setup
-      uses: actions/setup-go@v3
-      with:
-        go-version: 1.17
-    - name: checkout
-      uses: actions/checkout@v3
-    - name: cache
-      uses: actions/cache@v3
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: ${{ runner.os }}-go-
-    - name: deps
-      run: go get -v -t -d ./...
-    - name: test
-      env:
-        INTEGRATION_TESTS: yes
-      run: go test -mod readonly -v ./...
-  lint:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v3
-      - name: lint
-        uses: golangci/golangci-lint-action@v3.4.0
-        continue-on-error: true
-        with:
-          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.30
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-          # Optional: golangci-lint command line arguments.
-          # args: --issues-exit-code=0
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true
--- a/.gitignore
+++ b/.gitignore
@@ -1 +0,0 @@
-.idea
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -0,0 +1,5 @@
+run:
+  concurrency: 8
+  deadline: 5m
+  issues-exit-code: 1
+  tests: true
--- a/go.mod
+++ b/go.mod
@@ -1,19 +1,14 @@
-module go.unistack.org/micro-store-redis/v3
+module go.unistack.org/micro-store-redis/v4

-go 1.22
-
-toolchain go1.22.4
+go 1.20

 require (
-	github.com/redis/go-redis/extra/rediscmd/v9 v9.5.3
-	github.com/redis/go-redis/v9 v9.6.2
-	go.unistack.org/micro/v3 v3.10.97
+	github.com/redis/go-redis/v9 v9.2.1
+	go.unistack.org/micro/v4 v4.0.7
 )

 require (
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
-	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
-	google.golang.org/protobuf v1.35.1 // indirect
+	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,30 +1,12 @@
-github.com/bsm/ginkgo/v2 v2.7.0/go.mod h1:AiKlXPm7ItEHNc/2+OkrNG4E0ITzojb9/xWzvQ9XZ9w=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
-github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
-github.com/bsm/gomega v1.26.0/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
-github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
-github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 h1:EaDatTxkdHG+U3Bk4EUr+DZ7fOGwTfezUiUJMaIcaho=
-github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5/go.mod h1:fyalQWdtzDBECAQFBJuQe5bzQ02jGd5Qcbgb97Flm7U=
-github.com/redis/go-redis/extra/rediscmd/v9 v9.5.3 h1:1/BDligzCa40GTllkDnY3Y5DTHuKCONbB2JcRyIfl20=
-github.com/redis/go-redis/extra/rediscmd/v9 v9.5.3/go.mod h1:3dZmcLn3Qw6FLlWASn1g4y+YO9ycEFUOM+bhBmzLVKQ=
-github.com/redis/go-redis/v9 v9.0.5/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk=
-github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0y4=
-github.com/redis/go-redis/v9 v9.6.1/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA=
-github.com/redis/go-redis/v9 v9.6.2 h1:w0uvkRbc9KpgD98zcvo5IrVUsn0lXpRMuhNgiHDJzdk=
-github.com/redis/go-redis/v9 v9.6.2/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA=
-go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
-go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
-go.unistack.org/micro/v3 v3.10.96 h1:njukb0DlXOJspX5mLSwcP7+cVSg/8Fy+6++mYkOpY2A=
-go.unistack.org/micro/v3 v3.10.96/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
-go.unistack.org/micro/v3 v3.10.97 h1:8l7fv+i06/PjPrBBhRC/ZQkWGIOuHPg3jJN0vktYE78=
-go.unistack.org/micro/v3 v3.10.97/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
-google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
-google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
+github.com/redis/go-redis/v9 v9.2.1 h1:WlYJg71ODF0dVspZZCpYmoF1+U1Jjk9Rwd7pq6QmlCg=
+github.com/redis/go-redis/v9 v9.2.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
+go.unistack.org/micro/v4 v4.0.7 h1:2lwtZlHcSwgkahhFbkI4x1lOS79lw8uLHtcEhlFF+AM=
+go.unistack.org/micro/v4 v4.0.7/go.mod h1:bVEYTlPi0EsdgZZt311bIroDg9ict7ky3C87dSCCAGk=
--- a/options.go
+++ b/options.go
@@ -1,67 +1,12 @@
 package redis

 import (
-	goredis "github.com/redis/go-redis/v9"
-	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/meter"
-	"go.unistack.org/micro/v3/store"
-	"go.unistack.org/micro/v3/tracer"
+	"github.com/redis/go-redis/v9"
+	"go.unistack.org/micro/v4/options"
 )

-type configKey struct{}
-
-func Config(c *goredis.Options) store.Option {
-	return store.SetOption(configKey{}, c)
-}
-
-type clusterConfigKey struct{}
-
-func ClusterConfig(c *goredis.ClusterOptions) store.Option {
-	return store.SetOption(clusterConfigKey{}, c)
-}
-
 type universalConfigKey struct{}

-func UniversalConfig(c *goredis.UniversalOptions) store.Option {
-	return store.SetOption(universalConfigKey{}, c)
-}
-
-var (
-	labelHost = "redis_host"
-	labelName = "redis_name"
-)
-
-// Options struct holds wrapper options
-type Options struct {
-	Logger    logger.Logger
-	Meter     meter.Meter
-	Tracer    tracer.Tracer
-	RedisHost string
-	RedisName string
-}
-
-// Option func signature
-type Option func(*Options)
-
-// NewOptions create new Options struct from provided option slice
-func NewOptions(opts ...Option) Options {
-	options := Options{
-		Logger: logger.DefaultLogger,
-		Meter:  meter.DefaultMeter,
-		Tracer: tracer.DefaultTracer,
-	}
-
-	for _, o := range opts {
-		o(&options)
-	}
-
-	options.Meter = options.Meter.Clone(
-		meter.Labels(
-			labelHost, options.RedisHost,
-			labelName, options.RedisName),
-	)
-
-	options.Logger = options.Logger.Clone(logger.WithAddCallerSkipCount(1))
-
-	return options
+func UniversalConfig(c *redis.UniversalOptions) options.Option {
+	return options.ContextOption(universalConfigKey{}, c)
 }
--- a/redis.go
+++ b/redis.go
@@ -2,260 +2,121 @@ package redis

 import (
 	"context"
+	"fmt"
 	"reflect"
 	"strings"
 	"time"

-	goredis "github.com/redis/go-redis/v9"
-	"go.unistack.org/micro/v3/semconv"
-	"go.unistack.org/micro/v3/store"
-	pool "go.unistack.org/micro/v3/util/xpool"
-)
-
-var (
-	DefaultPathSeparator = "/"
-
-	DefaultUniversalOptions = &goredis.UniversalOptions{
-		Username:        "",
-		Password:        "", // no password set
-		MaxRetries:      2,
-		MaxRetryBackoff: 256 * time.Millisecond,
-		DialTimeout:     1 * time.Second,
-		ReadTimeout:     1 * time.Second,
-		WriteTimeout:    1 * time.Second,
-		PoolTimeout:     1 * time.Second,
-		MinIdleConns:    10,
-	}
-
-	DefaultClusterOptions = &goredis.ClusterOptions{
-		Username:        "",
-		Password:        "", // no password set
-		MaxRetries:      2,
-		MaxRetryBackoff: 256 * time.Millisecond,
-		DialTimeout:     1 * time.Second,
-		ReadTimeout:     1 * time.Second,
-		WriteTimeout:    1 * time.Second,
-		PoolTimeout:     1 * time.Second,
-		MinIdleConns:    10,
-	}
-
-	DefaultOptions = &goredis.Options{
-		Username:        "",
-		Password:        "", // no password set
-		DB:              0,  // use default DB
-		MaxRetries:      2,
-		MaxRetryBackoff: 256 * time.Millisecond,
-		DialTimeout:     1 * time.Second,
-		ReadTimeout:     1 * time.Second,
-		WriteTimeout:    1 * time.Second,
-		PoolTimeout:     1 * time.Second,
-		MinIdleConns:    10,
-	}
+	"github.com/redis/go-redis/v9"
+	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v4/store"
 )

 type Store struct {
 	opts store.Options
-	cli  goredis.UniversalClient
-	done chan struct{}
-	pool *pool.StringsPool
+	cli  redis.UniversalClient
 }

 func (r *Store) Connect(ctx context.Context) error {
-	if r.cli == nil {
-		return store.ErrNotConnected
-	}
-	err := r.cli.Ping(ctx).Err()
-	setSpanError(ctx, err)
-	return err
+	return r.cli.Ping(ctx).Err()
 }

-func (r *Store) Init(opts ...store.Option) error {
-	for _, o := range opts {
-		o(&r.opts)
-	}
-
-	err := r.configure()
-	if err != nil {
-		return err
-	}
-
-	return nil
+func (r *Store) Init(opts ...options.Option) error {
+	return r.configure(opts...)
 }

-func (r *Store) Client() *goredis.Client {
-	if c, ok := r.cli.(*goredis.Client); ok {
-		return c
-	}
-	return nil
-}
-
-func (r *Store) UniversalClient() goredis.UniversalClient {
+func (r *Store) Redis() redis.UniversalClient {
 	return r.cli
 }

-func (r *Store) ClusterClient() *goredis.ClusterClient {
-	if c, ok := r.cli.(*goredis.ClusterClient); ok {
-		return c
-	}
-	return nil
-}
-
 func (r *Store) Disconnect(ctx context.Context) error {
-	var err error
-	select {
-	case <-r.done:
-		return err
-	default:
-		if r.cli != nil {
-			err = r.cli.Close()
-		}
-		close(r.done)
-		return err
-	}
+	return r.cli.Close()
 }

-func (r *Store) Exists(ctx context.Context, key string, opts ...store.ExistsOption) error {
-	b := r.pool.Get()
-	defer r.pool.Put(b)
-	options := store.NewExistsOptions(opts...)
-
-	timeout := r.opts.Timeout
-	if options.Timeout > 0 {
-		timeout = options.Timeout
-	}
-
-	if timeout > 0 {
+func (r *Store) Exists(ctx context.Context, key string, opts ...options.Option) error {
+	if r.opts.Timeout > 0 {
 		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(ctx, timeout)
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
 		defer cancel()
 	}
-
-	rkey := r.getKey(b, r.opts.Namespace, options.Namespace, key)
-
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
-	ts := time.Now()
-	val, err := r.cli.Exists(ctx, rkey).Result()
-	setSpanError(ctx, err)
-	te := time.Since(ts)
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Dec()
-	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if err == goredis.Nil || (err == nil && val == 0) {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
-		return store.ErrNotFound
-	} else if err == nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
-	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
+	options := store.NewExistsOptions(opts...)
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
+	}
+	if options.Namespace != "" {
+		key = fmt.Sprintf("%s%s", r.opts.Namespace, key)
+	}
+	val, err := r.cli.Exists(ctx, key).Result()
+	if err != nil {
 		return err
 	}
-
+	if val == 0 {
+		return store.ErrNotFound
+	}
 	return nil
 }

-func (r *Store) Read(ctx context.Context, key string, val interface{}, opts ...store.ReadOption) error {
-	b := r.pool.Get()
-	defer r.pool.Put(b)
-
-	options := store.NewReadOptions(opts...)
-
-	timeout := r.opts.Timeout
-	if options.Timeout > 0 {
-		timeout = options.Timeout
-	}
-
-	if timeout > 0 {
+func (r *Store) Read(ctx context.Context, key string, val interface{}, opts ...options.Option) error {
+	if r.opts.Timeout > 0 {
 		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(ctx, timeout)
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
 		defer cancel()
 	}
+	options := store.NewReadOptions(opts...)
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
+	}
+	if options.Namespace != "" {
+		key = fmt.Sprintf("%s%s", options.Namespace, key)
+	}

-	rkey := r.getKey(b, r.opts.Namespace, options.Namespace, key)
-
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
-	ts := time.Now()
-	buf, err := r.cli.Get(ctx, rkey).Bytes()
-	setSpanError(ctx, err)
-	te := time.Since(ts)
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Dec()
-	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if err == goredis.Nil || (err == nil && buf == nil) {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
+	buf, err := r.cli.Get(ctx, key).Bytes()
+	if err != nil && err == redis.Nil {
 		return store.ErrNotFound
-	} else if err == nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
 	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
 		return err
 	}
-
-	switch b := val.(type) {
-	case *[]byte:
-		*b = buf
-	case *string:
-		*b = string(buf)
-	default:
-		if err = r.opts.Codec.Unmarshal(buf, val); err != nil {
-			setSpanError(ctx, err)
-		}
+	if buf == nil {
+		return store.ErrNotFound
 	}
-
-	return err
+	return r.opts.Codec.Unmarshal(buf, val)
 }

-func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts ...store.ReadOption) error {
-	options := store.NewReadOptions(opts...)
-
-	timeout := r.opts.Timeout
-	if options.Timeout > 0 {
-		timeout = options.Timeout
+func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts ...options.Option) error {
+	if len(keys) == 1 {
+		vt := reflect.ValueOf(vals)
+		if vt.Kind() == reflect.Ptr {
+			vt = reflect.Indirect(vt)
+			return r.Read(ctx, keys[0], vt.Index(0).Interface(), opts...)
+		}
 	}
-
-	if timeout > 0 {
+	if r.opts.Timeout > 0 {
 		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(ctx, timeout)
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
 		defer cancel()
 	}
-
-	var rkeys []string
-	var pools []*strings.Builder
-	if r.opts.Namespace != "" || options.Namespace != "" {
-		rkeys = make([]string, len(keys))
-		pools = make([]*strings.Builder, len(keys))
-		for idx, key := range keys {
-			b := r.pool.Get()
-			pools[idx] = b
-			rkeys[idx] = r.getKey(b, r.opts.Namespace, options.Namespace, key)
+	options := store.NewReadOptions(opts...)
+	rkeys := make([]string, 0, len(keys))
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
+	}
+	for _, key := range keys {
+		if options.Namespace != "" {
+			rkeys = append(rkeys, fmt.Sprintf("%s%s", options.Namespace, key))
+		} else {
+			rkeys = append(rkeys, key)
 		}
 	}

-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
-	ts := time.Now()
-	var rvals []interface{}
-	var err error
-	if r.opts.Namespace != "" || options.Namespace != "" {
-		rvals, err = r.cli.MGet(ctx, rkeys...).Result()
-		for idx := range pools {
-			r.pool.Put(pools[idx])
-		}
-	} else {
-		rvals, err = r.cli.MGet(ctx, keys...).Result()
-	}
-	setSpanError(ctx, err)
-	te := time.Since(ts)
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Dec()
-	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if err == goredis.Nil || (len(rvals) == 0) {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
+	rvals, err := r.cli.MGet(ctx, rkeys...).Result()
+	if err != nil && err == redis.Nil {
 		return store.ErrNotFound
-	} else if err == nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
 	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
 		return err
 	}
+	if len(rvals) == 0 {
+		return store.ErrNotFound
+	}

 	vv := reflect.ValueOf(vals)
 	vt := reflect.TypeOf(vals)
@@ -285,137 +146,77 @@ func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts
 		// special case for raw data
 		if vt.Kind() == reflect.Slice && vt.Elem().Kind() == reflect.Uint8 {
 			itm.Set(reflect.MakeSlice(itm.Type(), len(buf), len(buf)))
-			itm.SetBytes(buf)
-			continue
-		} else if vt.Kind() == reflect.String {
-			itm.SetString(string(buf))
-			continue
+		} else {
+			itm.Set(reflect.New(vt.Elem()))
 		}
-
-		itm.Set(reflect.New(vt.Elem()))
 		if err = r.opts.Codec.Unmarshal(buf, itm.Interface()); err != nil {
-			setSpanError(ctx, err)
 			return err
 		}
 	}
 	vv.Set(nvv)
-
 	return nil
 }

-func (r *Store) MDelete(ctx context.Context, keys []string, opts ...store.DeleteOption) error {
-	options := store.NewDeleteOptions(opts...)
-
-	timeout := r.opts.Timeout
-	if options.Timeout > 0 {
-		timeout = options.Timeout
+func (r *Store) MDelete(ctx context.Context, keys []string, opts ...options.Option) error {
+	if len(keys) == 1 {
+		return r.Delete(ctx, keys[0], opts...)
 	}
-
-	if timeout > 0 {
+	if r.opts.Timeout > 0 {
 		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(ctx, timeout)
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
 		defer cancel()
 	}
-
-	var rkeys []string
-	var pools []*strings.Builder
-	if r.opts.Namespace != "" || options.Namespace != "" {
-		rkeys = make([]string, len(keys))
-		pools = make([]*strings.Builder, len(keys))
-		for idx, key := range keys {
-			b := r.pool.Get()
-			pools[idx] = b
-			rkeys[idx] = r.getKey(b, r.opts.Namespace, options.Namespace, key)
-		}
+	options := store.NewDeleteOptions(opts...)
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
 	}
-
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
-	ts := time.Now()
-	var err error
-	if r.opts.Namespace != "" || options.Namespace != "" {
-		err = r.cli.Del(ctx, rkeys...).Err()
-		for idx := range pools {
-			r.pool.Put(pools[idx])
-		}
-	} else {
-		err = r.cli.Del(ctx, keys...).Err()
+	if options.Namespace == "" {
+		return r.cli.Del(ctx, keys...).Err()
 	}
-	setSpanError(ctx, err)
-	te := time.Since(ts)
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Dec()
-	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if err == goredis.Nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
-		return store.ErrNotFound
-	} else if err == nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
-	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
-		return err
+	for idx := range keys {
+		keys[idx] = options.Namespace + keys[idx]
 	}
-
-	return nil
+	return r.cli.Del(ctx, keys...).Err()
 }

-func (r *Store) Delete(ctx context.Context, key string, opts ...store.DeleteOption) error {
-	b := r.pool.Get()
-	defer r.pool.Put(b)
-
-	options := store.NewDeleteOptions(opts...)
-
-	timeout := r.opts.Timeout
-	if options.Timeout > 0 {
-		timeout = options.Timeout
-	}
-
-	if timeout > 0 {
+func (r *Store) Delete(ctx context.Context, key string, opts ...options.Option) error {
+	if r.opts.Timeout > 0 {
 		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(ctx, timeout)
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
 		defer cancel()
 	}
-
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
-	ts := time.Now()
-	err := r.cli.Del(ctx, r.getKey(b, r.opts.Namespace, options.Namespace, key)).Err()
-	te := time.Since(ts)
-	setSpanError(ctx, err)
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Dec()
-	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if err == goredis.Nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
-		return store.ErrNotFound
-	} else if err == nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
-	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
-		return err
+	options := store.NewDeleteOptions(opts...)
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
 	}
-
-	return nil
+	if options.Namespace == "" {
+		return r.cli.Del(ctx, key).Err()
+	}
+	return r.cli.Del(ctx, fmt.Sprintf("%s%s", options.Namespace, key)).Err()
 }

-func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, opts ...store.WriteOption) error {
+func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, opts ...options.Option) error {
+	if len(keys) == 1 {
+		return r.Write(ctx, keys[0], vals[0], opts...)
+	}
+	if r.opts.Timeout > 0 {
+		var cancel context.CancelFunc
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
+		defer cancel()
+	}
 	options := store.NewWriteOptions(opts...)
-
-	timeout := r.opts.Timeout
-	if options.Timeout > 0 {
-		timeout = options.Timeout
-	}
-
-	if timeout > 0 {
-		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(ctx, timeout)
-		defer cancel()
-	}
-
 	kvs := make([]string, 0, len(keys)*2)
-	pools := make([]*strings.Builder, len(keys))
+
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
+	}
+
 	for idx, key := range keys {
-		b := r.pool.Get()
-		pools[idx] = b
-		kvs = append(kvs, r.getKey(b, r.opts.Namespace, options.Namespace, key))
+		if options.Namespace != "" {
+			kvs = append(kvs, fmt.Sprintf("%s%s", options.Namespace, key))
+		} else {
+			kvs = append(kvs, key)
+		}

 		switch vt := vals[idx].(type) {
 		case string:
@@ -431,47 +232,21 @@ func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, o
 		}
 	}

-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
-
-	pipeliner := func(pipe goredis.Pipeliner) error {
+	cmds, err := r.cli.Pipelined(ctx, func(pipe redis.Pipeliner) error {
+		var err error
 		for idx := 0; idx < len(kvs); idx += 2 {
-			if _, err := pipe.Set(ctx, kvs[idx], kvs[idx+1], options.TTL).Result(); err != nil {
-				setSpanError(ctx, err)
+			if _, err = pipe.Set(ctx, kvs[idx], kvs[idx+1], options.TTL).Result(); err != nil {
 				return err
 			}
 		}
 		return nil
-	}
-
-	ts := time.Now()
-	cmds, err := r.cli.Pipelined(ctx, pipeliner)
-	for idx := range pools {
-		r.pool.Put(pools[idx])
-	}
-	te := time.Since(ts)
-	setSpanError(ctx, err)
-
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Dec()
-	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if err == goredis.Nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
-		return store.ErrNotFound
-	} else if err == nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
-	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
+	})
+	if err != nil {
 		return err
 	}

 	for _, cmd := range cmds {
 		if err = cmd.Err(); err != nil {
-			if err == goredis.Nil {
-				r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
-				return store.ErrNotFound
-			}
-			setSpanError(ctx, err)
-			r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
 			return err
 		}
 	}
@@ -479,24 +254,17 @@ func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, o
 	return nil
 }

-func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...store.WriteOption) error {
-	b := r.pool.Get()
-	defer r.pool.Put(b)
-
-	options := store.NewWriteOptions(opts...)
-
-	timeout := r.opts.Timeout
-	if options.Timeout > 0 {
-		timeout = options.Timeout
-	}
-
-	if timeout > 0 {
+func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...options.Option) error {
+	if r.opts.Timeout > 0 {
 		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(ctx, timeout)
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
 		defer cancel()
 	}

-	rkey := r.getKey(b, r.opts.Namespace, options.Namespace, key)
+	options := store.NewWriteOptions(opts...)
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
+	}

 	var buf []byte
 	switch vt := val.(type) {
@@ -512,100 +280,42 @@ func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...
 		}
 	}

-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
-	ts := time.Now()
-	err := r.cli.Set(ctx, rkey, buf, options.TTL).Err()
-	te := time.Since(ts)
-	setSpanError(ctx, err)
-
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Dec()
-	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if err == goredis.Nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
-		return store.ErrNotFound
-	} else if err == nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
-	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
-		return err
+	if options.Namespace != "" {
+		key = fmt.Sprintf("%s%s", options.Namespace, key)
 	}

-	return err
+	return r.cli.Set(ctx, key, buf, options.TTL).Err()
 }

-func (r *Store) List(ctx context.Context, opts ...store.ListOption) ([]string, error) {
-	b := r.pool.Get()
-	defer r.pool.Put(b)
-
+func (r *Store) List(ctx context.Context, opts ...options.Option) ([]string, error) {
 	options := store.NewListOptions(opts...)
 	if len(options.Namespace) == 0 {
 		options.Namespace = r.opts.Namespace
 	}

-	rkey := r.getKey(b, options.Namespace, "", options.Prefix+"*")
+	rkey := fmt.Sprintf("%s%s*", options.Namespace, options.Prefix)
 	if options.Suffix != "" {
 		rkey += options.Suffix
 	}
-
-	timeout := r.opts.Timeout
-	if options.Timeout > 0 {
-		timeout = options.Timeout
-	}
-
-	if timeout > 0 {
+	if r.opts.Timeout > 0 {
 		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(ctx, timeout)
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
 		defer cancel()
 	}
-
 	// TODO: add support for prefix/suffix/limit
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
-	ts := time.Now()
-	var keys []string
-	var err error
-
-	if c, ok := r.cli.(*goredis.ClusterClient); ok {
-		err = c.ForEachMaster(ctx, func(nctx context.Context, cli *goredis.Client) error {
-			nkeys, nerr := cli.Keys(nctx, rkey).Result()
-			if nerr != nil {
-				return nerr
-			}
-			keys = append(keys, nkeys...)
-			return nil
-		})
-	} else {
-		keys, err = r.cli.Keys(ctx, rkey).Result()
-	}
-	te := time.Since(ts)
-	setSpanError(ctx, err)
-
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Dec()
-	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if err == goredis.Nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
-		return nil, store.ErrNotFound
-	} else if err == nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
-	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
+	keys, err := r.cli.Keys(ctx, rkey).Result()
+	if err != nil {
 		return nil, err
 	}
-
-	prefix := r.opts.Namespace
-	if options.Namespace != "" {
-		prefix = options.Namespace
-	}
-	if prefix == "" {
+	if options.Namespace == "" {
 		return keys, nil
 	}

-	for idx, key := range keys {
-		keys[idx] = strings.TrimPrefix(key, prefix)
+	nkeys := make([]string, 0, len(keys))
+	for _, key := range keys {
+		nkeys = append(nkeys, strings.TrimPrefix(key, options.Namespace))
 	}
-
-	return keys, nil
+	return nkeys, nil
 }

 func (r *Store) Options() store.Options {
@@ -620,114 +330,60 @@ func (r *Store) String() string {
 	return "redis"
 }

-func NewStore(opts ...store.Option) *Store {
-	return &Store{done: make(chan struct{}), opts: store.NewOptions(opts...)}
+func NewStore(opts ...options.Option) *Store {
+	return &Store{opts: store.NewOptions(opts...)}
 }

-func (r *Store) configure() error {
-	if r.cli != nil && r.opts.Context == nil {
+func (r *Store) configure(opts ...options.Option) error {
+	if r.cli != nil && len(opts) == 0 {
 		return nil
 	}

-	universalOptions := DefaultUniversalOptions
+	var redisUniversalOptions *redis.UniversalOptions
+	var err error
+
+	for _, o := range opts {
+		if err = o(r.opts); err != nil {
+			return err
+		}
+	}

 	if r.opts.Context != nil {
-		if o, ok := r.opts.Context.Value(configKey{}).(*goredis.Options); ok {
-			universalOptions.Addrs = []string{o.Addr}
-			universalOptions.Dialer = o.Dialer
-			universalOptions.OnConnect = o.OnConnect
-			universalOptions.Username = o.Username
-			universalOptions.Password = o.Password
-
-			universalOptions.MaxRetries = o.MaxRetries
-			universalOptions.MinRetryBackoff = o.MinRetryBackoff
-			universalOptions.MaxRetryBackoff = o.MaxRetryBackoff
-
-			universalOptions.DialTimeout = o.DialTimeout
-			universalOptions.ReadTimeout = o.ReadTimeout
-			universalOptions.WriteTimeout = o.WriteTimeout
-			universalOptions.ContextTimeoutEnabled = o.ContextTimeoutEnabled
-
-			universalOptions.PoolFIFO = o.PoolFIFO
-
-			universalOptions.PoolSize = o.PoolSize
-			universalOptions.PoolTimeout = o.PoolTimeout
-			universalOptions.MinIdleConns = o.MinIdleConns
-			universalOptions.MaxIdleConns = o.MaxIdleConns
-			universalOptions.ConnMaxIdleTime = o.ConnMaxIdleTime
-			universalOptions.ConnMaxLifetime = o.ConnMaxLifetime
-
+		if c, ok := r.opts.Context.Value(universalConfigKey{}).(*redis.UniversalOptions); ok {
+			redisUniversalOptions = c
 			if r.opts.TLSConfig != nil {
-				universalOptions.TLSConfig = r.opts.TLSConfig
-			}
-		}
-
-		if o, ok := r.opts.Context.Value(clusterConfigKey{}).(*goredis.ClusterOptions); ok {
-			universalOptions.Addrs = o.Addrs
-			universalOptions.Dialer = o.Dialer
-			universalOptions.OnConnect = o.OnConnect
-			universalOptions.Username = o.Username
-			universalOptions.Password = o.Password
-
-			universalOptions.MaxRedirects = o.MaxRedirects
-			universalOptions.ReadOnly = o.ReadOnly
-			universalOptions.RouteByLatency = o.RouteByLatency
-			universalOptions.RouteRandomly = o.RouteRandomly
-
-			universalOptions.MaxRetries = o.MaxRetries
-			universalOptions.MinRetryBackoff = o.MinRetryBackoff
-			universalOptions.MaxRetryBackoff = o.MaxRetryBackoff
-
-			universalOptions.DialTimeout = o.DialTimeout
-			universalOptions.ReadTimeout = o.ReadTimeout
-			universalOptions.WriteTimeout = o.WriteTimeout
-			universalOptions.ContextTimeoutEnabled = o.ContextTimeoutEnabled
-
-			universalOptions.PoolFIFO = o.PoolFIFO
-
-			universalOptions.PoolSize = o.PoolSize
-			universalOptions.PoolTimeout = o.PoolTimeout
-			universalOptions.MinIdleConns = o.MinIdleConns
-			universalOptions.MaxIdleConns = o.MaxIdleConns
-			universalOptions.ConnMaxIdleTime = o.ConnMaxIdleTime
-			universalOptions.ConnMaxLifetime = o.ConnMaxLifetime
-			if r.opts.TLSConfig != nil {
-				universalOptions.TLSConfig = r.opts.TLSConfig
-			}
-		}
-
-		if o, ok := r.opts.Context.Value(universalConfigKey{}).(*goredis.UniversalOptions); ok {
-			universalOptions = o
-			if r.opts.TLSConfig != nil {
-				universalOptions.TLSConfig = r.opts.TLSConfig
+				redisUniversalOptions.TLSConfig = r.opts.TLSConfig
 			}
 		}
 	}

-	if len(r.opts.Addrs) > 0 {
-		universalOptions.Addrs = r.opts.Addrs
-	} else {
-		universalOptions.Addrs = []string{"127.0.0.1:6379"}
+	if redisUniversalOptions == nil && r.cli != nil {
+		return nil
 	}

-	r.cli = goredis.NewUniversalClient(universalOptions)
-	setTracing(r.cli, r.opts.Tracer)
+	if redisUniversalOptions == nil {
+		redisUniversalOptions = &redis.UniversalOptions{
+			Username:        "",
+			Password:        "", // no password set
+			DB:              0,  // use default DB
+			MaxRetries:      2,
+			MaxRetryBackoff: 256 * time.Millisecond,
+			DialTimeout:     1 * time.Second,
+			ReadTimeout:     1 * time.Second,
+			WriteTimeout:    1 * time.Second,
+			PoolTimeout:     1 * time.Second,
+			MinIdleConns:    10,
+			TLSConfig:       r.opts.TLSConfig,
+		}
+	}

-	r.pool = pool.NewStringsPool(50)
+	if len(r.opts.Address) > 0 {
+		redisUniversalOptions.Addrs = r.opts.Address
+	} else if len(redisUniversalOptions.Addrs) == 0 {
+		redisUniversalOptions.Addrs = []string{"redis://127.0.0.1:6379"}
+	}

-	r.statsMeter()
+	r.cli = redis.NewUniversalClient(redisUniversalOptions)

 	return nil
 }
-
-func (r *Store) getKey(b *strings.Builder, mainNamespace string, opNamespace string, key string) string {
-	if opNamespace == "" {
-		opNamespace = mainNamespace
-	}
-	if opNamespace != "" {
-		b.WriteString(opNamespace)
-		b.WriteString(DefaultPathSeparator)
-	}
-	b.WriteString(key)
-	return b.String()
-}
--- a/redis_test.go
+++ b/redis_test.go
@@ -7,42 +7,15 @@ import (
 	"testing"
 	"time"

-	goredis "github.com/redis/go-redis/v9"
-	"go.unistack.org/micro/v3/store"
-	"go.unistack.org/micro/v3/tracer"
+	"github.com/redis/go-redis/v9"
+	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v4/store"
 )

-func TestKeepTTL(t *testing.T) {
-	ctx := context.Background()
-
-	if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
-		t.Skip()
-	}
-	r := NewStore(store.Addrs(os.Getenv("STORE_NODES")))
-
-	if err := r.Init(); err != nil {
-		t.Fatal(err)
-	}
-	if err := r.Connect(ctx); err != nil {
-		t.Fatal(err)
-	}
-
-	key := "key"
-	err := r.Write(ctx, key, "val1", store.WriteTTL(15*time.Second))
-	if err != nil {
-		t.Fatalf("Write error: %v", err)
-	}
-	time.Sleep(3 * time.Second)
-	err = r.Write(ctx, key, "val2", store.WriteTTL(-1))
-	if err != nil {
-		t.Fatalf("Write error: %v", err)
-	}
-}
-
 func Test_rkv_configure(t *testing.T) {
 	type fields struct {
 		options store.Options
-		Client  goredis.UniversalClient
+		Client  *redis.Client
 	}
 	type wantValues struct {
 		username string
@@ -65,7 +38,7 @@ func Test_rkv_configure(t *testing.T) {
 			},
 		},
 		{
-			name: "legacy Url", fields: fields{options: store.Options{Tracer: tracer.DefaultTracer, Addrs: []string{"127.0.0.1:6379"}}, Client: nil},
+			name: "legacy Url", fields: fields{options: store.Options{Address: []string{"127.0.0.1:6379"}}, Client: nil},
 			wantErr: false, want: wantValues{
 				username: "",
 				password: "",
@@ -73,7 +46,7 @@ func Test_rkv_configure(t *testing.T) {
 			},
 		},
 		{
-			name: "New Url", fields: fields{options: store.Options{Tracer: tracer.DefaultTracer, Addrs: []string{"redis://127.0.0.1:6379"}}, Client: nil},
+			name: "New Url", fields: fields{options: store.Options{Address: []string{"redis://127.0.0.1:6379"}}, Client: nil},
 			wantErr: false, want: wantValues{
 				username: "",
 				password: "",
@@ -81,7 +54,7 @@ func Test_rkv_configure(t *testing.T) {
 			},
 		},
 		{
-			name: "Url with Pwd", fields: fields{options: store.Options{Tracer: tracer.DefaultTracer, Addrs: []string{"redis://:password@redis:6379"}}, Client: nil},
+			name: "Url with Pwd", fields: fields{options: store.Options{Address: []string{"redis://:password@redis:6379"}}, Client: nil},
 			wantErr: false, want: wantValues{
 				username: "",
 				password: "password",
@@ -89,7 +62,7 @@ func Test_rkv_configure(t *testing.T) {
 			},
 		},
 		{
-			name: "Url with username and Pwd", fields: fields{options: store.Options{Tracer: tracer.DefaultTracer, Addrs: []string{"redis://username:password@redis:6379"}}, Client: nil},
+			name: "Url with username and Pwd", fields: fields{options: store.Options{Address: []string{"redis://username:password@redis:6379"}}, Client: nil},
 			wantErr: false, want: wantValues{
 				username: "username",
 				password: "password",
@@ -118,7 +91,7 @@ func Test_Store(t *testing.T) {
 	if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
 		t.Skip()
 	}
-	r := NewStore(store.Addrs(os.Getenv("STORE_NODES")))
+	r := NewStore(options.Address(os.Getenv("STORE_NODES")))

 	if err := r.Init(); err != nil {
 		t.Fatal(err)
@@ -158,7 +131,7 @@ func Test_MRead(t *testing.T) {
 	if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
 		t.Skip()
 	}
-	r := NewStore(store.Addrs(os.Getenv("STORE_NODES")))
+	r := NewStore(options.Address(os.Getenv("STORE_NODES")))

 	if err = r.Init(); err != nil {
 		t.Fatal(err)
--- a/stats.go
+++ b/stats.go
@@ -1,52 +0,0 @@
-package redis
-
-import (
-	"time"
-
-	goredis "github.com/redis/go-redis/v9"
-	"go.unistack.org/micro/v3/meter"
-)
-
-var (
-	PoolHitsTotal        = "pool_hits_total"
-	PoolMissesTotal      = "pool_misses_total"
-	PoolTimeoutTotal     = "pool_timeout_total"
-	PoolConnTotalCurrent = "pool_conn_total_current"
-	PoolConnIdleCurrent  = "pool_conn_idle_current"
-	PoolConnStaleTotal   = "pool_conn_stale_total"
-)
-
-type Statser interface {
-	PoolStats() *goredis.PoolStats
-}
-
-func (r *Store) statsMeter() {
-	var st Statser
-
-	if r.cli != nil {
-		st = r.cli
-	} else {
-		return
-	}
-
-	go func() {
-		ticker := time.NewTicker(meter.DefaultMeterStatsInterval)
-		defer ticker.Stop()
-
-		for {
-			select {
-			case <-ticker.C:
-				if st == nil {
-					return
-				}
-				stats := st.PoolStats()
-				r.opts.Meter.Counter(PoolHitsTotal).Set(uint64(stats.Hits))
-				r.opts.Meter.Counter(PoolMissesTotal).Set(uint64(stats.Misses))
-				r.opts.Meter.Counter(PoolTimeoutTotal).Set(uint64(stats.Timeouts))
-				r.opts.Meter.Counter(PoolConnTotalCurrent).Set(uint64(stats.TotalConns))
-				r.opts.Meter.Counter(PoolConnIdleCurrent).Set(uint64(stats.IdleConns))
-				r.opts.Meter.Counter(PoolConnStaleTotal).Set(uint64(stats.StaleConns))
-			}
-		}
-	}()
-}
--- a/tracer.go
+++ b/tracer.go
@@ -1,128 +0,0 @@
-package redis
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"strconv"
-
-	rediscmd "github.com/redis/go-redis/extra/rediscmd/v9"
-	goredis "github.com/redis/go-redis/v9"
-	"go.unistack.org/micro/v3/tracer"
-)
-
-func setTracing(rdb goredis.UniversalClient, tr tracer.Tracer, opts ...tracer.SpanOption) {
-	switch rdb := rdb.(type) {
-	case *goredis.Client:
-		opt := rdb.Options()
-		connString := formatDBConnString(opt.Network, opt.Addr)
-		rdb.AddHook(newTracingHook(connString, tr))
-	case *goredis.ClusterClient:
-		rdb.OnNewNode(func(rdb *goredis.Client) {
-			opt := rdb.Options()
-			connString := formatDBConnString(opt.Network, opt.Addr)
-			rdb.AddHook(newTracingHook(connString, tr))
-		})
-	case *goredis.Ring:
-		rdb.OnNewNode(func(rdb *goredis.Client) {
-			opt := rdb.Options()
-			connString := formatDBConnString(opt.Network, opt.Addr)
-			rdb.AddHook(newTracingHook(connString, tr))
-		})
-	}
-}
-
-type tracingHook struct {
-	tr   tracer.Tracer
-	opts []tracer.SpanOption
-}
-
-var _ goredis.Hook = (*tracingHook)(nil)
-
-func newTracingHook(connString string, tr tracer.Tracer, opts ...tracer.SpanOption) *tracingHook {
-	opts = append(opts, tracer.WithSpanKind(tracer.SpanKindClient))
-	if connString != "" {
-		opts = append(opts, tracer.WithSpanLabels("db.connection_string", connString))
-	}
-
-	return &tracingHook{
-		tr:   tr,
-		opts: opts,
-	}
-}
-
-func (h *tracingHook) DialHook(hook goredis.DialHook) goredis.DialHook {
-	return func(ctx context.Context, network, addr string) (net.Conn, error) {
-		/*
-			_, span := h.tr.Start(ctx, "goredis.dial", h.opts...)
-			defer span.Finish()
-		*/
-		conn, err := hook(ctx, network, addr)
-		// recordError(span, err)
-
-		return conn, err
-	}
-}
-
-func (h *tracingHook) ProcessHook(hook goredis.ProcessHook) goredis.ProcessHook {
-	return func(ctx context.Context, cmd goredis.Cmder) error {
-		cmdString := rediscmd.CmdString(cmd)
-		var err error
-
-		switch cmdString {
-		case "cluster slots":
-			break
-		default:
-			_, span := h.tr.Start(ctx, "goredis.process", append(h.opts, tracer.WithSpanLabels("db.statement", cmdString))...)
-			defer func() {
-				recordError(span, err)
-				span.Finish()
-			}()
-		}
-
-		err = hook(ctx, cmd)
-
-		return err
-	}
-}
-
-func (h *tracingHook) ProcessPipelineHook(hook goredis.ProcessPipelineHook) goredis.ProcessPipelineHook {
-	return func(ctx context.Context, cmds []goredis.Cmder) error {
-		_, cmdsString := rediscmd.CmdsString(cmds)
-
-		opts := append(h.opts, tracer.WithSpanLabels(
-			"db.goredis.num_cmd", strconv.Itoa(len(cmds)),
-			"db.statement", cmdsString,
-		))
-
-		_, span := h.tr.Start(ctx, "goredis.process_pipeline", opts...)
-		defer span.Finish()
-
-		err := hook(ctx, cmds)
-		recordError(span, err)
-
-		return err
-	}
-}
-
-func setSpanError(ctx context.Context, err error) {
-	if err == nil || err == goredis.Nil {
-		return
-	}
-	if sp, ok := tracer.SpanFromContext(ctx); !ok && sp != nil {
-		sp.SetStatus(tracer.SpanStatusError, err.Error())
-	}
-}
-
-func recordError(span tracer.Span, err error) {
-	if err != nil && err != goredis.Nil {
-		span.SetStatus(tracer.SpanStatusError, err.Error())
-	}
-}
-
-func formatDBConnString(network, addr string) string {
-	if network == "tcp" {
-		network = "redis"
-	}
-	return fmt.Sprintf("%s://%s", network, addr)
-}
Author	SHA1	Message	Date
Василий Толстов	512531e797	Merge pull request 'Update workflows' (#127 ) from atolstikhin/micro-store-redis:master into master All checks were successful test / test (push) Successful in 3m5s Details Reviewed-on: #127	2024-12-15 23:09:54 +03:00
Василий Толстов	54cb7188b8	Merge branch 'master' into master Some checks failed automerge / automerge (pull_request) Failing after 15s Details autoapprove / autoapprove (pull_request) Failing after 2m0s Details lint / lint (pull_request) Successful in 4m52s Details dependabot-automerge / automerge (pull_request) Failing after 14m56s Details test / test (pull_request) Successful in 17m34s Details	2024-12-15 22:10:20 +03:00
Vasiliy Tolstov	21d40b8e69	fixup lint Some checks failed build / lint (push) Successful in 29s Details build / test (push) Failing after 37s Details codeql / analyze (go) (push) Failing after 7m23s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-12-15 22:09:59 +03:00
Aleksandr Tolstikhin	b61b8081b7	Update workflows Some checks failed automerge / automerge (pull_request) Has been skipped Details dependabot-automerge / automerge (pull_request) Has been skipped Details lint / lint (pull_request) Failing after 51s Details test / test (pull_request) Failing after 10m53s Details autoapprove / autoapprove (pull_request) Failing after 10m47s Details	2024-12-14 01:52:20 +07:00
Александр Толстихин	c8d21b4ef4	Replace RedisCluster to RedisUniversalClient (#114 ) Some checks failed build / test (push) Failing after 12s Details build / lint (push) Failing after 15s Details codeql / analyze (go) (push) Failing after 14m50s Details 1. Replace redis.Client to redis.UniversalClient 2. Replace ClusterConfig to UniversalConfig closes #113 Co-authored-by: Aleksandr Tolstikhin <atolstikhin@mtsbank.ru> Co-authored-by: Vasiliy Tolstov <v.tolstov@unistack.org> Reviewed-on: #114 Reviewed-by: Василий Толстов <v.tolstov@unistack.org> Co-authored-by: Александр Толстихин <tolstihin1996@mail.ru> Co-committed-by: Александр Толстихин <tolstihin1996@mail.ru>	2024-10-04 00:20:23 +03:00
Vasiliy Tolstov	195c604a31	Merge pull request 'add ability to get *redis.Client' (#111 ) from redis into master Some checks failed build / test (push) Failing after 1m28s Details build / lint (push) Failing after 2m34s Details codeql / analyze (go) (push) Failing after 2m44s Details Reviewed-on: #111	2023-12-12 13:53:00 +03:00
Vasiliy Tolstov	b263b69031	add ability to get *redis.Client Some checks failed codeql / analyze (go) (pull_request) Failing after 2m41s Details prbuild / test (pull_request) Failing after 1m29s Details prbuild / lint (pull_request) Failing after 2m34s Details autoapprove / autoapprove (pull_request) Failing after 1m26s Details automerge / automerge (pull_request) Failing after 4s Details dependabot-automerge / automerge (pull_request) Has been skipped Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-12-12 13:52:37 +03:00
Vasiliy Tolstov	4459bfa1a0	Merge pull request 'add mwrite func' (#109 ) from mwrite into master Reviewed-on: #109	2023-10-21 00:58:08 +03:00
Vasiliy Tolstov	b90361e48a	add MWrite func Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-10-21 00:57:12 +03:00