update from v3

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

.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'

.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 ./...

.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

.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"

.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 }}

.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}}

.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

.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

.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}}

.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

.golangci.yml

@@ -0,0 +1,5 @@
+run:
+  concurrency: 8
+  deadline: 5m
+  issues-exit-code: 1
+  tests: true

event.go

@@ -0,0 +1,86 @@
+package redis
+
+import (
+	"context"
+	"errors"
+	"net"
+	"time"
+
+	goredis "github.com/redis/go-redis/v9"
+	"go.unistack.org/micro/v4/store"
+)
+
+type eventHook struct {
+	s *Store
+}
+
+var _ goredis.Hook = (*eventHook)(nil)
+
+func newEventHook(s *Store) *eventHook {
+	return &eventHook{s: s}
+}
+
+func (h *eventHook) DialHook(hook goredis.DialHook) goredis.DialHook {
+	return func(ctx context.Context, network, addr string) (net.Conn, error) {
+		conn, err := hook(ctx, network, addr)
+		if err != nil {
+			if !isRedisError(err) {
+				if h.s.connected.CompareAndSwap(1, 0) {
+					h.s.sendEvent(&event{ts: time.Now(), err: err, t: store.EventTypeDisconnect})
+				}
+			} else {
+				h.s.connected.Store(1)
+			}
+		} else {
+			if h.s.connected.CompareAndSwap(0, 1) {
+				h.s.sendEvent(&event{ts: time.Now(), err: err, t: store.EventTypeConnect})
+			}
+		}
+		return conn, err
+	}
+}
+
+func (h *eventHook) ProcessHook(hook goredis.ProcessHook) goredis.ProcessHook {
+	return func(ctx context.Context, cmd goredis.Cmder) error {
+		err := hook(ctx, cmd)
+		if err != nil {
+			if !isRedisError(err) {
+				if h.s.connected.CompareAndSwap(1, 0) {
+					h.s.sendEvent(&event{ts: time.Now(), err: err, t: store.EventTypeDisconnect})
+				}
+			} else {
+				h.s.connected.Store(1)
+			}
+		} else {
+			if h.s.connected.CompareAndSwap(0, 1) {
+				h.s.sendEvent(&event{ts: time.Now(), err: err, t: store.EventTypeConnect})
+			}
+		}
+		return err
+	}
+}
+
+func (h *eventHook) ProcessPipelineHook(hook goredis.ProcessPipelineHook) goredis.ProcessPipelineHook {
+	return func(ctx context.Context, cmds []goredis.Cmder) error {
+		err := hook(ctx, cmds)
+		if err != nil {
+			if !isRedisError(err) {
+				if h.s.connected.CompareAndSwap(1, 0) {
+					h.s.sendEvent(&event{ts: time.Now(), err: err, t: store.EventTypeDisconnect})
+				}
+			} else {
+				h.s.connected.Store(1)
+			}
+		} else {
+			if h.s.connected.CompareAndSwap(0, 1) {
+				h.s.sendEvent(&event{ts: time.Now(), err: err, t: store.EventTypeConnect})
+			}
+		}
+		return err
+	}
+}
+
+func isRedisError(err error) bool {
+	var rerr goredis.Error
+	return errors.As(err, &rerr)
+}

go.mod

@@ -1,16 +1,24 @@
-module go.unistack.org/micro-store-redis/v3
+module go.unistack.org/micro-store-redis/v4
 
-go 1.21
+go 1.22.0
 
