fix label names

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
Merge pull request 'tracing updates' (#79 ) from updates into v3
2023-09-05 07:08:53 +03:00 · 2023-09-01 14:40:50 +03:00 · 2023-09-01 14:40:36 +03:00 · 2023-09-01 14:32:27 +03:00 · 2023-09-01 00:26:30 +03:00 · 2023-09-01 00:21:58 +03:00
7 changed files with 26 additions and 20 deletions
--- a/conn.go
+++ b/conn.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"time"

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

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

 go 1.20

 require (
-	go.unistack.org/micro-wrapper-requestid/v4 v4.0.3
-	go.unistack.org/micro/v4 v4.0.8
+	go.unistack.org/micro-wrapper-requestid/v3 v3.8.7
+	go.unistack.org/micro/v3 v3.10.25
 )
--- a/go.sum
+++ b/go.sum
@@ -1,4 +1,10 @@
-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=
+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=
--- a/options.go
+++ b/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 (
@@ -44,13 +44,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/v4"
+package wrapper // import "go.unistack.org/micro-wrapper-sql/v3"

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

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

 var (
--- a/tx.go
+++ b/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)
Author	SHA1	Message	Date
Vasiliy Tolstov	df45b9e0bb	fix label names Some checks failed build / test (push) Failing after 1m28s Details build / lint (push) Failing after 2m40s Details codeql / analyze (go) (push) Failing after 3m8s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-09-05 07:08:53 +03:00
Vasiliy Tolstov	b31e3e7ffa	Merge pull request 'tracing updates' (#79 ) from updates into v3 Some checks failed build / test (push) Failing after 1m28s Details build / lint (push) Failing after 2m44s Details codeql / analyze (go) (push) Failing after 3m20s Details Reviewed-on: #79	2023-09-01 14:40:50 +03:00
Vasiliy Tolstov	0e8e4d6e55	Merge branch 'v3' into updates Some checks failed autoapprove / autoapprove (pull_request) Failing after 1m25s Details automerge / automerge (pull_request) Failing after 5s Details codeql / analyze (go) (pull_request) Failing after 3m11s Details dependabot-automerge / automerge (pull_request) Has been skipped Details prbuild / test (pull_request) Failing after 1m28s Details prbuild / lint (pull_request) Failing after 2m43s Details	2023-09-01 14:40:36 +03:00
Vasiliy Tolstov	34c80e29bc	tracing updates Some checks failed autoapprove / autoapprove (pull_request) Failing after 1m26s Details automerge / automerge (pull_request) Failing after 4s Details codeql / analyze (go) (pull_request) Failing after 3m11s Details dependabot-automerge / automerge (pull_request) Has been skipped Details prbuild / test (pull_request) Failing after 1m29s Details prbuild / lint (pull_request) Failing after 2m33s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-09-01 14:32:27 +03:00
Vasiliy Tolstov	974a911bfa	Обновить go.mod Some checks failed build / test (push) Failing after 1m27s Details build / lint (push) Failing after 2m34s Details codeql / analyze (go) (push) Failing after 3m11s Details	2023-09-01 00:26:30 +03:00
Vasiliy Tolstov	cde783029d	Merge pull request 'fixup metrics and tracing' (#78 ) from fixup into v3 Some checks failed build / test (push) Failing after 1m27s Details build / lint (push) Failing after 2m29s Details codeql / analyze (go) (push) Failing after 3m3s Details Reviewed-on: #78	2023-09-01 00:21:58 +03:00
Vasiliy Tolstov	927218921e	fixup metrics and tracing Some checks failed autoapprove / autoapprove (pull_request) Failing after 1m26s Details automerge / automerge (pull_request) Failing after 4s Details codeql / analyze (go) (pull_request) Failing after 3m16s Details dependabot-automerge / automerge (pull_request) Has been skipped Details prbuild / test (pull_request) Failing after 1m29s Details prbuild / lint (pull_request) Failing after 2m36s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-09-01 00:21:08 +03:00
Vasiliy Tolstov	4b3ba3f76a	fixup v3 Some checks failed build / test (push) Failing after 1m28s Details build / lint (push) Failing after 2m41s Details codeql / analyze (go) (push) Failing after 2m31s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-08-29 01:30:27 +03:00
Vasiliy Tolstov	38c192dbfd	Merge pull request 'generator' (#77 ) from generator into v3 Some checks failed build / test (push) Failing after 1m28s Details build / lint (push) Failing after 2m34s Details codeql / analyze (go) (push) Failing after 2m45s Details Reviewed-on: #77	2023-08-29 01:26:32 +03:00
Vasiliy Tolstov	62f72197ba	fixup Some checks failed automerge / automerge (pull_request) Failing after 6s Details codeql / analyze (go) (pull_request) Failing after 3m21s Details dependabot-automerge / automerge (pull_request) Has been skipped Details prbuild / test (pull_request) Failing after 1m28s Details prbuild / lint (pull_request) Failing after 2m38s Details autoapprove / autoapprove (pull_request) Failing after 1m25s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-08-29 01:25:45 +03:00