.github/workflows/build.yml

@@ -34,7 +34,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v3.4.0
+        uses: golangci/golangci-lint-action@v3.3.1
         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.

.github/workflows/dependabot-automerge.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.3.6
+        uses: dependabot/fetch-metadata@v1.3.5
         with:
           github-token: "${{ secrets.TOKEN }}"
       - name: merge

.github/workflows/pr.yml

@@ -34,7 +34,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v3.4.0
+        uses: golangci/golangci-lint-action@v3.3.1
         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.

README.md

@@ -3,7 +3,7 @@
 Example for For postgres 
 
 ```go
-package storage
+package postgres
 
 import (
 	"fmt"
@@ -38,26 +38,15 @@ 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)
 
 
-  wrapper.DefaultMeterStatsInterval = 1 * time.Second
+  sql.Register("micro-wrapper-sql", wrapper.WrapDriver(
-	logger.DefaultLogger = logger.NewLogger(logger.WithLevel(logger.DebugLevel))
+    &stdlib.Driver{}, 
-
+    wrapper.Tracer(some.NewTracer()),
-	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

@@ -4,10 +4,10 @@ import (
 	"database/sql/driver"
 	"errors"
 	"fmt"
-	"runtime"
 )
 
-//go:generate sh -c "go run gen.go > wrap_gen.go"
+// 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")
 
 // namedValueToValue converts driver arguments of NamedValue format to Value format. Implemented in the same way as in
 // database/sql ctxutil.go.
@@ -24,7 +24,7 @@ func namedValueToValue(named []driver.NamedValue) ([]driver.Value, error) {
 
 // namedValueToLabels convert driver arguments to interface{} slice
 func namedValueToLabels(named []driver.NamedValue) []interface{} {
-	largs := make([]interface{}, 0, len(named)*2)
+	largs := make([]interface{}, len(named)*2)
 	var name string
 	for _, param := range named {
 		if param.Name != "" {
@@ -32,20 +32,8 @@ func namedValueToLabels(named []driver.NamedValue) []interface{} {
 		} else {
 			name = fmt.Sprintf("$%d", param.Ordinal)
 		}
-		largs = append(largs, fmt.Sprintf("%s=%v", name, param.Value))
+
+		largs = append(largs, 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

@@ -5,45 +5,44 @@ import (
 	"database/sql/driver"
 	"fmt"
 	"time"
-
-	requestid "go.unistack.org/micro-wrapper-requestid/v3"
-	"go.unistack.org/micro/v3/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
+	conn driver.Conn
-	dname string
+	opts Options
-	conn  driver.Conn
+}
-	opts  Options
+
-	ctx   context.Context
+// Prepare implements driver.Conn Prepare
-	span  tracer.Span
+func (w *wrapperConn) Prepare(query string) (driver.Stmt, error) {
+	labels := []string{labelMethod, "Prepare", labelQuery, labelUnknown}
+	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.Fields(w.opts.LoggerObserver(context.TODO(), "Prepare", labelUnknown, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
+		}
+		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.Fields(w.opts.LoggerObserver(context.TODO(), "QueryContext", labelUnknown, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
+	}
+
+	return &wrapperStmt{stmt: stmt, opts: w.opts}, nil
 }
 
 // Close implements driver.Conn Close
 func (w *wrapperConn) Close() error {
-	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()
@@ -56,101 +55,129 @@ func (w *wrapperConn) Close() error {
 	}
 	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) {
+	if w.opts.LoggerEnabled {
-			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "Close", getCallerName(), td, err)...)
+		w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "QueryContext", labelUnknown, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
-		}
+	}
-	*/
+
 	return err
 }
 
 // Begin implements driver.Conn Begin
 func (w *wrapperConn) Begin() (driver.Tx, error) {
-	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
+	// nolint:staticcheck
+	tx, err := w.conn.Begin()
 	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 {
-			if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+			w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "Begin", labelUnknown, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
-				w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "Begin", 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 {
-		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+		w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "Begin", labelUnknown, td, err)...).Log(context.TODO(), 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}, nil
-	*/
-	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")
+	span.AddLabels("method", "BeginTx")
 	name := getQueryName(ctx)
-	nctx, span := w.opts.Tracer.Start(ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+	if name != "" {
-	span.AddLabels("db.method", "BeginTx")
+		span.AddLabels("query", name)
-	span.AddLabels("db.statement", name)
+	} else {
-	if id, ok := ctx.Value(requestid.XRequestIDKey{}).(string); ok {
+		name = labelUnknown
-		span.AddLabels("x-request-id", id)
 	}
 	labels := []string{labelMethod, "BeginTx", labelQuery, name}
-
+	if connBeginTx, ok := w.conn.(driver.ConnBeginTx); ok {
-	connBeginTx, ok := w.conn.(driver.ConnBeginTx)
+		ts := time.Now()
-	if !ok {
+		tx, err := connBeginTx.BeginTx(nctx, opts)
-		return w.Begin()
+		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.AddLabels("error", true)
+			span.AddLabels("err", err.Error())
+			if w.opts.LoggerEnabled {
+				w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "BeginTx", name, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
+			}
+			return nil, err
+		}
+		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
+		if w.opts.LoggerEnabled {
+			w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "BeginTx", name, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
+		}
+		return &wrapperTx{tx: tx, opts: w.opts, span: span}, nil
 	}
-
 	ts := time.Now()
-	tx, err := connBeginTx.BeginTx(nctx, opts)
+	// nolint:staticcheck
+	tx, err := w.conn.Begin()
 	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())
+		span.AddLabels("error", true)
-		/*
+		span.AddLabels("err", 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
 	}
 	w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
-	/*
+	w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
-		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+	w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
-			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "BeginTx", getCallerName(), td, err)...)
+	if w.opts.LoggerEnabled {
-		}
+		w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "BeginTx", name, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
-	*/
+	}
-	return &wrapperTx{tx: tx, opts: w.opts, ctx: ctx, span: span}, nil
+	return tx, nil
 }
 
-// Prepare implements driver.Conn Prepare
+// PrepareContext implements driver.ConnPrepareContext PrepareContext
-func (w *wrapperConn) Prepare(query string) (driver.Stmt, error) {
+func (w *wrapperConn) PrepareContext(ctx context.Context, query string) (driver.Stmt, error) {
-	var ctx context.Context
+	nctx, span := w.opts.Tracer.Start(ctx, "PrepareContext")
-	if w.ctx != nil {
+	span.AddLabels("method", "PrepareContext")
-		ctx = w.ctx
+	name := getQueryName(ctx)
+	if name != "" {
+		span.AddLabels("query", name)
 	} else {
-		ctx = context.Background()
+		name = labelUnknown
+	}
+	labels := []string{labelMethod, "PrepareContext", labelQuery, name}
+	if conn, ok := w.conn.(driver.ConnPrepareContext); ok {
+		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.AddLabels("error", true)
+			span.AddLabels("err", err.Error())
+			if w.opts.LoggerEnabled {
+				w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "PrepareContext", name, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
+			}
+			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.Fields(w.opts.LoggerObserver(context.TODO(), "PrepareContext", name, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
+		}
+		return &wrapperStmt{stmt: stmt, opts: w.opts}, nil
 	}
-	_ = ctx
-	labels := []string{labelMethod, "Prepare", labelQuery, getCallerName()}
 	ts := time.Now()
 	stmt, err := w.conn.Prepare(query)
 	td := time.Since(ts)
@@ -159,309 +186,225 @@ func (w *wrapperConn) Prepare(query string) (driver.Stmt, error) {
 		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.AddLabels("error", true)
-			if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+		span.AddLabels("err", err.Error())
-				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 {
-		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+		w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "PrepareContext", name, td, err)...).Log(context.TODO(), 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) {
-	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")
+	return stmt, nil
-	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
-	}
-	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 wrapStmt(stmt, query, w.opts), nil
 }
 
 // Exec implements driver.Execer Exec
 func (w *wrapperConn) Exec(query string, args []driver.Value) (driver.Result, error) {
-	var ctx context.Context
-	if w.ctx != nil {
-		ctx = w.ctx
-	} else {
-		ctx = context.Background()
-	}
-	_ = ctx
-	labels := []string{labelMethod, "Exec", labelQuery, getCallerName()}
-
 	// nolint:staticcheck
-	conn, ok := w.conn.(driver.Execer)
+	labels := []string{labelMethod, "Exec", labelQuery, labelUnknown}
-	if !ok {
+	if execer, ok := w.conn.(driver.Execer); ok {
-		return nil, driver.ErrSkip
+		ts := time.Now()
-	}
+		res, err := execer.Exec(query, args)
-
+		td := time.Since(ts)
-	ts := time.Now()
+		te := td.Seconds()
-	res, err := conn.Exec(query, args)
+		if err != nil {
-	td := time.Since(ts)
+			w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
-	te := td.Seconds()
+		} else {
-	if err != nil {
+			w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
-		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)...)
 		}
-	*/
+		w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
-	return res, err
+		w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+		if w.opts.LoggerEnabled {
+			w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "Exec", labelUnknown, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
+		}
+		return res, err
+	}
+	if w.opts.LoggerEnabled {
+		w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "Exec", labelUnknown, 0, ErrUnsupported)...).Log(context.TODO(), w.opts.LoggerLevel)
+	}
+	return nil, ErrUnsupported
 }
 
 // Exec implements driver.StmtExecContext ExecContext
 func (w *wrapperConn) ExecContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Result, error) {
-	var nctx context.Context
+	nctx, span := w.opts.Tracer.Start(ctx, "ExecContext")
-	var span tracer.Span
+	span.AddLabels("method", "ExecContext")
-
 	name := getQueryName(ctx)
-	if w.ctx != nil {
+	if name != "" {
-		nctx, span = w.opts.Tracer.Start(w.ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+		span.AddLabels("query", name)
 	} else {
-		nctx, span = w.opts.Tracer.Start(ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+		name = labelUnknown
-	}
-	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 len(args) > 0 {
-		span.AddLabels("db.args", fmt.Sprintf("%v", namedValueToLabels(args)))
+		span.AddLabels("args", fmt.Sprintf("%v", namedValueToLabels(args)))
 	}
 	labels := []string{labelMethod, "ExecContext", labelQuery, name}
-
+	if conn, ok := w.conn.(driver.ExecerContext); ok {
-	conn, ok := w.conn.(driver.ExecerContext)
+		ts := time.Now()
-	if !ok {
+		res, err := conn.ExecContext(nctx, query, args)
-		// nolint:staticcheck
+		td := time.Since(ts)
-		return nil, driver.ErrSkip
+		te := td.Seconds()
+		if err != nil {
+			w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+			span.AddLabels("error", true)
+			span.AddLabels("err", err.Error())
+		} else {
+			w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
+		}
+		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.Fields(w.opts.LoggerObserver(context.TODO(), "ExecContext", name, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
+		}
+		return res, err
+	}
+	values, err := namedValueToValue(args)
+	if err != nil {
+		span.AddLabels("error", true)
+		span.AddLabels("err", err.Error())
+		if w.opts.LoggerEnabled {
+			w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "ExecContext", labelUnknown, 0, err)...).Log(context.TODO(), w.opts.LoggerLevel)
+		}
+		return nil, err
 	}
-
 	ts := time.Now()
-	res, err := conn.ExecContext(nctx, query, args)
+	// nolint:staticcheck
+	res, err := w.Exec(query, values)
 	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())
+		span.AddLabels("error", true)
+		span.AddLabels("err", err.Error())
 	} else {
 		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
 	}
-	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 {
-		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+		w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "ExecContext", name, td, err)...).Log(context.TODO(), 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 {
-	conn, ok := w.conn.(driver.Pinger)
+	if conn, ok := w.conn.(driver.Pinger); ok {
-
+		nctx, span := w.opts.Tracer.Start(ctx, "Ping")
-	if !ok {
-		// fallback path to check db alive
-		pc, err := w.d.Open(w.dname)
-		if err != nil {
-			return err
-		}
-		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"}
-	labels := []string{labelMethod, "Ping"}
+		ts := time.Now()
-	ts := time.Now()
+		err := conn.Ping(nctx)
-	err := conn.Ping(nctx)
+		td := time.Since(ts)
-	td := time.Since(ts)
+		te := td.Seconds()
-	te := td.Seconds()
+		if err != nil {
-	if err != nil {
+			w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
-		w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+			span.AddLabels("error", true)
-		// span.SetStatus(tracer.SpanStatusError, err.Error())
+			span.AddLabels("err", err.Error())
-		/*
+			if w.opts.LoggerEnabled {
-			if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+				w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "Ping", labelUnknown, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
-				w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "Ping", getCallerName(), td, err)...)
 			}
-		*/
+			return err
-		return err
+		} else {
-	} else {
+			w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
-		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)
 	}
-	w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
+	if w.opts.LoggerEnabled {
-	w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+		w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "Ping", labelUnknown, 0, ErrUnsupported)...).Log(context.TODO(), w.opts.LoggerLevel)
-
+	}
-	return nil
+	return ErrUnsupported
 }
 
 // Query implements driver.Queryer Query
 func (w *wrapperConn) Query(query string, args []driver.Value) (driver.Rows, error) {
-	var ctx context.Context
-	if w.ctx != nil {
-		ctx = w.ctx
-	} else {
-		ctx = context.Background()
-	}
-	_ = ctx
 	// nolint:staticcheck
-	conn, ok := w.conn.(driver.Queryer)
+	if conn, ok := w.conn.(driver.Queryer); ok {
-	if !ok {
+		labels := []string{labelMethod, "Query", labelQuery, labelUnknown}
-		return nil, driver.ErrSkip
+		ts := time.Now()
-	}
+		rows, err := conn.Query(query, args)
-
+		td := time.Since(ts)
-	labels := []string{labelMethod, "Query", labelQuery, getCallerName()}
+		te := td.Seconds()
-	ts := time.Now()
+		if err != nil {
-	rows, err := conn.Query(query, args)
+			w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
-	td := time.Since(ts)
+		} else {
-	te := td.Seconds()
+			w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelSuccess)...).Inc()
-	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)...)
 		}
-	*/
+		w.opts.Meter.Summary(meterRequestLatencyMicroseconds, labels...).Update(te)
-	return rows, err
+		w.opts.Meter.Histogram(meterRequestDurationSeconds, labels...).Update(te)
+		if w.opts.LoggerEnabled {
+			w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "Query", labelUnknown, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
+		}
+		return rows, err
+	}
+	if w.opts.LoggerEnabled {
+		w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "Query", labelUnknown, 0, ErrUnsupported)...).Log(context.TODO(), w.opts.LoggerLevel)
+	}
+	return nil, ErrUnsupported
 }
 
 // QueryContext implements Driver.QueryerContext QueryContext
 func (w *wrapperConn) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Rows, error) {
-	var nctx context.Context
+	nctx, span := w.opts.Tracer.Start(ctx, "QueryContext")
-	var span tracer.Span
+	span.AddLabels("method", "QueryContext")
-
 	name := getQueryName(ctx)
-	if w.ctx != nil {
+	if name != "" {
-		nctx, span = w.opts.Tracer.Start(w.ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+		span.AddLabels("query", name)
 	} else {
-		nctx, span = w.opts.Tracer.Start(ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+		name = labelUnknown
-	}
-	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 len(args) > 0 {
-		span.AddLabels("db.args", fmt.Sprintf("%v", namedValueToLabels(args)))
+		span.AddLabels("args", fmt.Sprintf("%v", namedValueToLabels(args)))
 	}
 	labels := []string{labelMethod, "QueryContext", labelQuery, name}
-	conn, ok := w.conn.(driver.QueryerContext)
+	if conn, ok := w.conn.(driver.QueryerContext); ok {
-	if !ok {
+		ts := time.Now()
-		return nil, driver.ErrSkip
+		rows, err := conn.QueryContext(nctx, query, args)
+		td := time.Since(ts)
+		te := td.Seconds()
+		if err != nil {
+			w.opts.Meter.Counter(meterRequestTotal, append(labels, labelStatus, labelFailure)...).Inc()
+			span.AddLabels("error", true)
+			span.AddLabels("err", 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.Fields(w.opts.LoggerObserver(context.TODO(), "QueryContext", name, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
+		}
+		return rows, err
+	}
+	values, err := namedValueToValue(args)
+	if err != nil {
+		span.AddLabels("error", true)
+		span.AddLabels("err", err.Error())
+		if w.opts.LoggerEnabled {
+			w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "QueryContext", name, 0, err)...).Log(context.TODO(), w.opts.LoggerLevel)
+		}
+		return nil, err
 	}
-
 	ts := time.Now()
-	rows, err := conn.QueryContext(nctx, query, args)
+	// nolint:staticcheck
+	rows, err := w.Query(query, values)
 	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())
+		span.AddLabels("error", true)
+		span.AddLabels("err", 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 {
-		if w.opts.LoggerEnabled && w.opts.Logger.V(w.opts.LoggerLevel) {
+		w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "QueryContext", name, td, err)...).Log(context.TODO(), 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)
-}

doc.go

@@ -1,2 +1,2 @@
 // package wrapper provides SQL driver wrapper with micro tracing, logging, metering capabilities
-package wrapper
+package wrapper // import go.unistack.org/micro-wrapper-sql/v3

driver.go

@@ -6,87 +6,30 @@ import (
 	"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...), ctx: context.Background()}
+	return &wrapperDriver{driver: d, opts: NewOptions(opts...)}
 }
 
-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) {
-	// 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 connector.Connect(ctx)
-	*/
-
 	ts := time.Now()
 	c, err := w.driver.Open(name)
 	td := time.Since(ts)
-	/*
+
-		if w.opts.LoggerEnabled {
+	if w.opts.LoggerEnabled {
-			w.opts.Logger.Log(w.ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(w.ctx, "Open", getCallerName(), td, err)...)
+		w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "Open", labelUnknown, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
-		}
+	}
-	*/
+
-	_ = td
 	if err != nil {
 		return nil, err
 	}
 
-	return wrapConn(c, w.opts), nil
+	return &wrapperConn{conn: c, opts: w.opts}, nil
 }

gen.go

@@ -1,167 +0,0 @@
-//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,18 +1,6 @@
 module go.unistack.org/micro-wrapper-sql/v3
 
-go 1.22
+go 1.16
 
-toolchain go1.23.2
+require go.unistack.org/micro/v3 v3.9.19
 
-require (
-	go.unistack.org/micro-wrapper-requestid/v3 v3.9.2
-	go.unistack.org/micro/v3 v3.10.97
-)
-
-require (
-	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
-	golang.org/x/sys v0.26.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
-	google.golang.org/grpc v1.67.1 // indirect
-	google.golang.org/protobuf v1.35.1 // indirect
-)

go.sum

@@ -1,39 +1,159 @@
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-go.unistack.org/micro-wrapper-requestid/v3 v3.8.10 h1:9QZy6w1HU2RCppZ1t8wJsDg1pk9RbvzUFYurq3Ai29Y=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-go.unistack.org/micro-wrapper-requestid/v3 v3.8.10/go.mod h1:3tY5+DwQM7l07chnpu/Wzwnne/ZV75VsUwXR54/WYzo=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-go.unistack.org/micro-wrapper-requestid/v3 v3.9.2 h1:Wu0oIGJieH37xroCjlaPivuqTGmv5l5KWgVaRQWEQMY=
+github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
-go.unistack.org/micro-wrapper-requestid/v3 v3.9.2/go.mod h1:cqgjdSSASTnOLjvwndP9bi0b8DbuoKbDII884R5puwU=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-go.unistack.org/micro/v3 v3.10.57 h1:VxG7Cs7kBOgxgQlP+K8TvTxIgh2pmqAwmAaKdTAQNtQ=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-go.unistack.org/micro/v3 v3.10.57/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-go.unistack.org/micro/v3 v3.10.91 h1:vuJY4tXwpqimwIkEJ3TozMYNVQQs+C5QMlQWPgSY/YM=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-go.unistack.org/micro/v3 v3.10.91/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-go.unistack.org/micro/v3 v3.10.97 h1:8l7fv+i06/PjPrBBhRC/ZQkWGIOuHPg3jJN0vktYE78=
+github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-go.unistack.org/micro/v3 v3.10.97/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
+github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 h1:QCqS/PdaHTSWGvupk2F/ehwHtGc0/GYkT+3GAcR1CCc=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0=
+github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
+github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
+go.unistack.org/micro-proto/v3 v3.3.1 h1:nQ0MtWvP2G3QrpOgawVOPhpZZYkq6umTGDqs8FxJYIo=
+go.unistack.org/micro-proto/v3 v3.3.1/go.mod h1:cwRyv8uInM2I7EbU7O8Fx2Ls3N90Uw9UCCcq4olOdfE=
+go.unistack.org/micro/v3 v3.9.19 h1:HFeHr20hnrs60EnlKWwrvQLTXILu3qhmHqs98jlqmqk=
+go.unistack.org/micro/v3 v3.9.19/go.mod h1:gI4RkJKHLPW7KV6h4+ZBOZD997MRvFRXMPQIHpozikI=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+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/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+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/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
+gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

options.go

@@ -13,9 +13,11 @@ import (
 var (
 	// DefaultMeterStatsInterval holds default stats interval
 	DefaultMeterStatsInterval = 5 * time.Second
+	// DefaultMeterMetricPrefix holds default metric prefix
+	DefaultMeterMetricPrefix = "micro_sql_"
 	// 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)}
+		labels := []interface{}{"method", method, "took", fmt.Sprintf("%v", td)}
 		if err != nil {
 			labels = append(labels, "error", err.Error())
 		}
@@ -27,23 +29,23 @@ var (
 )
 
 var (
-	MaxOpenConnections = "micro_sql_max_open_conn"
+	MaxOpenConnections = "max_open_connections"
-	OpenConnections    = "micro_sql_open_conn"
+	OpenConnections    = "open_connections"
-	InuseConnections   = "micro_sql_inuse_conn"
+	InuseConnections   = "inuse_connections"
-	IdleConnections    = "micro_sql_idle_conn"
+	IdleConnections    = "idle_connections"
-	WaitConnections    = "micro_sql_waited_conn"
+	WaitConnections    = "wait_connections"
-	BlockedSeconds     = "micro_sql_blocked_seconds"
+	BlockedSeconds     = "blocked_seconds"
-	MaxIdleClosed      = "micro_sql_max_idle_closed"
+	MaxIdleClosed      = "max_idle_closed"
-	MaxIdletimeClosed  = "micro_sql_closed_max_idle"
+	MaxIdletimeClosed  = "max_idletime_closed"
-	MaxLifetimeClosed  = "micro_sql_closed_max_lifetime"
+	MaxLifetimeClosed  = "max_lifetime_closed"
 
-	meterRequestTotal               = "micro_sql_request_total"
+	meterRequestTotal               = "request_total"
-	meterRequestLatencyMicroseconds = "micro_sql_latency_microseconds"
+	meterRequestLatencyMicroseconds = "request_latency_microseconds"
-	meterRequestDurationSeconds     = "micro_sql_request_duration_seconds"
+	meterRequestDurationSeconds     = "request_duration_seconds"
 
 	labelUnknown  = "unknown"
-	labelQuery    = "db_statement"
+	labelQuery    = "query"
-	labelMethod   = "db_method"
+	labelMethod   = "method"
 	labelStatus   = "status"
 	labelSuccess  = "success"
 	labelFailure  = "failure"
@@ -58,6 +60,7 @@ type Options struct {
 	Tracer             tracer.Tracer
 	DatabaseHost       string
 	DatabaseName       string
+	MeterMetricPrefix  string
 	MeterStatsInterval time.Duration
 	LoggerLevel        logger.Level
 	LoggerEnabled      bool
@@ -74,6 +77,7 @@ func NewOptions(opts ...Option) Options {
 		Meter:              meter.DefaultMeter,
 		Tracer:             tracer.DefaultTracer,
 		MeterStatsInterval: DefaultMeterStatsInterval,
+		MeterMetricPrefix:  DefaultMeterMetricPrefix,
 		LoggerLevel:        logger.ErrorLevel,
 		LoggerObserver:     DefaultLoggerObserver,
 	}
@@ -82,13 +86,14 @@ func NewOptions(opts ...Option) Options {
 	}
 
 	options.Meter = options.Meter.Clone(
+		meter.MetricPrefix(options.MeterMetricPrefix),
 		meter.Labels(
 			labelHost, options.DatabaseHost,
 			labelDatabase, options.DatabaseName,
 		),
 	)
 
-	options.Logger = options.Logger.Clone(logger.WithAddCallerSkipCount(1))
+	options.Logger = options.Logger.Clone(logger.WithCallerSkipCount(1))
 
 	return options
 }
@@ -100,6 +105,13 @@ func MetricInterval(td time.Duration) Option {
 	}
 }
 
+// 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
@@ -165,8 +177,8 @@ func QueryName(ctx context.Context, name string) context.Context {
 }
 
 func getQueryName(ctx context.Context) string {
-	if v, ok := ctx.Value(queryNameKey{}).(string); ok && v != labelUnknown {
+	if v, ok := ctx.Value(queryNameKey{}).(string); ok {
 		return v
 	}
-	return getCallerName()
+	return ""
 }

stmt.go

@@ -5,35 +5,16 @@ import (
 	"database/sql/driver"
 	"fmt"
 	"time"
-
-	requestid "go.unistack.org/micro-wrapper-requestid/v3"
-	"go.unistack.org/micro/v3/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
+	stmt driver.Stmt
-	opts  Options
+	opts Options
-	query string
-	ctx   context.Context
 }
 
 // Close implements driver.Stmt Close
 func (w *wrapperStmt) Close() error {
-	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()
@@ -46,11 +27,10 @@ func (w *wrapperStmt) Close() error {
 	}
 	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) {
+	if w.opts.LoggerEnabled {
-			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "Close", getCallerName(), td, err)...)
+		w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "Close", labelUnknown, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
-		}
+	}
-	*/
 	return err
 }
 
@@ -59,27 +39,12 @@ 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) {
-	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
+	// nolint:staticcheck
+	res, err := w.stmt.Exec(args)
 	td := time.Since(ts)
 	te := td.Seconds()
 	if err != nil {
@@ -89,26 +54,19 @@ func (w *wrapperStmt) Exec(args []driver.Value) (driver.Result, error) {
 	}
 	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) {
+	if w.opts.LoggerEnabled {
-			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "Exec", getCallerName(), td, err)...)
+		w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "Exec", labelUnknown, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
-		}
+	}
-	*/
 	return res, err
 }
 
 // Query implements driver.Stmt Query
 func (w *wrapperStmt) Query(args []driver.Value) (driver.Rows, error) {
-	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
+	// nolint:staticcheck
+	rows, err := w.stmt.Query(args)
 	td := time.Since(ts)
 	te := td.Seconds()
 	if err != nil {
@@ -118,170 +76,147 @@ func (w *wrapperStmt) Query(args []driver.Value) (driver.Rows, error) {
 	}
 	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) {
+	if w.opts.LoggerEnabled {
-			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "Query", getCallerName(), td, err)...)
+		w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "Query", labelUnknown, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
-		}
+	}
-	*/
 	return rows, err
 }
 
-// ColumnConverter implements driver.ColumnConverter
+// ExecContext implements driver.ExecerContext ExecContext
-func (w *wrapperStmt) ColumnConverter(idx int) driver.ValueConverter {
+func (w *wrapperStmt) ExecContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Result, error) {
-	s, ok := w.stmt.(driver.ColumnConverter) // nolint:staticcheck
+	nctx, span := w.opts.Tracer.Start(ctx, "ExecContext")
-	if !ok {
+	span.AddLabels("method", "ExecContext")
-		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 {
+	if name != "" {
-		nctx, span = w.opts.Tracer.Start(w.ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+		span.AddLabels("query", name)
 	} else {
-		nctx, span = w.opts.Tracer.Start(ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+		name = labelUnknown
 	}
-	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)))
+		span.AddLabels("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.ExecerContext); ok {
-	if conn, ok := w.stmt.(driver.StmtExecContext); ok {
 		ts := time.Now()
-		res, err := conn.ExecContext(nctx, args)
+		res, err := conn.ExecContext(nctx, query, 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())
+			span.AddLabels("error", true)
+			span.AddLabels("err", 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) {
+		if w.opts.LoggerEnabled {
-				w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "ExecContext", name, td, err)...)
+			w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "ExecContext", name, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
-			}
+		}
-		*/
 		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())
+		span.AddLabels("error", true)
-		/*
+		span.AddLabels("err", 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)...)
+		if w.opts.LoggerEnabled {
-			}
+			w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "ExecContext", name, 0, err)...).Log(context.TODO(), w.opts.LoggerLevel)
-		*/
+		}
 		return nil, err
 	}
 	ts := time.Now()
-	res, err := w.Exec(values) // nolint:staticcheck
+	// nolint:staticcheck
+	res, err := w.Exec(values)
 	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())
+		span.AddLabels("error", true)
+		span.AddLabels("err", 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) {
+	if w.opts.LoggerEnabled {
-			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "ExecContext", name, td, err)...)
+		w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "ExecContext", name, td, err)).Log(context.TODO(), w.opts.LoggerLevel)
-		}
+	}
-	*/
 	return res, err
 }
 
-// QueryContext implements driver.StmtQueryContext StmtQueryContext
+// QueryContext implements Driver.QueryerContext QueryContext
-func (w *wrapperStmt) QueryContext(ctx context.Context, args []driver.NamedValue) (driver.Rows, error) {
+func (w *wrapperStmt) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Rows, error) {
-	var nctx context.Context
+	nctx, span := w.opts.Tracer.Start(ctx, "QueryContext")
-	var span tracer.Span
+	span.AddLabels("method", "QueryContext")
-
 	name := getQueryName(ctx)
-	if w.ctx != nil {
+	if name != "" {
-		nctx, span = w.opts.Tracer.Start(w.ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+		span.AddLabels("query", name)
 	} else {
-		nctx, span = w.opts.Tracer.Start(ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
+		name = labelUnknown
 	}
-	span.AddLabels("db.method", "QueryContext")
-	span.AddLabels("db.statement", name)
 	defer span.Finish()
 	if len(args) > 0 {
-		span.AddLabels("db.args", fmt.Sprintf("%v", namedValueToLabels(args)))
+		span.AddLabels("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 {
+	if conn, ok := w.stmt.(driver.QueryerContext); ok {
 		ts := time.Now()
-		rows, err := conn.QueryContext(nctx, args)
+		rows, err := conn.QueryContext(nctx, query, 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())
+			span.AddLabels("error", true)
+			span.AddLabels("err", 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) {
+		if w.opts.LoggerEnabled {
-				w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "QueryContext", name, td, err)...)
+			w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "QueryContext", name, td, err)).Log(context.TODO(), w.opts.LoggerLevel)
-			}
+		}
-		*/
 		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())
+		span.AddLabels("error", true)
-		/*
+		span.AddLabels("err", 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)...)
+		if w.opts.LoggerEnabled {
-			}
+			w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "QueryContext", name, 0, err)...).Log(context.TODO(), w.opts.LoggerLevel)
-		*/
+		}
 		return nil, err
 	}
 	ts := time.Now()
-	rows, err := w.Query(values) // nolint:staticcheck
+	// nolint:staticcheck
+	rows, err := w.Query(values)
 	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())
+		span.AddLabels("error", true)
+		span.AddLabels("err", 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) {
+	if w.opts.LoggerEnabled {
-			w.opts.Logger.Log(ctx, w.opts.LoggerLevel, w.opts.LoggerObserver(ctx, "QueryContext", name, td, err)...)
+		w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "QueryContext", name, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
-		}
+	}
-	*/
 	return rows, err
 }

tx.go

@@ -8,56 +8,41 @@ import (
 	"go.unistack.org/micro/v3/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 {
+	if w.span != nil {
+		defer w.span.Finish()
+	}
 	ts := time.Now()
 	err := w.tx.Commit()
 	td := time.Since(ts)
-	_ = td
+
-	if w.span != nil {
+	if w.opts.LoggerEnabled {
-		if err != nil {
+		w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "Commit", labelUnknown, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
-			w.span.SetStatus(tracer.SpanStatusError, err.Error())
-		}
-		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 {
+	if w.span != nil {
+		defer w.span.Finish()
+	}
 	ts := time.Now()
 	err := w.tx.Rollback()
 	td := time.Since(ts)
-	_ = td
+
-	if w.span != nil {
+	if w.opts.LoggerEnabled {
-		if err != nil {
+		w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "Rollback", labelUnknown, td, err)...).Log(context.TODO(), w.opts.LoggerLevel)
-			w.span.SetStatus(tracer.SpanStatusError, err.Error())
-		}
-		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

@@ -1,17 +0,0 @@
-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...))
-}