-toolchain go1.22.4
+toolchain go1.24.2
 
 require (
-	github.com/redis/go-redis/extra/rediscmd/v9 v9.5.3
-	github.com/redis/go-redis/v9 v9.5.3
-	go.unistack.org/micro/v3 v3.10.80
+	github.com/redis/go-redis/extra/rediscmd/v9 v9.7.0
+	github.com/redis/go-redis/v9 v9.7.0
+	go.unistack.org/micro/v4 v4.1.6
 )
 
 require (
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/ash3in/uuidv8 v1.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/matoous/go-nanoid v1.5.1 // indirect
+	github.com/spf13/cast v1.7.1 // indirect
+	go.unistack.org/micro-proto/v4 v4.1.0 // indirect
+	google.golang.org/protobuf v1.36.3 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,14 +1,43 @@
+github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
+github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
+github.com/ash3in/uuidv8 v1.2.0 h1:2oogGdtCPwaVtyvPPGin4TfZLtOGE5F+W++E880G6SI=
+github.com/ash3in/uuidv8 v1.2.0/go.mod h1:BnU0wJBxnzdEKmVg4xckBkD+VZuecTFTUP3M0dWgyY4=
 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.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/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.5.3 h1:fOAp1/uJG+ZtcITgZOfYFmTKPE7n4Vclj1wZFgRciUU=
-github.com/redis/go-redis/v9 v9.5.3/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
-go.unistack.org/micro/v3 v3.10.80 h1:A0zWNoM9MOcMg9gdFFgVkgbT3uSYVIINhuvumX9nP2o=
-go.unistack.org/micro/v3 v3.10.80/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+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/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/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/matoous/go-nanoid v1.5.1 h1:aCjdvTyO9LLnTIi0fgdXhOPPvOHjpXN6Ik9DaNjIct4=
+github.com/matoous/go-nanoid v1.5.1/go.mod h1:zyD2a71IubI24efhpvkJz+ZwfwagzgSO6UNiFsZKN7U=
+github.com/redis/go-redis/extra/rediscmd/v9 v9.7.0 h1:BIx9TNZH/Jsr4l1i7VVxnV0JPiwYj8qyrHyuL0fGZrk=
+github.com/redis/go-redis/extra/rediscmd/v9 v9.7.0/go.mod h1:eTg/YQtGYAZD5r3DlGlJptJ45AHA+/G+2NPn30PKzik=
+github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa9E=
+github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
+github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
+go.unistack.org/micro-proto/v4 v4.1.0 h1:qPwL2n/oqh9RE3RTTDgt28XK3QzV597VugQPaw9lKUk=
+go.unistack.org/micro-proto/v4 v4.1.0/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec=
+go.unistack.org/micro/v4 v4.1.6 h1:sYLpe1Vd8/lDwddtV0BLTvJ+i+fllXAS4fZngT1wKZ4=
+go.unistack.org/micro/v4 v4.1.6/go.mod h1:lr3oYED8Ay1vjK68QqRw30QOtdk/ffpZqMFDasOUhKw=
+google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=
+google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

options.go

@@ -1,33 +1,32 @@
 package redis
 
 import (
-	"time"
-
-	"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"
+	goredis "github.com/redis/go-redis/v9"
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/meter"
+	"go.unistack.org/micro/v4/store"
+	"go.unistack.org/micro/v4/tracer"
 )
 
 type configKey struct{}
 
-func Config(c *redis.Options) store.Option {
+func Config(c *goredis.Options) store.Option {
 	return store.SetOption(configKey{}, c)
 }
 
 type clusterConfigKey struct{}
 
-func ClusterConfig(c *redis.ClusterOptions) store.Option {
+func ClusterConfig(c *goredis.ClusterOptions) store.Option {
 	return store.SetOption(clusterConfigKey{}, c)
 }
 
-var (
-	// DefaultMeterStatsInterval holds default stats interval
-	DefaultMeterStatsInterval = 5 * time.Second
-	// DefaultMeterMetricPrefix holds default metric prefix
-	DefaultMeterMetricPrefix = "micro_store_"
+type universalConfigKey struct{}
 
+func UniversalConfig(c *goredis.UniversalOptions) store.Option {
+	return store.SetOption(universalConfigKey{}, c)
+}
+
+var (
 	labelHost = "redis_host"
 	labelName = "redis_name"
 )
@@ -37,8 +36,6 @@ type Options struct {
 	Logger    logger.Logger
 	Meter     meter.Meter
 	Tracer    tracer.Tracer
-	MeterMetricPrefix  string
-	MeterStatsInterval time.Duration
 	RedisHost string
 	RedisName string
 }
@@ -52,8 +49,6 @@ func NewOptions(opts ...Option) Options {
 		Logger: logger.DefaultLogger,
 		Meter:  meter.DefaultMeter,
 		Tracer: tracer.DefaultTracer,
-		MeterStatsInterval: DefaultMeterStatsInterval,
-		MeterMetricPrefix:  DefaultMeterMetricPrefix,
 	}
 
 	for _, o := range opts {
@@ -66,21 +61,7 @@ func NewOptions(opts ...Option) Options {
 			labelName, options.RedisName),
 	)
 
-	options.Logger = options.Logger.Clone(logger.WithCallerSkipCount(1))
+	options.Logger = options.Logger.Clone(logger.WithAddCallerSkipCount(1))
 
 	return options
 }
-
-// MetricInterval specifies stats interval for *sql.DB
-func MetricInterval(td time.Duration) Option {
-	return func(o *Options) {
-		o.MeterStatsInterval = td
-	}
-}
-
-// MetricPrefix specifies prefix for each metric
-func MetricPrefix(pref string) Option {
-	return func(o *Options) {
-		o.MeterMetricPrefix = pref
-	}
-}

redis.go

@@ -2,21 +2,25 @@ package redis
 
 import (
 	"context"
-	"fmt"
+	"errors"
 	"reflect"
 	"strings"
+	"sync"
+	"sync/atomic"
 	"time"
 
-	redis "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"
+	goredis "github.com/redis/go-redis/v9"
+	"go.unistack.org/micro/v4/semconv"
+	"go.unistack.org/micro/v4/store"
+	"go.unistack.org/micro/v4/util/id"
+	pool "go.unistack.org/micro/v4/util/xpool"
 )
 
 var (
-	DefaultPathSeparator = "/"
-
-	DefaultClusterOptions = &redis.ClusterOptions{
+	_                       store.Store = (*Store)(nil)
+	_                       store.Event = (*event)(nil)
+	sendEventTime                       = 10 * time.Millisecond
+	DefaultUniversalOptions             = &goredis.UniversalOptions{
 		Username:        "",
 		Password:        "", // no password set
 		MaxRetries:      2,
@@ -28,7 +32,19 @@ var (
 		MinIdleConns:    10,
 	}
 
-	DefaultOptions = &redis.Options{
+	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
@@ -43,33 +59,46 @@ var (
 )
 
 type Store struct {
+	cli       goredis.UniversalClient
+	pool      *pool.StringsPool
+	connected *atomic.Uint32
 	opts      store.Options
-	cli  *wrappedClient
-	done chan struct{}
-	pool pool.Pool[*strings.Builder]
+	watchers  map[string]*watcher
+	mu        sync.RWMutex
 }
 
-type wrappedClient struct {
-	*redis.Client
-	*redis.ClusterClient
+func (r *Store) Live() bool {
+	return r.connected.Load() == 1
+}
+
+func (r *Store) Ready() bool {
+	return r.connected.Load() == 1
+}
+
+func (r *Store) Health() bool {
+	return r.connected.Load() == 1
 }
 
 func (r *Store) Connect(ctx context.Context) error {
-	var err error
-	if r.cli.Client != nil {
-		err = r.cli.Client.Ping(ctx).Err()
+	if r.connected.Load() == 1 {
+		return nil
 	}
-	err = r.cli.ClusterClient.Ping(ctx).Err()
+	if r.cli == nil {
+		return store.ErrNotConnected
+	}
+	if r.opts.LazyConnect {
+		return nil
+	}
+	if err := r.cli.Ping(ctx).Err(); err != nil {
 		setSpanError(ctx, err)
 		return err
+	}
+	r.connected.Store(1)
+	return nil
 }
 
 func (r *Store) Init(opts ...store.Option) error {
-	for _, o := range opts {
-		o(&r.opts)
-	}
-
-	err := r.configure()
+	err := r.configure(opts...)
 	if err != nil {
 		return err
 	}
@@ -77,38 +106,45 @@ func (r *Store) Init(opts ...store.Option) error {
 	return nil
 }
 
-func (r *Store) Client() *redis.Client {
-	if r.cli.Client != nil {
-		return r.cli.Client
+func (r *Store) Client() *goredis.Client {
+	if c, ok := r.cli.(*goredis.Client); ok {
+		return c
 	}
 	return nil
 }
 
-func (r *Store) ClusterClient() *redis.ClusterClient {
-	if r.cli.ClusterClient != nil {
-		return r.cli.ClusterClient
+func (r *Store) UniversalClient() goredis.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.Client != nil {
-			err = r.cli.Client.Close()
-		} else if r.cli.ClusterClient != nil {
-			err = r.cli.ClusterClient.Close()
+	if r.connected.Load() == 0 {
+		return nil
 	}
-		close(r.done)
+
+	if r.cli != nil {
+		if err := r.cli.Close(); err != nil {
 			return err
 		}
+	}
+
+	r.connected.Store(1)
+	return nil
 }
 
 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...)
+	labels := make([]string, 0, 6)
+	labels = append(labels, "name", options.Name, "statement", "exists")
 
 	timeout := r.opts.Timeout
 	if options.Timeout > 0 {
@@ -121,29 +157,24 @@ func (r *Store) Exists(ctx context.Context, key string, opts ...store.ExistsOpti
 		defer cancel()
 	}
 
-	rkey := r.getKey(r.opts.Namespace, options.Namespace, key)
+	rkey := r.getKey(b, r.opts.Namespace, options.Namespace, key)
 
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Inc()
 	ts := time.Now()
-	var err error
-	var val int64
-	if r.cli.Client != nil {
-		val, err = r.cli.Client.Exists(ctx, rkey).Result()
-	} else {
-		val, err = r.cli.ClusterClient.Exists(ctx, rkey).Result()
-	}
+	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 == redis.Nil || (err == nil && val == 0) {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
+
+	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
+	if errors.Is(err, goredis.Nil) || (err == nil && val == 0) {
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "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()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "hit")...).Inc()
+	} else {
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
 		return err
 	}
 
@@ -151,7 +182,12 @@ func (r *Store) Exists(ctx context.Context, key string, opts ...store.ExistsOpti
 }
 
 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...)
+	labels := make([]string, 0, 6)
+	labels = append(labels, "name", options.Name, "statement", "read")
 
 	timeout := r.opts.Timeout
 	if options.Timeout > 0 {
@@ -164,29 +200,23 @@ func (r *Store) Read(ctx context.Context, key string, val interface{}, opts ...s
 		defer cancel()
 	}
 
-	rkey := r.getKey(r.opts.Namespace, options.Namespace, key)
+	rkey := r.getKey(b, r.opts.Namespace, options.Namespace, key)
 
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Inc()
 	ts := time.Now()
-	var buf []byte
-	var err error
-	if r.cli.Client != nil {
-		buf, err = r.cli.Client.Get(ctx, rkey).Bytes()
-	} else {
-		buf, err = r.cli.ClusterClient.Get(ctx, rkey).Bytes()
-	}
+	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 == redis.Nil || (err == nil && buf == nil) {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
+	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
+	if errors.Is(err, goredis.Nil) || (err == nil && buf == nil) {
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "miss")...).Inc()
 		return store.ErrNotFound
 	} else if err == nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "hit")...).Inc()
 	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
 		return err
 	}
 
@@ -219,10 +249,14 @@ func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts
 	}
 
 	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 {
-			rkeys[idx] = r.getKey(r.opts.Namespace, options.Namespace, key)
+			b := r.pool.Get()
+			pools[idx] = b
+			rkeys[idx] = r.getKey(b, r.opts.Namespace, options.Namespace, key)
 		}
 	}
 
@@ -231,24 +265,19 @@ func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts
 	var rvals []interface{}
 	var err error
 	if r.opts.Namespace != "" || options.Namespace != "" {
-		if r.cli.Client != nil {
-			rvals, err = r.cli.Client.MGet(ctx, rkeys...).Result()
-		} else {
-			rvals, err = r.cli.ClusterClient.MGet(ctx, rkeys...).Result()
+		rvals, err = r.cli.MGet(ctx, rkeys...).Result()
+		for idx := range pools {
+			r.pool.Put(pools[idx])
 		}
 	} else {
-		if r.cli.Client != nil {
-			rvals, err = r.cli.Client.MGet(ctx, keys...).Result()
-		} else {
-			rvals, err = r.cli.ClusterClient.MGet(ctx, keys...).Result()
-		}
+		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 == redis.Nil || (len(rvals) == 0) {
+	if err == goredis.Nil || (len(rvals) == 0) {
 		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
 		return store.ErrNotFound
 	} else if err == nil {
@@ -306,6 +335,8 @@ func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts
 
 func (r *Store) MDelete(ctx context.Context, keys []string, opts ...store.DeleteOption) error {
 	options := store.NewDeleteOptions(opts...)
+	labels := make([]string, 0, 6)
+	labels = append(labels, "name", options.Name, "statement", "delete")
 
 	timeout := r.opts.Timeout
 	if options.Timeout > 0 {
@@ -319,41 +350,40 @@ func (r *Store) MDelete(ctx context.Context, keys []string, opts ...store.Delete
 	}
 
 	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 {
-			rkeys[idx] = r.getKey(r.opts.Namespace, options.Namespace, key)
+			b := r.pool.Get()
+			pools[idx] = b
+			rkeys[idx] = r.getKey(b, r.opts.Namespace, options.Namespace, key)
 		}
 	}
 
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Inc()
 	ts := time.Now()
 	var err error
 	if r.opts.Namespace != "" || options.Namespace != "" {
-		if r.cli.Client != nil {
-			err = r.cli.Client.Del(ctx, rkeys...).Err()
-		} else {
-			err = r.cli.ClusterClient.Del(ctx, rkeys...).Err()
+		err = r.cli.Del(ctx, rkeys...).Err()
+		for idx := range pools {
+			r.pool.Put(pools[idx])
 		}
 	} else {
-		if r.cli.Client != nil {
-			err = r.cli.Client.Del(ctx, keys...).Err()
-		} else {
-			err = r.cli.ClusterClient.Del(ctx, keys...).Err()
-		}
+		err = 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 == redis.Nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
+	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
+	if err == goredis.Nil {
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "miss")...).Inc()
 		return store.ErrNotFound
 	} else if err == nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "hit")...).Inc()
 	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
 		return err
 	}
 
@@ -361,7 +391,12 @@ func (r *Store) MDelete(ctx context.Context, keys []string, opts ...store.Delete
 }
 
 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...)
+	labels := make([]string, 0, 6)
+	labels = append(labels, "name", options.Name, "statement", "delete")
 
 	timeout := r.opts.Timeout
 	if options.Timeout > 0 {
@@ -374,26 +409,22 @@ func (r *Store) Delete(ctx context.Context, key string, opts ...store.DeleteOpti
 		defer cancel()
 	}
 
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Inc()
 	ts := time.Now()
-	var err error
-	if r.cli.Client != nil {
-		err = r.cli.Client.Del(ctx, r.getKey(r.opts.Namespace, options.Namespace, key)).Err()
-	} else {
-		err = r.cli.ClusterClient.Del(ctx, r.getKey(r.opts.Namespace, options.Namespace, key)).Err()
-	}
-	setSpanError(ctx, err)
+	err := r.cli.Del(ctx, r.getKey(b, r.opts.Namespace, options.Namespace, key)).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 == redis.Nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
+	setSpanError(ctx, err)
+
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
+	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
+	if errors.Is(err, goredis.Nil) {
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "miss")...).Inc()
 		return store.ErrNotFound
 	} else if err == nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "hit")...).Inc()
 	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
 		return err
 	}
 
@@ -402,6 +433,8 @@ func (r *Store) Delete(ctx context.Context, key string, opts ...store.DeleteOpti
 
 func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, opts ...store.WriteOption) error {
 	options := store.NewWriteOptions(opts...)
+	labels := make([]string, 0, 6)
+	labels = append(labels, "name", options.Name, "statement", "write")
 
 	timeout := r.opts.Timeout
 	if options.Timeout > 0 {
@@ -415,9 +448,11 @@ func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, o
 	}
 
 	kvs := make([]string, 0, len(keys)*2)
-
+	pools := make([]*strings.Builder, len(keys))
 	for idx, key := range keys {
-		kvs = append(kvs, r.getKey(r.opts.Namespace, options.Namespace, key))
+		b := r.pool.Get()
+		pools[idx] = b
+		kvs = append(kvs, r.getKey(b, r.opts.Namespace, options.Namespace, key))
 
 		switch vt := vals[idx].(type) {
 		case string:
@@ -433,10 +468,9 @@ func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, o
 		}
 	}
 
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
-	ts := time.Now()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Inc()
 
-	pipeliner := func(pipe redis.Pipeliner) error {
+	pipeliner := func(pipe goredis.Pipeliner) 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)
@@ -446,37 +480,35 @@ func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, o
 		return nil
 	}
 
-	var err error
-	var cmds []redis.Cmder
-
-	if r.cli.Client != nil {
-		cmds, err = r.cli.Client.Pipelined(ctx, pipeliner)
-	} else {
-		cmds, err = r.cli.ClusterClient.Pipelined(ctx, pipeliner)
+	ts := time.Now()
+	cmds, err := r.cli.Pipelined(ctx, pipeliner)
+	for idx := range pools {
+		r.pool.Put(pools[idx])
 	}
-	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 == redis.Nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
+	setSpanError(ctx, err)
+
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
+	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
+	if err == goredis.Nil {
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "miss")...).Inc()
 		return store.ErrNotFound
 	} else if err == nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "hit")...).Inc()
 	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
 		return err
 	}
 
 	for _, cmd := range cmds {
 		if err = cmd.Err(); err != nil {
-			if err == redis.Nil {
-				r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
+			if err == goredis.Nil {
+				r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "miss")...).Inc()
 				return store.ErrNotFound
 			}
 			setSpanError(ctx, err)
-			r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
+			r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
 			return err
 		}
 	}
@@ -485,7 +517,12 @@ func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, o
 }
 
 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...)
