cleanup

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: For reporting bugs in go-micro
+about: For reporting bugs in micro
 title: "[BUG]"
 labels: ''
 assignees: ''
@@ -16,9 +16,3 @@ assignees: ''
 **How to reproduce the bug:**
 
 If possible, please include a minimal code snippet here.
-
-**Environment:**
-Go Version: please paste `go version` output here
-```
-please paste `go env` output here
-```

.github/ISSUE_TEMPLATE/feature-request---enhancement.md

@@ -1,6 +1,6 @@
 ---
 name: Feature request / Enhancement
-about: If you have a need not served by go-micro
+about: If you have a need not served by micro
 title: "[FEATURE]"
 labels: ''
 assignees: ''

.github/ISSUE_TEMPLATE/question.md

@@ -1,14 +1,8 @@
 ---
 name: Question
-about: Ask a question about go-micro
+about: Ask a question about micro
 title: ''
 labels: ''
 assignees: ''
 
 ---
-
-Before asking, please check if your question has already been answered: 
-
-1. Check the documentation - https://micro.mu/docs/
-2. Check the examples and plugins - https://github.com/micro/examples & https://github.com/micro/go-plugins
-3. Search existing issues

.github/autoapprove.yml

@@ -0,0 +1,28 @@
+name: "autoapprove"
+
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
+  workflow_run:
+    workflows: ["prbuild"]
+    types:
+      - completed
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  autoapprove:
+    runs-on: ubuntu-latest
+    steps:
+      - name: approve
+        run: [ "curl -o tea https://dl.gitea.com/tea/main/tea-main-linux-amd64",
+               "chmod +x ./tea",
+               "./tea login add --name unistack --token ${{ secrets.GITHUB_TOKEN }} --url https://git.unistack.org",
+               "./tea pr --repo ${{ github.event.repository.name }}"
+        ]
+        if: github.actor == 'vtolstov'
+        id: approve
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

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

@@ -1,46 +0,0 @@
-name: build
-on:
- push:
-    branches:
-    - master
-jobs:
-  test:
-    name: test
-    runs-on: ubuntu-latest
-    steps:
-    - name: setup
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
-    - name: checkout
-      uses: actions/checkout@v2
-    - name: cache
-      uses: actions/cache@v2
-      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@v2
-      - name: lint
-        uses: golangci/golangci-lint-action@v2
-        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@v2
-    - name: setup
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
-    # Initializes the CodeQL tools for scanning.
-    - name: init
-      uses: github/codeql-action/init@v1
-      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@v1
-
-    # ℹ️ 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@v1

.github/workflows/dependabot-automerge.yml

@@ -1,31 +0,0 @@
-name: "prautomerge"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  dependabot:
-    runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' }}
-    steps:
-      - name: metadata
-        id: metadata
-        uses: dependabot/fetch-metadata@v1.1.1
-        with:
-          github-token: "${{ secrets.TOKEN }}"
-      - name: approve
-        run: gh pr review --approve "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.TOKEN}}
-      - name: 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/job_coverage.yml

@@ -0,0 +1,55 @@
+name: coverage
+
+on:
+  push:
+    branches: [ main, v3, v4 ]
+    paths-ignore:
+      - '.github/**'
+      - '.gitea/**'
+  pull_request:
+    branches: [ main, v3, v4 ]
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+
+  build:
+    if: github.server_url != 'https://github.com'
+    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: test coverage
+      run: |
+        go test -v -cover ./... -covermode=count -coverprofile coverage.out -coverpkg ./...
+        go tool cover -func coverage.out -o coverage.out
+
+    - name: coverage badge
+      uses: tj-actions/coverage-badge-go@v2
+      with:
+        green: 80
+        filename: coverage.out
+
+    - uses: stefanzweifel/git-auto-commit-action@v4
+      name: autocommit
+      with:
+        commit_message: Apply Code Coverage Badge
+        skip_fetch: false
+        skip_checkout: false
+        file_pattern: ./README.md
+
+    - name: push
+      if: steps.auto-commit-action.outputs.changes_detected == 'true'
+      uses: ad-m/github-push-action@master
+      with:
+        github_token: ${{ github.token }}
+        branch: ${{ github.ref }}

.github/workflows/job_lint.yml

@@ -0,0 +1,29 @@
+name: lint
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches: [ master, v3, v4 ]
+    paths-ignore:
+      - '.github/**'
+      - '.gitea/**'
+
+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: golangci/golangci-lint-action@v6
+      with:
+        version: 'latest'

.github/workflows/job_sync.yml

@@ -0,0 +1,57 @@
+name: sync
+
+on:
+  schedule:
+    - cron: '*/5 * * * *'
+#  push:
+#    branches: [ master, v3, v4 ]
+#    paths-ignore:
+#      - '.github/**'
+#      - '.gitea/**'
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  sync:
+    if: github.server_url != 'https://github.com'
+    runs-on: ubuntu-latest
+    steps:
+    - name: init
+      run: |
+        git config --global user.email "vtolstov <vtolstov@users.noreply.github.com>"
+        git config --global user.name "github-actions[bot]"
+        echo "machine git.unistack.org login vtolstov password ${{ secrets.TOKEN_GITEA }}" >> /root/.netrc
+        echo "machine github.com login vtolstov password ${{ secrets.TOKEN_GITHUB }}" >> /root/.netrc
+
+    - name: sync master
+      run: |
+        git clone --filter=blob:none --filter=tree:0 --branch master --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
+        cd repo
+        git remote add --no-tags --track master upstream https://github.com/${GITHUB_REPOSITORY}
+        git pull --rebase upstream master
+        git push upstream master --progress
+        git push origin master --progress
+        cd ../
+        rm -rf repo
+
+    - name: sync v3
+      run: |
+        git clone --filter=blob:none --filter=tree:0 --branch v3 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
+        cd repo
+        git remote add --no-tags --fetch --track v3 upstream https://github.com/${GITHUB_REPOSITORY}
+        git pull --rebase upstream v3
+        git push upstream v3
+        git push origin v3 --progress
+        cd ../
+        rm -rf repo
+
+    - name: sync v4
+      run: |
+        git clone --filter=blob:none --filter=tree:0 --branch v4 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
+        cd repo
+        git remote add --no-tags --fetch --track v4 upstream https://github.com/${GITHUB_REPOSITORY}
+        git pull --rebase upstream v4
+        git push upstream v4
+        git push origin v4 --progress
+        cd ../
+        rm -rf repo

.github/workflows/job_test.yml

@@ -0,0 +1,31 @@
+name: test
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches: [ master, v3, v4 ]
+  push:
+    branches: [ master, v3, v4 ]
+    paths-ignore:
+      - '.github/**'
+      - '.gitea/**'
+
+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 ./...

.github/workflows/job_tests.yml

@@ -0,0 +1,50 @@
+name: test
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches: [ master, v3, v4 ]
+  push:
+    branches: [ master, v3, v4 ]
+    paths-ignore:
+      - '.github/**'
+      - '.gitea/**'
+
+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: ${{ github.workspace }}/go.work
+      run: |
+        go work init
+        go work use .
+        go work use micro-tests
+    - name: setup deps
+      env:
+        GOWORK: ${{ github.workspace }}/go.work
+      run: go get -v ./...
+    - name: run tests
+      env:
+        INTEGRATION_TESTS: yes
+        GOWORK: ${{ github.workspace }}/go.work
+      run: |
+        cd micro-tests
+        go test -mod readonly -v ./... || true

