diff --git a/common.go b/common.go index 3b59ff8..b74452d 100644 --- a/common.go +++ b/common.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{}, len(named)*2) + largs := make([]interface{}, 0, len(named)*2) var name string for _, param := range named { if param.Name != "" { @@ -32,8 +32,7 @@ func namedValueToLabels(named []driver.NamedValue) []interface{} { } else { name = fmt.Sprintf("$%d", param.Ordinal) } - - largs = append(largs, name, param.Value) + largs = append(largs, fmt.Sprintf("%s=%s", name, param.Value)) } return largs } diff --git a/conn.go b/conn.go index f9612db..ad334df 100644 --- a/conn.go +++ b/conn.go @@ -5,12 +5,17 @@ import ( "database/sql/driver" "fmt" "time" + + "go.unistack.org/micro/v3/tracer" ) +var _ driver.Conn = &wrapperConn{} + // wrapperConn defines a wrapper for driver.Conn type wrapperConn struct { conn driver.Conn opts Options + ctx context.Context } // Prepare implements driver.Conn Prepare @@ -91,7 +96,7 @@ 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, "BeginTx") + nctx, span := w.opts.Tracer.Start(ctx, "Transaction") span.AddLabels("method", "BeginTx") name := getQueryName(ctx) if name != "" { @@ -120,7 +125,8 @@ func (w *wrapperConn) BeginTx(ctx context.Context, opts driver.TxOptions) (drive 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 + w.ctx = nctx + return &wrapperTx{ctx: ctx, tx: tx, opts: w.opts, span: span, conn: w}, nil } ts := time.Now() // nolint:staticcheck @@ -140,12 +146,19 @@ func (w *wrapperConn) BeginTx(ctx context.Context, opts driver.TxOptions) (drive if w.opts.LoggerEnabled { w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "BeginTx", name, td, err)...).Log(context.TODO(), w.opts.LoggerLevel) } - return tx, nil + w.ctx = nctx + return &wrapperTx{ctx: ctx, tx: tx, opts: w.opts, span: span, conn: w}, nil } // PrepareContext implements driver.ConnPrepareContext PrepareContext func (w *wrapperConn) PrepareContext(ctx context.Context, query string) (driver.Stmt, error) { - nctx, span := w.opts.Tracer.Start(ctx, "PrepareContext") + var nctx context.Context + var span tracer.Span + if w.ctx != nil { + nctx, span = w.opts.Tracer.Start(w.ctx, "PrepareContext") + } else { + nctx, span = w.opts.Tracer.Start(ctx, "PrepareContext") + } span.AddLabels("method", "PrepareContext") name := getQueryName(ctx) if name != "" { @@ -176,7 +189,7 @@ func (w *wrapperConn) PrepareContext(ctx context.Context, query string) (driver. 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 + return &wrapperStmt{stmt: stmt, opts: w.opts, ctx: nctx}, nil } ts := time.Now() stmt, err := w.conn.Prepare(query) @@ -227,7 +240,13 @@ func (w *wrapperConn) Exec(query string, args []driver.Value) (driver.Result, er // 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 + if w.ctx != nil { + nctx, span = w.opts.Tracer.Start(w.ctx, "ExecContext") + } else { + nctx, span = w.opts.Tracer.Start(ctx, "ExecContext") + } span.AddLabels("method", "ExecContext") name := getQueryName(ctx) if name != "" { @@ -292,7 +311,13 @@ func (w *wrapperConn) ExecContext(ctx context.Context, query string, args []driv // Ping implements driver.Pinger Ping func (w *wrapperConn) Ping(ctx context.Context) error { if conn, ok := w.conn.(driver.Pinger); ok { - nctx, span := w.opts.Tracer.Start(ctx, "Ping") + var nctx context.Context + var span tracer.Span + if w.ctx != nil { + nctx, span = w.opts.Tracer.Start(w.ctx, "Ping") + } else { + nctx, span = w.opts.Tracer.Start(ctx, "Ping") + } defer span.Finish() labels := []string{labelMethod, "Ping"} ts := time.Now() @@ -348,7 +373,13 @@ func (w *wrapperConn) Query(query string, args []driver.Value) (driver.Rows, err // QueryContext implements Driver.QueryerContext QueryContext func (w *wrapperConn) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Rows, error) { - nctx, span := w.opts.Tracer.Start(ctx, "QueryContext") + var nctx context.Context + var span tracer.Span + if w.ctx != nil { + nctx, span = w.opts.Tracer.Start(w.ctx, "QueryContext") + } else { + nctx, span = w.opts.Tracer.Start(ctx, "QueryContext") + } span.AddLabels("method", "QueryContext") name := getQueryName(ctx) if name != "" { diff --git a/stmt.go b/stmt.go index f5705ee..707362c 100644 --- a/stmt.go +++ b/stmt.go @@ -5,12 +5,17 @@ import ( "database/sql/driver" "fmt" "time" + + "go.unistack.org/micro/v3/tracer" ) +var _ driver.Stmt = &wrapperStmt{} + // wrapperStmt defines a wrapper for driver.Stmt type wrapperStmt struct { stmt driver.Stmt opts Options + ctx context.Context } // Close implements driver.Stmt Close @@ -85,7 +90,13 @@ func (w *wrapperStmt) Query(args []driver.Value) (driver.Rows, error) { // 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") + var nctx context.Context + var span tracer.Span + if w.ctx != nil { + nctx, span = w.opts.Tracer.Start(w.ctx, "ExecContext") + } else { + nctx, span = w.opts.Tracer.Start(ctx, "ExecContext") + } span.AddLabels("method", "ExecContext") name := getQueryName(ctx) if name != "" { @@ -153,7 +164,13 @@ func (w *wrapperStmt) ExecContext(ctx context.Context, query string, args []driv // QueryContext implements Driver.QueryerContext QueryContext func (w *wrapperStmt) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Rows, error) { - nctx, span := w.opts.Tracer.Start(ctx, "QueryContext") + var nctx context.Context + var span tracer.Span + if w.ctx != nil { + nctx, span = w.opts.Tracer.Start(w.ctx, "QueryContext") + } else { + nctx, span = w.opts.Tracer.Start(ctx, "QueryContext") + } span.AddLabels("method", "QueryContext") name := getQueryName(ctx) if name != "" { diff --git a/tx.go b/tx.go index 01defaf..9a56cbf 100644 --- a/tx.go +++ b/tx.go @@ -8,11 +8,15 @@ import ( "go.unistack.org/micro/v3/tracer" ) +var _ driver.Tx = &wrapperTx{} + // wrapperTx defines a wrapper for driver.Tx type wrapperTx struct { tx driver.Tx span tracer.Span opts Options + conn *wrapperConn + ctx context.Context } // Commit implements driver.Tx Commit @@ -30,9 +34,11 @@ func (w *wrapperTx) Commit() error { } if w.opts.LoggerEnabled { - w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "Commit", labelUnknown, td, err)...).Log(context.TODO(), w.opts.LoggerLevel) + w.opts.Logger.Fields(w.opts.LoggerObserver(w.ctx, "Commit", labelUnknown, td, err)...).Log(context.TODO(), w.opts.LoggerLevel) } + w.ctx = nil + return err } @@ -51,8 +57,10 @@ func (w *wrapperTx) Rollback() error { } if w.opts.LoggerEnabled { - w.opts.Logger.Fields(w.opts.LoggerObserver(context.TODO(), "Rollback", labelUnknown, td, err)...).Log(context.TODO(), w.opts.LoggerLevel) + w.opts.Logger.Fields(w.opts.LoggerObserver(w.ctx, "Rollback", labelUnknown, td, err)...).Log(context.TODO(), w.opts.LoggerLevel) } + w.ctx = nil + return err }