+	labels := make([]string, 0, 6)
+	labels = append(labels, "name", options.Name, "statement", "write")
 
 	timeout := r.opts.Timeout
 	if options.Timeout > 0 {
@@ -498,7 +535,7 @@ func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...
 		defer cancel()
 	}
 
-	rkey := r.getKey(r.opts.Namespace, options.Namespace, key)
+	rkey := r.getKey(b, r.opts.Namespace, options.Namespace, key)
 
 	var buf []byte
 	switch vt := val.(type) {
@@ -514,26 +551,22 @@ func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...
 		}
 	}
 
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Inc()
 	ts := time.Now()
-	var err error
-	if r.cli.Client != nil {
-		err = r.cli.Client.Set(ctx, rkey, buf, options.TTL).Err()
-	} else {
-		err = r.cli.ClusterClient.Set(ctx, rkey, buf, options.TTL).Err()
-	}
-	setSpanError(ctx, err)
+	err := r.cli.Set(ctx, rkey, buf, options.TTL).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 == redis.Nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
+	setSpanError(ctx, err)
+
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
+	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
+	if errors.Is(err, goredis.Nil) {
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "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()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "hit")...).Inc()
+	} else {
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
 		return err
 	}
 
@@ -541,12 +574,18 @@ func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...
 }
 
 func (r *Store) List(ctx context.Context, opts ...store.ListOption) ([]string, error) {
+	b := r.pool.Get()
+	defer r.pool.Put(b)
+
 	options := store.NewListOptions(opts...)
+	labels := make([]string, 0, 6)
+	labels = append(labels, "name", options.Name, "statement", "list")
+
 	if len(options.Namespace) == 0 {
 		options.Namespace = r.opts.Namespace
 	}
 
-	rkey := r.getKey(options.Namespace, "", options.Prefix+"*")
+	rkey := r.getKey(b, options.Namespace, "", options.Prefix+"*")
 	if options.Suffix != "" {
 		rkey += options.Suffix
 	}
@@ -563,15 +602,13 @@ func (r *Store) List(ctx context.Context, opts ...store.ListOption) ([]string, e
 	}
 
 	// TODO: add support for prefix/suffix/limit
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Inc()
 	ts := time.Now()
 	var keys []string
 	var err error
 
-	if r.cli.Client != nil {
-		keys, err = r.cli.Client.Keys(ctx, rkey).Result()
-	} else {
-		err = r.cli.ClusterClient.ForEachMaster(ctx, func(nctx context.Context, cli *redis.Client) 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
@@ -579,19 +616,22 @@ func (r *Store) List(ctx context.Context, opts ...store.ListOption) ([]string, e
 			keys = append(keys, nkeys...)
 			return nil
 		})
+	} else {
+		keys, err = r.cli.Keys(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 == redis.Nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
+	setSpanError(ctx, err)
+
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
+	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
+	if err == goredis.Nil {
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "miss")...).Inc()
 		return nil, store.ErrNotFound
 	} else if err == nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "git")...).Inc()
 	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
 		return nil, err
 	}
 
