Merge pull request 'add err skip' (#81 ) from devstigneev/micro-wrapper-sql:issue_73 into master

Reviewed-on: #81
moved compare error to LoggerObserver
2024-04-11 11:40:28 +03:00 · 2024-04-11 11:38:09 +03:00 · 2024-04-07 22:12:39 +03:00 · 2023-09-05 07:08:08 +03:00 · 2023-09-01 14:49:52 +03:00 · 2023-09-01 14:48:57 +03:00
8 changed files with 32 additions and 27 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 *.dll
 *.so
 *.dylib
+bin

 # Test binary, built with `go test -c`
 *.test
@@ -13,3 +14,11 @@

 # Dependency directories (remove the comment below to include it)
 # vendor/
+
+# Go workspace file
+go.work
+
+# General
+.DS_Store
+.idea
+.vscode
--- a/conn.go
+++ b/conn.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"time"

-	requestid "go.unistack.org/micro-wrapper-requestid/v3"
-	"go.unistack.org/micro/v3/tracer"
+	requestid "go.unistack.org/micro-wrapper-requestid/v4"
+	"go.unistack.org/micro/v4/tracer"
 )

 var (
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,8 @@
-module go.unistack.org/micro-wrapper-sql/v3
+module go.unistack.org/micro-wrapper-sql/v4

 go 1.20

 require (
-	go.unistack.org/micro-wrapper-requestid/v3 v3.8.7
-	go.unistack.org/micro/v3 v3.10.25
+	go.unistack.org/micro-wrapper-requestid/v4 v4.0.3
+	go.unistack.org/micro/v4 v4.0.8
 )
--- a/go.sum
+++ b/go.sum
@@ -1,10 +1,4 @@
-github.com/imdario/mergo v0.3.14/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
-github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-go.unistack.org/micro-wrapper-requestid/v3 v3.8.7 h1:gXyiO7gPT0wNE7XEJIrwS2Y4cqylbeBMmlNYGwIS3io=
-go.unistack.org/micro-wrapper-requestid/v3 v3.8.7/go.mod h1:W92jAyoOoTFgGXgYu26BZi+R+IwJVH5N+BPnnp0NuiY=
-go.unistack.org/micro/v3 v3.10.19/go.mod h1:XIArw29f0b3uvF4cq96X/nQt2f0J2OGnjh8J+DBbC0s=
-go.unistack.org/micro/v3 v3.10.25 h1:A0epdZHOqjnXx103wwFhPKgmvVVbScvfbmn3HmHz1wE=
-go.unistack.org/micro/v3 v3.10.25/go.mod h1:ALkeXpqChYDjx8KPi7tz9mmIyOnob6nlNswsg8BnZjQ=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+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=
--- a/options.go
+++ b/options.go
@@ -2,12 +2,14 @@ package wrapper

 import (
 	"context"
+	"database/sql"
+	"errors"
 	"fmt"
 	"time"

-	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/meter"
-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/meter"
+	"go.unistack.org/micro/v4/tracer"
 )

 var (
@@ -18,7 +20,7 @@ var (
 	// DefaultLoggerObserver used to prepare labels for logger
 	DefaultLoggerObserver = func(ctx context.Context, method string, query string, td time.Duration, err error) []interface{} {
 		labels := []interface{}{"db.method", method, "took", fmt.Sprintf("%v", td)}
-		if err != nil {
+		if err != nil && !errors.Is(err, sql.ErrNoRows) {
 			labels = append(labels, "error", err.Error())
 		}
 		if query != labelUnknown {
@@ -44,13 +46,13 @@ var (
 	meterRequestDurationSeconds     = "request_duration_seconds"

 	labelUnknown  = "unknown"
-	labelQuery    = "db.statement"
-	labelMethod   = "db.method"
+	labelQuery    = "db_statement"
+	labelMethod   = "db_method"
 	labelStatus   = "status"
 	labelSuccess  = "success"
 	labelFailure  = "failure"
-	labelHost     = "db.host"
-	labelDatabase = "db.name"
+	labelHost     = "db_host"
+	labelDatabase = "db_name"
 )

 // Options struct holds wrapper options
--- a/stats.go
+++ b/stats.go
@@ -1,4 +1,4 @@
-package wrapper // import "go.unistack.org/micro-wrapper-sql/v3"
+package wrapper // import "go.unistack.org/micro-wrapper-sql/v4"

 import (
 	"context"
--- a/stmt.go
+++ b/stmt.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"time"

-	requestid "go.unistack.org/micro-wrapper-requestid/v3"
-	"go.unistack.org/micro/v3/tracer"
+	requestid "go.unistack.org/micro-wrapper-requestid/v4"
+	"go.unistack.org/micro/v4/tracer"
 )

 var (
--- a/tx.go
+++ b/tx.go
@@ -5,7 +5,7 @@ import (
 	"database/sql/driver"
 	"time"

-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/tracer"
 )

 var _ driver.Tx = (*wrapperTx)(nil)
Author	SHA1	Message	Date
Василий Толстов	bab2833cf7	Merge pull request 'add err skip' (#81 ) from devstigneev/micro-wrapper-sql:issue_73 into master Some checks failed build / test (push) Successful in 1m54s Details build / lint (push) Successful in 9m17s Details codeql / analyze (go) (push) Failing after 1m28s Details Reviewed-on: #81	2024-04-11 11:40:28 +03:00
devstigneev	564efef60b	moved compare error to LoggerObserver Some checks failed automerge / automerge (pull_request) Has been skipped Details dependabot-automerge / automerge (pull_request) Has been skipped Details autoapprove / autoapprove (pull_request) Successful in 8s Details codeql / analyze (go) (pull_request) Has been cancelled Details prbuild / test (pull_request) Has been cancelled Details prbuild / lint (pull_request) Has been cancelled Details	2024-04-11 11:38:09 +03:00
devstigneev	cb9d32bf1c	add err skip Some checks failed automerge / automerge (pull_request) Has been skipped Details dependabot-automerge / automerge (pull_request) Has been skipped Details autoapprove / autoapprove (pull_request) Successful in 8s Details codeql / analyze (go) (pull_request) Has been cancelled Details prbuild / test (pull_request) Has been cancelled Details prbuild / lint (pull_request) Has been cancelled Details	2024-04-07 22:12:39 +03:00
Vasiliy Tolstov	c363033abd	fix label names Some checks failed build / test (push) Failing after 1m29s Details build / lint (push) Failing after 2m34s Details codeql / analyze (go) (push) Failing after 3m22s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-09-05 07:08:08 +03:00
Vasiliy Tolstov	dd914ed9fb	Merge pull request 'updatev4' (#80 ) from updatev4 into master Some checks failed build / test (push) Failing after 1m28s Details build / lint (push) Failing after 2m38s Details codeql / analyze (go) (push) Failing after 3m21s Details Reviewed-on: #80	2023-09-01 14:49:52 +03:00
Vasiliy Tolstov	7d2787c3a6	updates from testing Some checks failed automerge / automerge (pull_request) Failing after 4s Details codeql / analyze (go) (pull_request) Failing after 3m20s Details dependabot-automerge / automerge (pull_request) Has been skipped Details prbuild / test (pull_request) Failing after 1m28s Details prbuild / lint (pull_request) Failing after 2m34s Details autoapprove / autoapprove (pull_request) Failing after 1m25s Details	2023-09-01 14:48:57 +03:00
Vasiliy Tolstov	a81da5bd2d	fixup metrics and tracing Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-09-01 00:23:26 +03:00
Vasiliy Tolstov	44cd4a1e16	Merge pull request 'use generated interface' (#76 ) from generator into master Some checks failed build / test (push) Failing after 5s Details build / lint (push) Failing after 5s Details codeql / analyze (go) (push) Failing after 6s Details Reviewed-on: #76	2023-06-10 13:10:15 +03:00