Merge pull request 'fixup metrics and tracing' (#78) from fixup into v3

Reviewed-on: #78

common.go

@@ -39,7 +39,7 @@ func namedValueToLabels(named []driver.NamedValue) []interface{} {
 
 // getCallerName get the name of the function A where A() -> B() -> GetFunctionCallerName()
 func getCallerName() string {
-	pc, _, _, ok := runtime.Caller(3)
+	pc, _, _, ok := runtime.Caller(2)
 	details := runtime.FuncForPC(pc)
 	var callerName string
 	if ok && details != nil {

conn.go

@@ -6,8 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	requestid "go.unistack.org/micro-wrapper-requestid/v4"
-	"go.unistack.org/micro/v4/tracer"
+	"go.unistack.org/micro/v3/tracer"
 )
 
 var (
@@ -100,11 +99,12 @@ func (w *wrapperConn) Begin() (driver.Tx, error) {
 // 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, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
-	span.AddLabels("db.method", "BeginTx")
+	span.AddLabels("method", "BeginTx")
 	name := getQueryName(ctx)
-	span.AddLabels("db.statement", name)
-	if id, ok := ctx.Value(requestid.XRequestIDKey).(string); ok {
-		span.AddLabels("x-request-id", id)
+	if name != "" {
+		span.AddLabels("db.query", name)
+	} else {
+		name = getCallerName()
 	}
 	labels := []string{labelMethod, "BeginTx", labelQuery, name}
 
@@ -178,12 +178,14 @@ func (w *wrapperConn) PrepareContext(ctx context.Context, query string) (driver.
 	} else {
 		nctx, span = w.opts.Tracer.Start(ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
 	}
-	span.AddLabels("db.method", "PrepareContext")
+	span.AddLabels("method", "PrepareContext")
 	name := getQueryName(ctx)
-	span.AddLabels("db.statement", name)
-	if id, ok := ctx.Value(requestid.XRequestIDKey).(string); ok {
-		span.AddLabels("x-request-id", id)
+	if name != "" {
+		span.AddLabels("db.query", name)
+	} else {
+		name = getCallerName()
 	}
+
 	labels := []string{labelMethod, "PrepareContext", labelQuery, name}
 	conn, ok := w.conn.(driver.ConnPrepareContext)
 	if !ok {
@@ -257,11 +259,12 @@ func (w *wrapperConn) ExecContext(ctx context.Context, query string, args []driv
 	} else {
 		nctx, span = w.opts.Tracer.Start(ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
 	}
-	span.AddLabels("db.method", "ExecContext")
+	span.AddLabels("method", "ExecContext")
 	name := getQueryName(ctx)
-	span.AddLabels("db.statement", name)
-	if id, ok := ctx.Value(requestid.XRequestIDKey).(string); ok {
-		span.AddLabels("x-request-id", id)
+	if name != "" {
+		span.AddLabels("db.query", name)
+	} else {
+		name = getCallerName()
 	}
 	defer span.Finish()
 	if len(args) > 0 {
@@ -379,11 +382,12 @@ func (w *wrapperConn) QueryContext(ctx context.Context, query string, args []dri
 	} else {
 		nctx, span = w.opts.Tracer.Start(ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
 	}
-	span.AddLabels("db.method", "QueryContext")
+	span.AddLabels("method", "QueryContext")
 	name := getQueryName(ctx)
-	span.AddLabels("db.statement", name)
-	if id, ok := ctx.Value(requestid.XRequestIDKey).(string); ok {
-		span.AddLabels("x-request-id", id)
+	if name != "" {
+		span.AddLabels("db.statement", name)
+	} else {
+		name = getCallerName()
 	}
 	defer span.Finish()
 	if len(args) > 0 {

go.mod

@@ -1,8 +1,5 @@
-module go.unistack.org/micro-wrapper-sql/v4
+module gitlab.mtsbank.ru/service-platform/framework/framework-modules/micro-wrapper-sql
 
-go 1.20
+go 1.18
 
-require (
-	go.unistack.org/micro-wrapper-requestid/v4 v4.0.3
-	go.unistack.org/micro/v4 v4.0.8
-)
+require go.unistack.org/micro/v3 v3.10.25

go.sum

@@ -1,4 +1,2 @@
-go.unistack.org/micro-wrapper-requestid/v4 v4.0.3 h1:LhloK8yLLsov4XiKw9i20wdBUfvWCG1TaBNgNVtNa8Q=
-go.unistack.org/micro-wrapper-requestid/v4 v4.0.3/go.mod h1:vRIkCMyhbBVus1xQlr/Fef65n07znrBGkpSCpjkEiqk=
-go.unistack.org/micro/v4 v4.0.8 h1:D5n18+fhyRjJkKSPdIcW1ratWUuzy9TzrS5ud/qImWg=
-go.unistack.org/micro/v4 v4.0.8/go.mod h1:QT3gOIE4qGgBiQGm2Pad/62Sl5R53QfrgYHD448aX14=
+go.unistack.org/micro/v3 v3.10.25 h1:A0epdZHOqjnXx103wwFhPKgmvVVbScvfbmn3HmHz1wE=
+go.unistack.org/micro/v3 v3.10.25/go.mod h1:ALkeXpqChYDjx8KPi7tz9mmIyOnob6nlNswsg8BnZjQ=

options.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"time"
 
-	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v4/meter"
-	"go.unistack.org/micro/v4/tracer"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v3/meter"
+	"go.unistack.org/micro/v3/tracer"
 )
 
 var (
@@ -17,7 +17,7 @@ var (
 	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())
 		}
@@ -44,8 +44,8 @@ var (
 	meterRequestDurationSeconds     = "request_duration_seconds"
 
 	labelUnknown  = "unknown"
-	labelQuery    = "db_statement"
-	labelMethod   = "db_method"
+	labelQuery    = "query"
+	labelMethod   = "method"
 	labelStatus   = "status"
 	labelSuccess  = "success"
 	labelFailure  = "failure"
@@ -180,5 +180,5 @@ func getQueryName(ctx context.Context) string {
 	if v, ok := ctx.Value(queryNameKey{}).(string); ok && v != labelUnknown {
 		return v
 	}
-	return getCallerName()
+	return ""
 }

stats.go

@@ -1,4 +1,4 @@
-package wrapper // import "go.unistack.org/micro-wrapper-sql/v4"
+package wrapper // import "go.unistack.org/micro-wrapper-sql/v3"
 
 import (
 	"context"

stmt.go

@@ -6,8 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	requestid "go.unistack.org/micro-wrapper-requestid/v4"
-	"go.unistack.org/micro/v4/tracer"
+	"go.unistack.org/micro/v3/tracer"
 )
 
 var (
@@ -141,16 +140,17 @@ func (w *wrapperStmt) ExecContext(ctx context.Context, args []driver.NamedValue)
 	} else {
 		nctx, span = w.opts.Tracer.Start(ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
 	}
-	span.AddLabels("db.method", "ExecContext")
+	span.AddLabels("method", "ExecContext")
 	name := getQueryName(ctx)
-	span.AddLabels("db.statement", name)
+	if name != "" {
+		span.AddLabels("db.query", name)
+	} else {
+		name = getCallerName()
+	}
 	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 {
@@ -214,16 +214,17 @@ func (w *wrapperStmt) QueryContext(ctx context.Context, args []driver.NamedValue
 	} else {
 		nctx, span = w.opts.Tracer.Start(ctx, "sdk.database", tracer.WithSpanKind(tracer.SpanKindClient))
 	}
-	span.AddLabels("db.method", "QueryContext")
+	span.AddLabels("method", "QueryContext")
 	name := getQueryName(ctx)
-	span.AddLabels("db.statement", name)
+	if name != "" {
+		span.AddLabels("db.query", name)
+	} else {
+		name = getCallerName()
+	}
 	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, "QueryContext", labelQuery, name}
 	if conn, ok := w.stmt.(driver.StmtQueryContext); ok {
 		ts := time.Now()

tx.go

@@ -5,7 +5,7 @@ import (
 	"database/sql/driver"
 	"time"
 
-	"go.unistack.org/micro/v4/tracer"
+	"go.unistack.org/micro/v3/tracer"
 )
 
 var _ driver.Tx = (*wrapperTx)(nil)