@@ -623,90 +663,214 @@ func (r *Store) String() string {
 }
 
 func NewStore(opts ...store.Option) *Store {
-	return &Store{done: make(chan struct{}), opts: store.NewOptions(opts...)}
+	b := atomic.Uint32{}
+	return &Store{
+		opts:      store.NewOptions(opts...),
+		connected: &b,
+		watchers:  make(map[string]*watcher),
+	}
 }
 
-func (r *Store) configure() error {
-	var redisOptions *redis.Options
-	var redisClusterOptions *redis.ClusterOptions
-	var err error
-
-	nodes := r.opts.Addrs
-
-	if len(nodes) == 0 {
-		nodes = []string{"redis://127.0.0.1:6379"}
-	}
-
-	if r.cli != nil && r.opts.Context == nil {
+func (r *Store) configure(opts ...store.Option) error {
+	if r.cli != nil && len(opts) == 0 {
 		return nil
 	}
 
+	for _, o := range opts {
+		o(&r.opts)
+	}
+
+	universalOptions := DefaultUniversalOptions
+
 	if r.opts.Context != nil {
-		if c, ok := r.opts.Context.Value(configKey{}).(*redis.Options); ok {
-			redisOptions = c
-			if r.opts.TLSConfig != nil {
-				redisOptions.TLSConfig = r.opts.TLSConfig
+		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 o.TLSConfig != nil {
+				universalOptions.TLSConfig = o.TLSConfig
 			}
 		}
 
-		if c, ok := r.opts.Context.Value(clusterConfigKey{}).(*redis.ClusterOptions); ok {
-			redisClusterOptions = c
-			if r.opts.TLSConfig != nil {
-				redisClusterOptions.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 o.TLSConfig != nil {
+				universalOptions.TLSConfig = o.TLSConfig
+			}
+		}
+
+		if o, ok := r.opts.Context.Value(universalConfigKey{}).(*goredis.UniversalOptions); ok {
+			universalOptions = o
+			if o.TLSConfig != nil {
+				universalOptions.TLSConfig = o.TLSConfig
 			}
 		}
 	}
 
-	if redisOptions != nil && redisClusterOptions != nil {
-		return fmt.Errorf("must specify only one option Config or ClusterConfig")
+	if len(r.opts.Addrs) > 0 {
+		universalOptions.Addrs = r.opts.Addrs
+	} else {
+		universalOptions.Addrs = []string{"127.0.0.1:6379"}
 	}
 
-	if redisOptions == nil && redisClusterOptions == nil && r.cli != nil {
-		return nil
-	}
+	r.cli = goredis.NewUniversalClient(universalOptions)
+	setTracing(r.cli, r.opts.Tracer)
+	r.cli.AddHook(newEventHook(r))
 
-	if redisOptions == nil && redisClusterOptions == nil && len(nodes) == 1 {
-		redisOptions, err = redis.ParseURL(nodes[0])
-		if err != nil {
-			redisOptions = DefaultOptions
-			redisOptions.Addr = r.opts.Addrs[0]
-			redisOptions.TLSConfig = r.opts.TLSConfig
-		}
-	} else if redisOptions == nil && redisClusterOptions == nil && len(nodes) > 1 {
-		redisClusterOptions = DefaultClusterOptions
-		redisClusterOptions.Addrs = r.opts.Addrs
-		redisClusterOptions.TLSConfig = r.opts.TLSConfig
-	}
-
-	if redisOptions != nil {
-		c := redis.NewClient(redisOptions)
-		setTracing(c, r.opts.Tracer)
-		r.cli = &wrappedClient{Client: c}
-	} else if redisClusterOptions != nil {
-		c := redis.NewClusterClient(redisClusterOptions)
-		setTracing(c, r.opts.Tracer)
-		r.cli = &wrappedClient{ClusterClient: c}
-	}
-
-	r.pool = pool.NewPool(func() *strings.Builder { return &strings.Builder{} })
+	r.pool = pool.NewStringsPool(50)
 
 	r.statsMeter()
 
 	return nil
 }
 
-func (r *Store) getKey(mainNamespace string, opNamespace string, key string) string {
-	b := r.pool.Get()
-	defer r.pool.Put(b)
-	b.Reset()
-
+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(r.opts.Separator)
 	}
 	b.WriteString(key)
 	return b.String()
 }
+
+func (r *Store) Watch(ctx context.Context, opts ...store.WatchOption) (store.Watcher, error) {
+	id, err := id.New()
+	if err != nil {
+		return nil, err
+	}
+	wo, err := store.NewWatchOptions(opts...)
+	if err != nil {
+		return nil, err
+	}
+	// construct the watcher
+	w := &watcher{
+		exit: make(chan bool),
+		ch:   make(chan store.Event),
+		id:   id,
+		opts: wo,
+	}
+
+	r.mu.Lock()
+	r.watchers[w.id] = w
+	r.mu.Unlock()
+
+	return w, nil
+}
+
+func (r *Store) sendEvent(e store.Event) {
+	r.mu.RLock()
+	watchers := make([]*watcher, 0, len(r.watchers))
+	for _, w := range r.watchers {
+		watchers = append(watchers, w)
+	}
+	r.mu.RUnlock()
+	for _, w := range watchers {
+		select {
+		case <-w.exit:
+			r.mu.Lock()
+			delete(r.watchers, w.id)
+			r.mu.Unlock()
+		default:
+			select {
+			case w.ch <- e:
+			case <-time.After(sendEventTime):
+			}
+		}
+	}
+}
+
+type watcher struct {
+	ch   chan store.Event
+	exit chan bool
+	opts store.WatchOptions
+	id   string
+}
+
+func (w *watcher) Next() (store.Event, error) {
+	for {
+		select {
+		case e := <-w.ch:
+			return e, nil
+		case <-w.exit:
+			return nil, store.ErrWatcherStopped
+		}
+	}
+}
+
+func (w *watcher) Stop() {
+	select {
+	case <-w.exit:
+		return
+	default:
+		close(w.exit)
+	}
+}
+
+type event struct {
+	ts  time.Time
+	t   store.EventType
+	err error
+}
+
+func (e *event) Error() error {
+	return e.err
+}
+
+func (e *event) Timestamp() time.Time {
+	return e.ts
+}
+
+func (e *event) Type() store.EventType {
+	return e.t
+}

redis_test.go

@@ -4,13 +4,36 @@ import (
 	"bytes"
 	"context"
 	"os"
+	"sync/atomic"
 	"testing"
 	"time"
 
-	"go.unistack.org/micro/v3/store"
-	"go.unistack.org/micro/v3/tracer"
+	goredis "github.com/redis/go-redis/v9"
+	"go.unistack.org/micro/v4/store"
+	"go.unistack.org/micro/v4/tracer"
 )
 
+func TestLazyConnect(t *testing.T) {
+	t.Skip("skipping test for manual check")
+	ctx := context.Background()
+	var err error
+
+	r := NewStore()
+
+	if err = r.Init(); err != nil {
+		t.Fatal(err)
+	}
+	if err = r.Connect(ctx); err != nil {
+		t.Logf("connect failed %v", err)
+	}
+
+	for {
+		if err = r.Write(ctx, "mykey", "myval"); err != nil {
+			t.Logf("failed to write %v", err)
+		}
+	}
+}
+
 func TestKeepTTL(t *testing.T) {
 	ctx := context.Background()
 
@@ -19,7 +42,7 @@ func TestKeepTTL(t *testing.T) {
 	}
 	r := NewStore(store.Addrs(os.Getenv("STORE_NODES")))
 
-	if err := r.Init(); err != nil {
+	if err := r.Init(store.LazyConnect(true)); err != nil {
 		t.Fatal(err)
 	}
 	if err := r.Connect(ctx); err != nil {
@@ -41,7 +64,7 @@ func TestKeepTTL(t *testing.T) {
 func Test_rkv_configure(t *testing.T) {
 	type fields struct {
 		options store.Options
-		Client  *wrappedClient
+		Client  goredis.UniversalClient
 	}
 	type wantValues struct {
 		username string
@@ -98,9 +121,11 @@ func Test_rkv_configure(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			b := atomic.Uint32{}
 			rc := &Store{
 				opts:      tt.fields.options,
 				cli:       tt.fields.Client,
+				connected: &b,
 			}
 			err := rc.configure()
 			if (err != nil) != tt.wantErr {

stats.go

@@ -3,7 +3,8 @@ package redis
 import (
 	"time"
 
-	"github.com/redis/go-redis/v9"
+	goredis "github.com/redis/go-redis/v9"
+	"go.unistack.org/micro/v4/meter"
 )
 
 var (
@@ -13,34 +14,26 @@ var (
 	PoolConnTotalCurrent = "pool_conn_total_current"
 	PoolConnIdleCurrent  = "pool_conn_idle_current"
 	PoolConnStaleTotal   = "pool_conn_stale_total"
-
-	meterRequestTotal               = "request_total"
-	meterRequestLatencyMicroseconds = "latency_microseconds"
-	meterRequestDurationSeconds     = "request_duration_seconds"
 )
 
 type Statser interface {
-	PoolStats() *redis.PoolStats
+	PoolStats() *goredis.PoolStats
 }
 
 func (r *Store) statsMeter() {
 	var st Statser
 
-	if r.cli.Client != nil {
-		st = r.cli.Client
-	} else if r.cli.ClusterClient != nil {
-		st = r.cli.ClusterClient
+	if r.cli != nil {
+		st = r.cli
 	} else {
 		return
 	}
 
 	go func() {
-		ticker := time.NewTicker(DefaultMeterStatsInterval)
+		ticker := time.NewTicker(meter.DefaultMeterStatsInterval)
 		defer ticker.Stop()
 
-		for {
-			select {
-			case <-ticker.C:
+		for range ticker.C {
 			if st == nil {
 				return
 			}
@@ -52,6 +45,5 @@ func (r *Store) statsMeter() {
 			r.opts.Meter.Counter(PoolConnIdleCurrent).Set(uint64(stats.IdleConns))
 			r.opts.Meter.Counter(PoolConnStaleTotal).Set(uint64(stats.StaleConns))
 		}
-		}
 	}()
 }

tracer.go

@@ -7,24 +7,24 @@ import (
 	"strconv"
 
 	rediscmd "github.com/redis/go-redis/extra/rediscmd/v9"
-	"github.com/redis/go-redis/v9"
-	"go.unistack.org/micro/v3/tracer"
+	goredis "github.com/redis/go-redis/v9"
+	"go.unistack.org/micro/v4/tracer"
 )
 
-func setTracing(rdb redis.UniversalClient, tr tracer.Tracer, opts ...tracer.SpanOption) {
+func setTracing(rdb goredis.UniversalClient, tr tracer.Tracer, opts ...tracer.SpanOption) {
 	switch rdb := rdb.(type) {
-	case *redis.Client:
+	case *goredis.Client:
 		opt := rdb.Options()
 		connString := formatDBConnString(opt.Network, opt.Addr)
 		rdb.AddHook(newTracingHook(connString, tr))
-	case *redis.ClusterClient:
-		rdb.OnNewNode(func(rdb *redis.Client) {
+	case *goredis.ClusterClient:
+		rdb.OnNewNode(func(rdb *goredis.Client) {
 			opt := rdb.Options()
 			connString := formatDBConnString(opt.Network, opt.Addr)
 			rdb.AddHook(newTracingHook(connString, tr))
 		})
-	case *redis.Ring:
-		rdb.OnNewNode(func(rdb *redis.Client) {
+	case *goredis.Ring:
+		rdb.OnNewNode(func(rdb *goredis.Client) {
 			opt := rdb.Options()
 			connString := formatDBConnString(opt.Network, opt.Addr)
 			rdb.AddHook(newTracingHook(connString, tr))
@@ -37,7 +37,7 @@ type tracingHook struct {
 	opts []tracer.SpanOption
 }
 
-var _ redis.Hook = (*tracingHook)(nil)
+var _ goredis.Hook = (*tracingHook)(nil)
 
 func newTracingHook(connString string, tr tracer.Tracer, opts ...tracer.SpanOption) *tracingHook {
 	opts = append(opts, tracer.WithSpanKind(tracer.SpanKindClient))
@@ -51,10 +51,10 @@ func newTracingHook(connString string, tr tracer.Tracer, opts ...tracer.SpanOpti
 	}
 }
 
-func (h *tracingHook) DialHook(hook redis.DialHook) redis.DialHook {
+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, "redis.dial", h.opts...)
+			_, span := h.tr.Start(ctx, "goredis.dial", h.opts...)
 			defer span.Finish()
 		*/
 		conn, err := hook(ctx, network, addr)
@@ -64,8 +64,8 @@ func (h *tracingHook) DialHook(hook redis.DialHook) redis.DialHook {
 	}
 }
 
-func (h *tracingHook) ProcessHook(hook redis.ProcessHook) redis.ProcessHook {
-	return func(ctx context.Context, cmd redis.Cmder) error {
+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
 
@@ -73,7 +73,7 @@ func (h *tracingHook) ProcessHook(hook redis.ProcessHook) redis.ProcessHook {
 		case "cluster slots":
 			break
 		default:
-			_, span := h.tr.Start(ctx, "redis.process", append(h.opts, tracer.WithSpanLabels("db.statement", cmdString))...)
+			_, span := h.tr.Start(ctx, "sdk.database", append(h.opts, tracer.WithSpanLabels("db.statement", cmdString))...)
 			defer func() {
 				recordError(span, err)
 				span.Finish()
@@ -86,16 +86,16 @@ func (h *tracingHook) ProcessHook(hook redis.ProcessHook) redis.ProcessHook {
 	}
 }
 
-func (h *tracingHook) ProcessPipelineHook(hook redis.ProcessPipelineHook) redis.ProcessPipelineHook {
-	return func(ctx context.Context, cmds []redis.Cmder) error {
+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.redis.num_cmd", strconv.Itoa(len(cmds)),
+			"db.database.num_cmd", strconv.Itoa(len(cmds)),
 			"db.statement", cmdsString,
 		))
 
-		_, span := h.tr.Start(ctx, "redis.process_pipeline", opts...)
+		_, span := h.tr.Start(ctx, "sdk.database", opts...)
 		defer span.Finish()
 
 		err := hook(ctx, cmds)
@@ -106,7 +106,7 @@ func (h *tracingHook) ProcessPipelineHook(hook redis.ProcessPipelineHook) redis.
 }
 
 func setSpanError(ctx context.Context, err error) {
-	if err == nil || err == redis.Nil {
+	if err == nil || err == goredis.Nil {
 		return
 	}
 	if sp, ok := tracer.SpanFromContext(ctx); !ok && sp != nil {
@@ -115,7 +115,7 @@ func setSpanError(ctx context.Context, err error) {
 }
 
 func recordError(span tracer.Span, err error) {
-	if err != nil && err != redis.Nil {
+	if err != nil && err != goredis.Nil {
 		span.SetStatus(tracer.SpanStatusError, err.Error())
 	}
 }