.github/workflows/pr.yml

@@ -1,46 +0,0 @@
-name: prbuild
-on:
-  pull_request:
-    branches:
-    - master
-jobs:
-  test:
-    name: test
-    runs-on: ubuntu-latest
-    steps:
-    - name: setup
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
-    - name: checkout
-      uses: actions/checkout@v2
-    - name: cache
-      uses: actions/cache@v2
-      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@v2
-      - name: lint
-        uses: golangci/golangci-lint-action@v2
-        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

README.md

@@ -1,8 +1,10 @@
-# micro-wrapper-sqlpackage postgres
+# micro-wrapper-sql
 
 Example for For postgres 
 
 ```go
+package storage
+
 import (
 	"fmt"
 	"net/url"
@@ -11,6 +13,7 @@ import (
 	"github.com/jackc/pgx/v4"
 	"github.com/jackc/pgx/v4/stdlib"
 	"github.com/jmoiron/sqlx"
+	wrapper "go.unistack.org/micro-wrapper-sql/v4"
 )
 
 func Connect(cfg *PostgresConfig) (*sqlx.DB, error) {
@@ -35,15 +38,26 @@ func Connect(cfg *PostgresConfig) (*sqlx.DB, error) {
 		"application_name":            cfg.AppName,
 	}
 	// may be needed for pbbouncer, needs to check
-	//dbConf.PreferSimpleProtocol = true
+	// dbConf.PreferSimpleProtocol = true
 	// register pgx conn
 	dsn := stdlib.RegisterConnConfig(dbConf)
 
 
-  sql.Register("micro-wrapper-sql", wrapper.WrapDriver(
-    &stdlib.Driver{}, 
-    wrapper.Tracer(some.NewTracer()),
+  wrapper.DefaultMeterStatsInterval = 1 * time.Second
+	logger.DefaultLogger = logger.NewLogger(logger.WithLevel(logger.DebugLevel))
+
+	if err := logger.DefaultLogger.Init(); err != nil {
+		t.Fatal(err)
+	}
+
+  // for postgres user stdlib.GetDefaultDriver() or it fails
+	sql.Register("micro-wrapper-sql", wrapper.NewWrapper(&sqlite.Driver{},
+		wrapper.DatabaseHost("localhost"),
+		wrapper.DatabaseName("mydb"),
+		wrapper.LoggerLevel(logger.DebugLevel),
+		wrapper.LoggerEnabled(true),
 	))
+
   wdb, err := sql.Open("micro-wrapper-sql", dsn)
 	if err != nil {
 		return nil, err

common.go

@@ -3,24 +3,11 @@ package wrapper
 import (
 	"database/sql/driver"
 	"errors"
+	"fmt"
+	"runtime"
 )
 
-// ErrUnsupported is an error returned when the underlying driver doesn't provide a given function.
-var ErrUnsupported = errors.New("operation unsupported by the underlying driver")
-
-/*
-// newSpan creates a new opentracing.Span instance from the given context.
-func (t *tracer) newSpan(ctx context.Context) opentracing.Span {
-	name := t.nameFunc(ctx)
-	var opts []opentracing.StartSpanOption
-	parent := opentracing.SpanFromContext(ctx)
-	if parent != nil {
-		opts = append(opts, opentracing.ChildOf(parent.Context()))
-	}
-	span := t.t.StartSpan(name, opts...)
-	return span
-}
-*/
+//go:generate sh -c "go run gen.go > wrap_gen.go"
 
 // namedValueToValue converts driver arguments of NamedValue format to Value format. Implemented in the same way as in
 // database/sql ctxutil.go.
@@ -34,3 +21,31 @@ func namedValueToValue(named []driver.NamedValue) ([]driver.Value, error) {
 	}
 	return dargs, nil
 }
+
+// namedValueToLabels convert driver arguments to interface{} slice
+func namedValueToLabels(named []driver.NamedValue) []interface{} {
+	largs := make([]interface{}, 0, len(named)*2)
+	var name string
+	for _, param := range named {
+		if param.Name != "" {
+			name = param.Name
+		} else {
+			name = fmt.Sprintf("$%d", param.Ordinal)
+		}
+		largs = append(largs, fmt.Sprintf("%s=%v", name, param.Value))
+	}
+	return largs
+}
+
+// getCallerName get the name of the function A where A() -> B() -> GetFunctionCallerName()
+func getCallerName() string {
+	pc, _, _, ok := runtime.Caller(3)
+	details := runtime.FuncForPC(pc)
+	var callerName string
+	if ok && details != nil {
+		callerName = details.Name()
+	} else {
+		callerName = labelUnknown
+	}
+	return callerName
+}

conn.go

@@ -3,114 +3,465 @@ package wrapper
 import (
 	"context"
 	"database/sql/driver"
+	"fmt"
+	"time"
+
+	requestid "go.unistack.org/micro/v4/hooks/requestid"
+	"go.unistack.org/micro/v4/tracer"
+)
+
+var (
+	_ driver.Conn               = (*wrapperConn)(nil)
+	_ driver.ConnBeginTx        = (*wrapperConn)(nil)
+	_ driver.ConnPrepareContext = (*wrapperConn)(nil)
+	_ driver.Pinger             = (*wrapperConn)(nil)
+	_ driver.Validator          = (*wrapperConn)(nil)
+	_ driver.Queryer            = (*wrapperConn)(nil) // nolint:staticcheck
+	_ driver.QueryerContext     = (*wrapperConn)(nil)
+	_ driver.Execer             = (*wrapperConn)(nil) // nolint:staticcheck
+	_ driver.ExecerContext      = (*wrapperConn)(nil)
+	//	_ driver.Connector
+	//	_ driver.Driver
+	//	_ driver.DriverContext
 )
 
 // wrapperConn defines a wrapper for driver.Conn
 type wrapperConn struct {
+	d     *wrapperDriver
+	dname string
 	conn  driver.Conn
 	opts  Options
-}
-
-// Prepare implements driver.Conn Prepare
-func (w *wrapperConn) Prepare(query string) (driver.Stmt, error) {
-	stmt, err := w.conn.Prepare(query)
-	if err != nil {
-		return nil, err
-	}
-	return &wrapperStmt{stmt: stmt, opts: w.opts}, nil
+	ctx   context.Context
+	span  tracer.Span
 }
 
 // Close implements driver.Conn Close
 func (w *wrapperConn) Close() error {
-	return w.conn.Close()
+	var ctx context.Context
+	if w.ctx != nil {
+		ctx = w.ctx
+	} else {
+		ctx = context.Background()
+	}
+	_ = ctx
+	labels := []string{labelMethod, "Close"}
+	ts := time.Now()
+	err := w.conn.Close()
+	td := time.Since(ts)
+	te := td.Seconds()
+	if err != nil {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+	} else {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
+	}
+	w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+	w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+	/*
+		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "Close", getCallerName(), td, err)...)
+		}
+	*/
+	return err
 }
 
 // Begin implements driver.Conn Begin
 func (w *wrapperConn) Begin() (driver.Tx, error) {
-	tx, err := w.conn.Begin()
+	var ctx context.Context
+	if w.ctx != nil {
+		ctx = w.ctx
+	} else {
+		ctx = context.Background()
+	}
+
+	labels := []string{labelMethod, "Begin"}
+	ts := time.Now()
+	tx, err := w.conn.Begin() // nolint:staticcheck
+	td := time.Since(ts)
+	te := td.Seconds()
 	if err != nil {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+		w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+		w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+		/*
+			if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+				w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "Begin", getCallerName(), td, err)...)
+			}
+		*/
 		return nil, err
 	}
-	return &wrapperTx{tx: tx, opts: w.opts}, nil
+	w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
+	w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+	w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+	/*
+		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "Begin", getCallerName(), td, err)...)
+		}
+	*/
+	return &wrapperTx{tx: tx, opts: w.opts, ctx: ctx}, nil
 }
 
 // BeginTx implements driver.ConnBeginTx BeginTx
 func (w *wrapperConn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver.Tx, error) {
-	nctx, span := w.opts.Tracer.Start(ctx, "BeginTx")
-	if connBeginTx, ok := w.conn.(driver.ConnBeginTx); ok {
+	name := getQueryName(ctx)
+	nctx, span := w.opts.Tracer.Start(ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+	span.AddLabels("db.method", "BeginTx")
+	span.AddLabels("db.statement", name)
+	if id, ok := ctx.Value(requestid.XRequestIDKey{}).(string); ok {
+		span.AddLabels("x-request-id", id)
+	}
+	labels := []string{labelMethod, "BeginTx", labelQuery, name}
+
+	connBeginTx, ok := w.conn.(driver.ConnBeginTx)
+	if !ok {
+		return w.Begin()
+	}
+
+	ts := time.Now()
 	tx, err := connBeginTx.BeginTx(nctx, opts)
+	td := time.Since(ts)
+	te := td.Seconds()
 	if err != nil {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+		w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+		w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+		span.SetStatus(tracer.SpanStatusError, err.Error())
+		/*
+			if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+				w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "BeginTx", getCallerName(), td, err)...)
+			}
+		*/
 		return nil, err
 	}
-		return &wrapperTx{tx: tx, opts: w.opts, span: span}, nil
+	w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
+	/*
+		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "BeginTx", getCallerName(), td, err)...)
 		}
-	return w.conn.Begin()
+	*/
+	return &wrapperTx{tx: tx, opts: w.opts, ctx: ctx, span: span}, nil
+}
+
+// Prepare implements driver.Conn Prepare
+func (w *wrapperConn) Prepare(query string) (driver.Stmt, error) {
+	var ctx context.Context
+	if w.ctx != nil {
+		ctx = w.ctx
+	} else {
+		ctx = context.Background()
+	}
+	_ = ctx
+	labels := []string{labelMethod, "Prepare", labelQuery, getCallerName()}
+	ts := time.Now()
+	stmt, err := w.conn.Prepare(query)
+	td := time.Since(ts)
+	te := td.Seconds()
+	if err != nil {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+		w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+		w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+		/*
+			if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+				w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "Prepare", getCallerName(), td, err)...)
+			}
+		*/
+		return nil, err
+	}
+	w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
+	w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+	w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+	/*
+		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "Prepare", getCallerName(), td, err)...)
+		}
+	*/
+	return wrapStmt(stmt, query, w.opts), nil
 }
 
 // PrepareContext implements driver.ConnPrepareContext PrepareContext
 func (w *wrapperConn) PrepareContext(ctx context.Context, query string) (driver.Stmt, error) {
-	if connPrepareContext, ok := w.conn.(driver.ConnPrepareContext); ok {
-		stmt, err := connPrepareContext.PrepareContext(ctx, query)
+	var nctx context.Context
+	var span tracer.Span
+
+	name := getQueryName(ctx)
+	if w.ctx != nil {
+		nctx, span = w.opts.Tracer.Start(w.ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+	} else {
+		nctx, span = w.opts.Tracer.Start(ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+	}
+	span.AddLabels("db.method", "PrepareContext")
+	span.AddLabels("db.statement", name)
+	if id, ok := ctx.Value(requestid.XRequestIDKey{}).(string); ok {
+		span.AddLabels("x-request-id", id)
+	}
+	labels := []string{labelMethod, "PrepareContext", labelQuery, name}
+	conn, ok := w.conn.(driver.ConnPrepareContext)
+	if !ok {
+		return w.Prepare(query)
+	}
+
+	ts := time.Now()
+	stmt, err := conn.PrepareContext(nctx, query)
+	td := time.Since(ts)
+	te := td.Seconds()
 	if err != nil {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+		w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+		w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+		span.SetStatus(tracer.SpanStatusError, err.Error())
+		/*
+			if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+				w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "PrepareContext", getCallerName(), td, err)...)
+			}
+		*/
 		return nil, err
 	}
-		return &wrapperStmt{stmt: stmt, opts: w.opts}, nil
+	w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
+	w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+	w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+	/*
+		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "PrepareContext", getCallerName(), td, err)...)
 		}
-	return w.conn.Prepare(query)
+	*/
+	return wrapStmt(stmt, query, w.opts), nil
 }
 
 // Exec implements driver.Execer Exec
 func (w *wrapperConn) Exec(query string, args []driver.Value) (driver.Result, error) {
-	if execer, ok := w.conn.(driver.Execer); ok {
-		return execer.Exec(query, args)
+	var ctx context.Context
+	if w.ctx != nil {
+		ctx = w.ctx
+	} else {
+		ctx = context.Background()
 	}
-	return nil, ErrUnsupported
+	_ = ctx
+	labels := []string{labelMethod, "Exec", labelQuery, getCallerName()}
+
+	// nolint:staticcheck
+	conn, ok := w.conn.(driver.Execer)
+	if !ok {
+		return nil, driver.ErrSkip
+	}
+
+	ts := time.Now()
+	res, err := conn.Exec(query, args)
+	td := time.Since(ts)
+	te := td.Seconds()
+	if err != nil {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+	} else {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
+	}
+	w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+	w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+	/*
+		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "Exec", getCallerName(), td, err)...)
+		}
+	*/
+	return res, err
 }
 
 // Exec implements driver.StmtExecContext ExecContext
 func (w *wrapperConn) ExecContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Result, error) {
-	nctx, span := w.opts.Tracer.Start(ctx, "ExecContext")
+	var nctx context.Context
+	var span tracer.Span
+
+	name := getQueryName(ctx)
+	if w.ctx != nil {
+		nctx, span = w.opts.Tracer.Start(w.ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+	} else {
+		nctx, span = w.opts.Tracer.Start(ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+	}
+	span.AddLabels("db.method", "ExecContext")
+	span.AddLabels("db.statement", name)
+	if id, ok := ctx.Value(requestid.XRequestIDKey{}).(string); ok {
+		span.AddLabels("x-request-id", id)
+	}
 	defer span.Finish()
-	if execerContext, ok := w.conn.(driver.ExecerContext); ok {
-		r, err := execerContext.ExecContext(nctx, query, args)
-		return r, err
+	if len(args) > 0 {
+		span.AddLabels("db.args", fmt.Sprintf("%v", namedValueToLabels(args)))
 	}
-	values, err := namedValueToValue(args)
+	labels := []string{labelMethod, "ExecContext", labelQuery, name}
+
+	conn, ok := w.conn.(driver.ExecerContext)
+	if !ok {
+		// nolint:staticcheck
+		return nil, driver.ErrSkip
+	}
+
+	ts := time.Now()
+	res, err := conn.ExecContext(nctx, query, args)
+	td := time.Since(ts)
+	te := td.Seconds()
 	if err != nil {
-		return nil, err
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+		span.SetStatus(tracer.SpanStatusError, err.Error())
+	} else {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
 	}
-	return w.Exec(query, values)
+	w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
+	w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+	w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+	/*
+		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "ExecContext", getCallerName(), td, err)...)
+		}
+	*/
+	return res, err
 }
 
 // Ping implements driver.Pinger Ping
 func (w *wrapperConn) Ping(ctx context.Context) error {
-	if pinger, ok := w.conn.(driver.Pinger); ok {
-		nctx, span := w.opts.Tracer.Start(ctx, "Ping")
-		defer span.Finish()
-		return pinger.Ping(nctx)
+	conn, ok := w.conn.(driver.Pinger)
+
+	if !ok {
+		// fallback path to check db alive
+		pc, err := w.d.Open(w.dname)
+		if err != nil {
+			return err
 		}
-	return ErrUnsupported
+		return pc.Close()
+	}
+
+	var nctx context.Context
+	nctx = ctx
+	/*
+		var span tracer.Span
+		if w.ctx != nil {
+			nctx, span = w.opts.Tracer.Start(w.ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+		} else {
+			nctx, span = w.opts.Tracer.Start(ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+		}
+		span.AddLabels("db.method", "Ping")
+		defer span.Finish()
+	*/
+	labels := []string{labelMethod, "Ping"}
+	ts := time.Now()
+	err := conn.Ping(nctx)
+	td := time.Since(ts)
+	te := td.Seconds()
+	if err != nil {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+		// span.SetStatus(tracer.SpanStatusError, err.Error())
+		/*
+			if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+				w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "Ping", getCallerName(), td, err)...)
+			}
+		*/
+		return err
+	} else {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
+	}
+	w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+	w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+
+	return nil
 }
 
 // Query implements driver.Queryer Query
 func (w *wrapperConn) Query(query string, args []driver.Value) (driver.Rows, error) {
-	if queryer, ok := w.conn.(driver.Queryer); ok {
-		return queryer.Query(query, args)
+	var ctx context.Context
+	if w.ctx != nil {
+		ctx = w.ctx
+	} else {
+		ctx = context.Background()
 	}
-	return nil, ErrUnsupported
+	_ = ctx
+	// nolint:staticcheck
+	conn, ok := w.conn.(driver.Queryer)
+	if !ok {
+		return nil, driver.ErrSkip
+	}
+
+	labels := []string{labelMethod, "Query", labelQuery, getCallerName()}
+	ts := time.Now()
+	rows, err := conn.Query(query, args)
+	td := time.Since(ts)
+	te := td.Seconds()
+	if err != nil {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+	} else {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
+	}
+	w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+	w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+	/*
+		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "Query", getCallerName(), td, err)...)
+		}
+	*/
+	return rows, err
 }
 
 // QueryContext implements Driver.QueryerContext QueryContext
-func (w *wrapperConn) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (rows driver.Rows, err error) {
-	nctx, span := w.opts.Tracer.Start(ctx, "QueryContext")
+func (w *wrapperConn) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Rows, error) {
+	var nctx context.Context
+	var span tracer.Span
+
+	name := getQueryName(ctx)
+	if w.ctx != nil {
+		nctx, span = w.opts.Tracer.Start(w.ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+	} else {
+		nctx, span = w.opts.Tracer.Start(ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+	}
+	span.AddLabels("db.method", "QueryContext")
+	span.AddLabels("db.statement", name)
+	if id, ok := ctx.Value(requestid.XRequestIDKey{}).(string); ok {
+		span.AddLabels("x-request-id", id)
+	}
 	defer span.Finish()
-	if queryerContext, ok := w.conn.(driver.QueryerContext); ok {
-		rows, err := queryerContext.QueryContext(nctx, query, args)
-		return rows, err
+	if len(args) > 0 {
+		span.AddLabels("db.args", fmt.Sprintf("%v", namedValueToLabels(args)))
 	}
-	values, err := namedValueToValue(args)
+	labels := []string{labelMethod, "QueryContext", labelQuery, name}
+	conn, ok := w.conn.(driver.QueryerContext)
+	if !ok {
+		return nil, driver.ErrSkip
+	}
+
+	ts := time.Now()
+	rows, err := conn.QueryContext(nctx, query, args)
+	td := time.Since(ts)
+	te := td.Seconds()
 	if err != nil {
-		return nil, err
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+		span.SetStatus(tracer.SpanStatusError, err.Error())
+	} else {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
 	}
-	return w.Query(query, values)
+	w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+	w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+	/*
+		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "QueryContext", getCallerName(), td, err)...)
+		}
+	*/
+	return rows, err
+}
+
+// CheckNamedValue implements driver.NamedValueChecker
+func (w *wrapperConn) CheckNamedValue(v *driver.NamedValue) error {
+	s, ok := w.conn.(driver.NamedValueChecker)
+	if !ok {
+		return driver.ErrSkip
+	}
+	return s.CheckNamedValue(v)
+}
+
+// IsValid implements driver.Validator
+func (w *wrapperConn) IsValid() bool {
+	v, ok := w.conn.(driver.Validator)
+	if !ok {
+		return w.conn != nil
+	}
+	return v.IsValid()
+}
+
+func (w *wrapperConn) ResetSession(ctx context.Context) error {
+	s, ok := w.conn.(driver.SessionResetter)
+	if !ok {
+		return driver.ErrSkip
+	}
+	return s.ResetSession(ctx)
 }

driver.go

@@ -1,25 +1,92 @@
 package wrapper
 
 import (
+	"context"
 	"database/sql/driver"
+	"time"
 )
 
+var (
+// _ driver.DriverContext = (*wrapperDriver)(nil)
+// _ driver.Connector     = (*wrapperDriver)(nil)
+)
+
+type conn interface {
+	driver.Pinger
+	driver.Execer
+	driver.ExecerContext
+	driver.Queryer
+	driver.QueryerContext
+	driver.Conn
+	driver.ConnPrepareContext
+	driver.ConnBeginTx
+}
+
 // wrapperDriver defines a wrapper for driver.Driver
 type wrapperDriver struct {
 	driver driver.Driver
 	opts   Options
+	ctx    context.Context
 }
 
 // NewWrapper creates and returns a new SQL driver with passed capabilities
 func NewWrapper(d driver.Driver, opts ...Option) driver.Driver {
-	return &wrapperDriver{driver: d, opts: NewOptions(opts...)}
+	return &wrapperDriver{driver: d, opts: NewOptions(opts...), ctx: context.Background()}
 }
 
+type wrappedConnector struct {
+	connector driver.Connector
+	name      string
+	opts      Options
+	ctx       context.Context
+}
+
+func NewWrapperConnector(c driver.Connector, opts ...Option) driver.Connector {
+	return &wrappedConnector{connector: c, opts: NewOptions(opts...), ctx: context.Background()}
+}
+
+// Connect implements driver.Driver Connect
+func (w *wrappedConnector) Connect(ctx context.Context) (driver.Conn, error) {
+	return w.connector.Connect(ctx)
+}
+
+// Driver implements driver.Driver Driver
+func (w *wrappedConnector) Driver() driver.Driver {
+	return w.connector.Driver()
+}
+
+/*
+// Connect implements driver.Driver OpenConnector
+func (w *wrapperDriver) OpenConnector(name string) (driver.Conn, error) {
+	return &wrapperConnector{driver: w.driver, name: name, opts: w.opts}, nil
+}
+*/
+
 // Open implements driver.Driver Open
 func (w *wrapperDriver) Open(name string) (driver.Conn, error) {
-	c, err := w.driver.Open(name)
+	// ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second) // Ensure eventual timeout
+	// defer cancel()
+
+	/*
+		connector, err := w.OpenConnector(name)
 		if err != nil {
 			return nil, err
 		}
-	return &wrapperConn{conn: c, opts: w.opts}, nil
+		return connector.Connect(ctx)
+	*/
+
+	ts := time.Now()
+	c, err := w.driver.Open(name)
+	td := time.Since(ts)
+	/*
+		if w.opts.LoggerEnabled {
+			w.opts.Logger.Log(w.ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(w.ctx, "Open", getCallerName(), td, err)...)
+		}
+	*/
+	_ = td
+	if err != nil {
+		return nil, err
+	}
+
+	return wrapConn(c, w.opts), nil
 }

gen.go

@@ -0,0 +1,167 @@
+//go:build ignore
+
+package main
+
+import (
+	"bytes"
+	"crypto/md5"
+	"fmt"
+	"io"
+	"sort"
+	"strings"
+)
+
+var connIfaces = []string{
+	"driver.ConnBeginTx",
+	"driver.ConnPrepareContext",
+	"driver.Execer",
+	"driver.ExecerContext",
+	"driver.NamedValueChecker",
+	"driver.Pinger",
+	"driver.Queryer",
+	"driver.QueryerContext",
+	"driver.SessionResetter",
+	"driver.Validator",
+}
+
+var stmtIfaces = []string{
+	"driver.StmtExecContext",
+	"driver.StmtQueryContext",
+	"driver.ColumnConverter",
+	"driver.NamedValueChecker",
+}
+
+func getHash(s []string) string {
+	h := md5.New()
+	io.WriteString(h, strings.Join(s, "|"))
+	return fmt.Sprintf("%x", h.Sum(nil))
+}
+
+func main() {
+	comboConn := all(connIfaces)
+
+	sort.Slice(comboConn, func(i, j int) bool {
+		return len(comboConn[i]) < len(comboConn[j])
+	})
+
+	comboStmt := all(stmtIfaces)
+
+	sort.Slice(comboStmt, func(i, j int) bool {
+		return len(comboStmt[i]) < len(comboStmt[j])
+	})
+
+	b := bytes.NewBuffer(nil)
+	b.WriteString("// Code generated. DO NOT EDIT.\n\n")
+	b.WriteString("package wrapper\n\n")
+	b.WriteString(`import "database/sql/driver"`)
+	b.WriteString("\n\n")
+
+	b.WriteString("func wrapConn(dc driver.Conn, opts Options) driver.Conn {\n")
+	b.WriteString("\tc := &wrapperConn{conn: dc, opts: opts}\n")
+
+	for idx := len(comboConn) - 1; idx >= 0; idx-- {
+		ifaces := comboConn[idx]
+		n := len(ifaces)
+		if n == 0 {
+			continue
+		}
+		h := getHash(ifaces)
+		b.WriteString(fmt.Sprintf("\tif _, ok := dc.(wrapConn%04d_%s); ok {\n", n, h))
+		b.WriteString("\treturn struct {\n")
+		b.WriteString("\t\tdriver.Conn\n")
+		b.WriteString(fmt.Sprintf("\t\t\t%s", strings.Join(ifaces, "\n\t\t\t")))
+		b.WriteString("\t\t\n}{")
+		for idx := range ifaces {
+			if idx > 0 {
+				b.WriteString(", ")
+				b.WriteString("c")
+			} else if idx == 0 {
+				b.WriteString("c")
+			} else {
+				b.WriteString("c")
+			}
+		}
+		b.WriteString(", c}\n")
+		b.WriteString("}\n\n")
+	}
+	b.WriteString("return c\n")
+	b.WriteString("}\n")
+
+	for idx := len(comboConn) - 1; idx >= 0; idx-- {
+		ifaces := comboConn[idx]
+		n := len(ifaces)
+		if n == 0 {
+			continue
+		}
+		h := getHash(ifaces)
+		b.WriteString(fmt.Sprintf("// %s\n", strings.Join(ifaces, "|")))
+		b.WriteString(fmt.Sprintf("type wrapConn%04d_%s interface {\n", n, h))
+		for _, iface := range ifaces {
+			b.WriteString(fmt.Sprintf("\t%s\n", iface))
+		}
+		b.WriteString("}\n\n")
+	}
+
+	b.WriteString("func wrapStmt(stmt driver.Stmt, query string, opts Options) driver.Stmt {\n")
+	b.WriteString("\tc := &wrapperStmt{stmt: stmt, query: query, opts: opts}\n")
+
+	for idx := len(comboStmt) - 1; idx >= 0; idx-- {
+		ifaces := comboStmt[idx]
+		n := len(ifaces)
+		if n == 0 {
+			continue
+		}
+		h := getHash(ifaces)
+		b.WriteString(fmt.Sprintf("\tif _, ok := stmt.(wrapStmt%04d_%s); ok {\n", n, h))
+		b.WriteString("\treturn struct {\n")
+		b.WriteString("\t\tdriver.Stmt\n")
+		b.WriteString(fmt.Sprintf("\t\t\t%s", strings.Join(ifaces, "\n\t\t\t")))
+		b.WriteString("\t\t\n}{")
+		for idx := range ifaces {
+			if idx > 0 {
+				b.WriteString(", ")
+				b.WriteString("c")
+			} else if idx == 0 {
+				b.WriteString("c")
+			} else {
+				b.WriteString("c")
+			}
+		}
+		b.WriteString(", c}\n")
+		b.WriteString("}\n\n")
+	}
+	b.WriteString("return c\n")
+	b.WriteString("}\n")
+
+	for idx := len(comboStmt) - 1; idx >= 0; idx-- {
+		ifaces := comboStmt[idx]
+		n := len(ifaces)
+		if n == 0 {
+			continue
+		}
+		h := getHash(ifaces)
+		b.WriteString(fmt.Sprintf("// %s\n", strings.Join(ifaces, "|")))
+		b.WriteString(fmt.Sprintf("type wrapStmt%04d_%s interface {\n", n, h))
+		for _, iface := range ifaces {
+			b.WriteString(fmt.Sprintf("\t%s\n", iface))
+		}
+		b.WriteString("}\n\n")
+	}
+
+	fmt.Printf("%s\n", b.String())
+}
+
+// all returns all combinations for a given string array.
+func all[T any](set []T) (subsets [][]T) {
+	length := uint(len(set))
+	for subsetBits := 1; subsetBits < (1 << length); subsetBits++ {
+		var subset []T
+		for object := uint(0); object < length; object++ {
+			if (subsetBits>>object)&1 == 1 {
+				subset = append(subset, set[object])
+			}
+		}
+		subsets = append(subsets, subset)
+	}
+	return subsets
+}

go.mod

@@ -1,5 +1,18 @@
-module go.unistack.org/micro-wrapper-sql/v3
+module go.unistack.org/micro-wrapper-sql/v4
 
-go 1.16
+go 1.23.0
 
-require go.unistack.org/micro/v3 v3.8.5
+require go.unistack.org/micro/v4 v4.1.8
+
+require (
+	github.com/ash3in/uuidv8 v1.2.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
+	golang.org/x/sys v0.32.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250428153025-10db94c68c34 // indirect
+	google.golang.org/grpc v1.72.0 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

go.sum

@@ -1,26 +1,49 @@
-github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
-github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/silas/dag v0.0.0-20210626123444-3804bac2d6d4/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-github.com/unistack-org/micro-proto v0.0.9 h1:KrWLS4FUX7UAWNAilQf70uad6ZPf/0EudeddCXllRVc=
-github.com/unistack-org/micro-proto v0.0.9/go.mod h1:Cckwmzd89gvS7ThxzZp9kQR/EOdksFQcsTAtDDyKwrg=
-go.unistack.org/micro/v3 v3.8.2 h1:q2j+J7PLRNnENUbsi9eIrPwe4GM+vrxY656NwkwEmew=
-go.unistack.org/micro/v3 v3.8.2/go.mod h1:Tkteri0wiiybbH6aPqay26pZHFIAwL9LXJc2x1Jkakk=
-golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+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/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+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/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
+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/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/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=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+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.8 h1:bbqnQ7nzTYNIYt4HhRgmh/++qzwGJvlNbrTOoXzkQiU=
+go.unistack.org/micro/v4 v4.1.8/go.mod h1:b4dr7RFlbpSfSsKCva9UuX4zLtkYQteEK+Uuac39qJE=
+golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
+golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250428153025-10db94c68c34 h1:h6p3mQqrmT1XkHVTfzLdNz1u7IhINeZkz67/xTbOuWs=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250428153025-10db94c68c34/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
+google.golang.org/grpc v1.72.0 h1:S7UkcVa60b5AAQTaO6ZKamFp1zMZSU0fGDK2WZLbBnM=
+google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+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

@@ -2,36 +2,49 @@ package wrapper
 
 import (
 	"context"
+	"fmt"
 	"time"
 
-	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/meter"
-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/meter"
+	"go.unistack.org/micro/v4/tracer"
 )
 
 var (
 	// DefaultMeterStatsInterval holds default stats interval
 	DefaultMeterStatsInterval = 5 * time.Second
-	// DefaultMeterMetricPrefix holds default metric prefix
-	DefaultMeterMetricPrefix = "micro_sql_"
-	// DefaultMeterLabelPrefix holds default label prefix
-	DefaultMeterLabelPrefix = "micro_"
+	// DefaultLoggerObserver used to prepare labels for logger
+	DefaultLoggerObserver = func(ctx context.Context, method string, query string, td time.Duration, err error) []interface{} {
+		labels := []interface{}{"db.method", method, "took", fmt.Sprintf("%v", td)}
+		if err != nil {
+			labels = append(labels, "error", err.Error())
+		}
+		if query != labelUnknown {
+			labels = append(labels, "query", query)
+		}
+		return labels
+	}
 )
 
 var (
-	MaxOpenConnections = "max_open_connections"
-	OpenConnections    = "open_connections"
-	InuseConnections   = "inuse_connections"
-	IdleConnections    = "idle_connections"
-	WaitConnections    = "wait_connections"
-	BlockedSeconds     = "blocked_seconds"
-	MaxIdleClosed      = "max_idletime_closed"
-	MaxLifetimeClosed  = "max_lifetime_closed"
+	MaxOpenConnections = "micro_sql_max_open_conn"
+	OpenConnections    = "micro_sql_open_conn"
+	InuseConnections   = "micro_sql_inuse_conn"
+	IdleConnections    = "micro_sql_idle_conn"
+	WaitConnections    = "micro_sql_waited_conn"
+	BlockedSeconds     = "micro_sql_blocked_seconds"
+	MaxIdleClosed      = "micro_sql_max_idle_closed"
+	MaxIdletimeClosed  = "micro_sql_closed_max_idle"
+	MaxLifetimeClosed  = "micro_sql_closed_max_lifetime"
 
-	//	RequestTotal          = "request_total"
-	//	RequestLatencyMicroseconds = "request_latency_microseconds"
-	//	RequestDurationSeconds    = "request_duration_seconds"
+	meterRequestTotal               = "micro_sql_request_total"
+	meterRequestLatencyMicroseconds = "micro_sql_latency_microseconds"
+	meterRequestDurationSeconds     = "micro_sql_request_duration_seconds"
 
+	labelUnknown  = "unknown"
+	labelQuery    = "db_statement"
+	labelMethod   = "db_method"
+	labelStatus   = "status"
 	labelSuccess  = "success"
 	labelFailure  = "failure"
 	labelHost     = "db_host"
@@ -45,13 +58,10 @@ type Options struct {
 	Tracer             tracer.Tracer
 	DatabaseHost       string
 	DatabaseName       string
-	ServiceName        string
-	ServiceVersion     string
-	ServiceID          string
-	MeterLabelPrefix   string
-	MeterMetricPrefix  string
 	MeterStatsInterval time.Duration
 	LoggerLevel        logger.Level
+	LoggerEnabled      bool
+	LoggerObserver     func(ctx context.Context, method string, name string, td time.Duration, err error) []interface{}
 }
 
 // Option func signature
@@ -64,13 +74,22 @@ func NewOptions(opts ...Option) Options {
 		Meter:              meter.DefaultMeter,
 		Tracer:             tracer.DefaultTracer,
 		MeterStatsInterval: DefaultMeterStatsInterval,
-		MeterMetricPrefix:  DefaultMeterMetricPrefix,
-		MeterLabelPrefix:   DefaultMeterLabelPrefix,
 		LoggerLevel:        logger.ErrorLevel,
+		LoggerObserver:     DefaultLoggerObserver,
 	}
 	for _, o := range opts {
 		o(&options)
 	}
+
+	options.Meter = options.Meter.Clone(
+		meter.Labels(
+			labelHost, options.DatabaseHost,
+			labelDatabase, options.DatabaseName,
+		),
+	)
+
+	options.Logger = options.Logger.Clone(logger.WithAddCallerSkipCount(1))
+
 	return options
 }
 
@@ -81,20 +100,6 @@ func MetricInterval(td time.Duration) Option {
 	}
 }
 
-// LabelPrefix specifies prefix for each label
-func LabelPrefix(pref string) Option {
-	return func(o *Options) {
-		o.MeterLabelPrefix = pref
-	}
-}
-
-// MetricPrefix specifies prefix for each metric
-func MetricPrefix(pref string) Option {
-	return func(o *Options) {
-		o.MeterMetricPrefix = pref
-	}
-}
-
 func DatabaseHost(host string) Option {
 	return func(o *Options) {
 		o.DatabaseHost = host
@@ -121,6 +126,27 @@ func Logger(l logger.Logger) Option {
 	}
 }
 
+// LoggerEnabled enable sql logging
+func LoggerEnabled(b bool) Option {
+	return func(o *Options) {
+		o.LoggerEnabled = b
+	}
+}
+
+// LoggerLevel passes logger.Level option
+func LoggerLevel(lvl logger.Level) Option {
+	return func(o *Options) {
+		o.LoggerLevel = lvl
+	}
+}
+
+// LoggerObserver passes observer to fill logger fields
+func LoggerObserver(obs func(context.Context, string, string, time.Duration, error) []interface{}) Option {
+	return func(o *Options) {
+		o.LoggerObserver = obs
+	}
+}
+
 // Tracer passes tracer.Tracer to wrapper
 func Tracer(t tracer.Tracer) Option {
 	return func(o *Options) {
@@ -137,3 +163,10 @@ func QueryName(ctx context.Context, name string) context.Context {
 	}
 	return context.WithValue(ctx, queryNameKey{}, name)
 }
+
+func getQueryName(ctx context.Context) string {
+	if v, ok := ctx.Value(queryNameKey{}).(string); ok && v != labelUnknown {
+		return v
+	}
+	return getCallerName()
+}

stats.go

@@ -0,0 +1,41 @@
+package wrapper
+
+import (
+	"context"
+	"database/sql"
+	"time"
+)
+
+type Statser interface {
+	Stats() sql.DBStats
+}
+
+func NewStatsMeter(ctx context.Context, db Statser, opts ...Option) {
+	options := NewOptions(opts...)
+
+	go func() {
+		ticker := time.NewTicker(options.MeterStatsInterval)
+		defer ticker.Stop()
+
+		for {
+			select {
+			case <-ctx.Done():
+				return
+			case <-ticker.C:
+				if db == nil {
+					return
+				}
+				stats := db.Stats()
+				options.Meter.Counter(MaxOpenConnections).Set(uint64(stats.MaxOpenConnections))
+				options.Meter.Counter(OpenConnections).Set(uint64(stats.OpenConnections))
+				options.Meter.Counter(InuseConnections).Set(uint64(stats.InUse))
+				options.Meter.Counter(IdleConnections).Set(uint64(stats.Idle))
+				options.Meter.Counter(WaitConnections).Set(uint64(stats.WaitCount))
+				options.Meter.FloatCounter(BlockedSeconds).Set(stats.WaitDuration.Seconds())
+				options.Meter.Counter(MaxIdleClosed).Set(uint64(stats.MaxIdleClosed))
+				options.Meter.Counter(MaxIdletimeClosed).Set(uint64(stats.MaxIdleTimeClosed))
+				options.Meter.Counter(MaxLifetimeClosed).Set(uint64(stats.MaxLifetimeClosed))
+			}
+		}
+	}()
+}

stmt.go

@@ -3,17 +3,55 @@ package wrapper
 import (
 	"context"
 	"database/sql/driver"
+	"fmt"
+	"time"
+
+	requestid "go.unistack.org/micro/v4/hooks/requestid"
+	"go.unistack.org/micro/v4/tracer"
+)
+
+var (
+	_ driver.Stmt              = (*wrapperStmt)(nil)
+	_ driver.StmtQueryContext  = (*wrapperStmt)(nil)
+	_ driver.StmtExecContext   = (*wrapperStmt)(nil)
+	_ driver.NamedValueChecker = (*wrapperStmt)(nil)
 )
 
 // wrapperStmt defines a wrapper for driver.Stmt
 type wrapperStmt struct {
 	stmt  driver.Stmt
 	opts  Options
+	query string
+	ctx   context.Context
 }
 
 // Close implements driver.Stmt Close
 func (w *wrapperStmt) Close() error {
-	return w.stmt.Close()
+	var ctx context.Context
+	if w.ctx != nil {
+		ctx = w.ctx
+	} else {
+		ctx = context.Background()
+	}
+	_ = ctx
+	labels := []string{labelMethod, "Close"}
+	ts := time.Now()
+	err := w.stmt.Close()
+	td := time.Since(ts)
+	te := td.Seconds()
+	if err != nil {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+	} else {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
+	}
+	w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+	w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+	/*
+		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "Close", getCallerName(), td, err)...)
+		}
+	*/
+	return err
 }
 
 // NumInput implements driver.Stmt NumInput
@@ -21,41 +59,229 @@ func (w *wrapperStmt) NumInput() int {
 	return w.stmt.NumInput()
 }
 
+// CheckNamedValue implements driver.NamedValueChecker
+func (w *wrapperStmt) CheckNamedValue(v *driver.NamedValue) error {
+	s, ok := w.stmt.(driver.NamedValueChecker)
+	if !ok {
+		return driver.ErrSkip
+	}
+	return s.CheckNamedValue(v)
+}
+
 // Exec implements driver.Stmt Exec
 func (w *wrapperStmt) Exec(args []driver.Value) (driver.Result, error) {
-	return w.stmt.Exec(args)
+	var ctx context.Context
+	if w.ctx != nil {
+		ctx = w.ctx
+	} else {
+		ctx = context.Background()
+	}
+	_ = ctx
+	labels := []string{labelMethod, "Exec"}
+	ts := time.Now()
+	res, err := w.stmt.Exec(args) // nolint:staticcheck
+	td := time.Since(ts)
+	te := td.Seconds()
+	if err != nil {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+	} else {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
+	}
+	w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+	w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+	/*
+		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "Exec", getCallerName(), td, err)...)
+		}
+	*/
+	return res, err
 }
 
 // Query implements driver.Stmt Query
 func (w *wrapperStmt) Query(args []driver.Value) (driver.Rows, error) {
-	return w.stmt.Query(args)
+	var ctx context.Context
+	if w.ctx != nil {
+		ctx = w.ctx
+	} else {
+		ctx = context.Background()
+	}
+	_ = ctx
+	labels := []string{labelMethod, "Query"}
+	ts := time.Now()
+	rows, err := w.stmt.Query(args) // nolint:staticcheck
+	td := time.Since(ts)
+	te := td.Seconds()
+	if err != nil {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+	} else {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
+	}
+	w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+	w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+	/*
+		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "Query", getCallerName(), td, err)...)
+		}
+	*/
+	return rows, err
 }
 
-// ExecContext implements driver.ExecerContext ExecContext
-func (w *wrapperStmt) ExecContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Result, error) {
-	nctx, span := w.opts.Tracer.Start(ctx, "ExecContext")
-	defer span.Finish()
-	if execerContext, ok := w.stmt.(driver.ExecerContext); ok {
-		return execerContext.ExecContext(nctx, query, args)
+// ColumnConverter implements driver.ColumnConverter
+func (w *wrapperStmt) ColumnConverter(idx int) driver.ValueConverter {
+	s, ok := w.stmt.(driver.ColumnConverter) // nolint:staticcheck
+	if !ok {
+		return nil
 	}
+	return s.ColumnConverter(idx)
+}
+
+// ExecContext implements driver.StmtExecContext ExecContext
+func (w *wrapperStmt) ExecContext(ctx context.Context, args []driver.NamedValue) (driver.Result, error) {
+	var nctx context.Context
+	var span tracer.Span
+
+	name := getQueryName(ctx)
+	if w.ctx != nil {
+		nctx, span = w.opts.Tracer.Start(w.ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+	} else {
+		nctx, span = w.opts.Tracer.Start(ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+	}
+	span.AddLabels("db.method", "ExecContext")
+	span.AddLabels("db.statement", name)
+	defer span.Finish()
+	if len(args) > 0 {
+		span.AddLabels("db.args", fmt.Sprintf("%v", namedValueToLabels(args)))
+	}
+	if id, ok := ctx.Value(requestid.XRequestIDKey{}).(string); ok {
+		span.AddLabels("x-request-id", id)
+	}
+	labels := []string{labelMethod, "ExecContext", labelQuery, name}
+
+	if conn, ok := w.stmt.(driver.StmtExecContext); ok {
+		ts := time.Now()
+		res, err := conn.ExecContext(nctx, args)
+		td := time.Since(ts)
+		te := td.Seconds()
+		if err != nil {
+			w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+			span.SetStatus(tracer.SpanStatusError, err.Error())
+		} else {
+			w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
+		}
+		w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+		w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+		/*
+			if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+				w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "ExecContext", name, td, err)...)
+			}
+		*/
+		return res, err
+	}
+
 	values, err := namedValueToValue(args)
 	if err != nil {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+		span.SetStatus(tracer.SpanStatusError, err.Error())
+		/*
+			if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+				w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "ExecContext", name, 0, err)...)
+			}
+		*/
 		return nil, err
 	}
-	return w.Exec(values)
+	ts := time.Now()
+	res, err := w.Exec(values) // nolint:staticcheck
+	td := time.Since(ts)
+	te := td.Seconds()
+	if err != nil {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+		span.SetStatus(tracer.SpanStatusError, err.Error())
+	} else {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
+	}
+
+	w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+	w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+	/*
+		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "ExecContext", name, td, err)...)
+		}
+	*/
+	return res, err
 }
 
-// QueryContext implements Driver.QueryerContext QueryContext
-func (w *wrapperStmt) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (rows driver.Rows, err error) {
-	nctx, span := w.opts.Tracer.Start(ctx, "QueryContext")
+// QueryContext implements driver.StmtQueryContext StmtQueryContext
+func (w *wrapperStmt) QueryContext(ctx context.Context, args []driver.NamedValue) (driver.Rows, error) {
+	var nctx context.Context
+	var span tracer.Span
+
+	name := getQueryName(ctx)
+	if w.ctx != nil {
+		nctx, span = w.opts.Tracer.Start(w.ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+	} else {
+		nctx, span = w.opts.Tracer.Start(ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+	}
+	span.AddLabels("db.method", "QueryContext")
+	span.AddLabels("db.statement", name)
 	defer span.Finish()
-	if queryerContext, ok := w.stmt.(driver.QueryerContext); ok {
-		rows, err := queryerContext.QueryContext(nctx, query, args)
+	if len(args) > 0 {
+		span.AddLabels("db.args", fmt.Sprintf("%v", namedValueToLabels(args)))
+	}
+	if id, ok := ctx.Value(requestid.XRequestIDKey{}).(string); ok {
+		span.AddLabels("x-request-id", id)
+	}
+	labels := []string{labelMethod, "QueryContext", labelQuery, name}
+	if conn, ok := w.stmt.(driver.StmtQueryContext); ok {
+		ts := time.Now()
+		rows, err := conn.QueryContext(nctx, args)
+		td := time.Since(ts)
+		te := td.Seconds()
+		if err != nil {
+			w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+			span.SetStatus(tracer.SpanStatusError, err.Error())
+		} else {
+			w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
+		}
+
+		w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+		w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+		/*
+			if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+				w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "QueryContext", name, td, err)...)
+			}
+		*/
 		return rows, err
 	}
+
 	values, err := namedValueToValue(args)
 	if err != nil {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+
+		span.SetStatus(tracer.SpanStatusError, err.Error())
+		/*
+			if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+				w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "QueryContext", name, 0, err)...)
+			}
+		*/
 		return nil, err
 	}
-	return w.Query(values)
+	ts := time.Now()
+	rows, err := w.Query(values) // nolint:staticcheck
+	td := time.Since(ts)
+	te := td.Seconds()
+	if err != nil {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+		span.SetStatus(tracer.SpanStatusError, err.Error())
+	} else {
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
+	}
+
+	w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+	w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+	/*
+		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "QueryContext", name, td, err)...)
+		}
+	*/
+	return rows, err
 }

tx.go

@@ -1,30 +1,63 @@
 package wrapper
 
 import (
+	"context"
 	"database/sql/driver"
+	"time"
 
-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/tracer"
 )
 
+var _ driver.Tx = (*wrapperTx)(nil)
+
 // wrapperTx defines a wrapper for driver.Tx
 type wrapperTx struct {
 	tx   driver.Tx
 	span tracer.Span
 	opts Options
+	ctx  context.Context
 }
 
 // Commit implements driver.Tx Commit
 func (w *wrapperTx) Commit() error {
+	ts := time.Now()
+	err := w.tx.Commit()
+	td := time.Since(ts)
+	_ = td
 	if w.span != nil {
-		defer w.span.Finish()
+		if err != nil {
+			w.span.SetStatus(tracer.SpanStatusError, err.Error())
 		}
-	return w.tx.Commit()
+		w.span.Finish()
+	}
+	/*
+		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+			w.opts.Logger.Log(w.ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(w.ctx, "Commit", getCallerName(), td, err)...)
+		}
+	*/
+	w.ctx = nil
+
+	return err
 }
 
 // Rollback implements driver.Tx Rollback
 func (w *wrapperTx) Rollback() error {
+	ts := time.Now()
+	err := w.tx.Rollback()
+	td := time.Since(ts)
+	_ = td
 	if w.span != nil {
-		defer w.span.Finish()
+		if err != nil {
+			w.span.SetStatus(tracer.SpanStatusError, err.Error())
 		}
-	return w.tx.Rollback()
+		w.span.Finish()
+	}
+	/*
+		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+			w.opts.Logger.Log(w.ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(w.ctx, "Rollback", getCallerName(), td, err)...)
+		}
+	*/
+	w.ctx = nil
+
+	return err
 }

wrap.go

@@ -0,0 +1,17 @@
+package wrapper
+
+import (
+	"database/sql/driver"
+)
+
+func wrapDriver(d driver.Driver, opts Options) driver.Driver {
+	if _, ok := d.(driver.DriverContext); ok {
+		return &wrapperDriver{driver: d, opts: opts}
+	}
+	return struct{ driver.Driver }{&wrapperDriver{driver: d, opts: opts}}
+}
+
+// WrapConn allows an existing driver.Conn to be wrapped.
+func WrapConn(c driver.Conn, opts ...Option) driver.Conn {
+	return wrapConn(c, NewOptions(opts...))
+}

wrapper.go

@@ -1,51 +0,0 @@
-package wrapper // import "go.unistack.org/micro-wrapper-sql/v3"
-
-import (
-	"context"
-	"database/sql"
-	"time"
-
-	"go.unistack.org/micro/v3/meter"
-)
-
-type Statser interface {
-	Stats() sql.DBStats
-}
-
-func NewStatsMeter(ctx context.Context, db Statser, opts ...Option) {
-	options := NewOptions(opts...)
-
-	m := options.Meter.Clone(
-		meter.LabelPrefix(options.MeterLabelPrefix),
-		meter.MetricPrefix(options.MeterMetricPrefix),
-		meter.Labels(
-			labelHost, options.DatabaseHost,
-			labelDatabase, options.DatabaseName,
-		),
-	)
-
-	go func() {
-		ticker := time.NewTicker(options.MeterStatsInterval)
-		defer ticker.Stop()
-
-		for {
-			select {
-			case <-ctx.Done():
-				return
-			case <-ticker.C:
-				if db == nil {
-					return
-				}
-				stats := db.Stats()
-				m.Counter(MaxOpenConnections).Set(uint64(stats.MaxOpenConnections))
-				m.Counter(OpenConnections).Set(uint64(stats.OpenConnections))
-				m.Counter(InuseConnections).Set(uint64(stats.InUse))
-				m.Counter(IdleConnections).Set(uint64(stats.Idle))
-				m.Counter(WaitConnections).Set(uint64(stats.WaitCount))
-				m.FloatCounter(BlockedSeconds).Set(stats.WaitDuration.Seconds())
-				m.Counter(MaxIdleClosed).Set(uint64(stats.MaxIdleClosed))
-				m.Counter(MaxLifetimeClosed).Set(uint64(stats.MaxLifetimeClosed))
-			}
-		}
-	}()
-}