Merge pull request #49 from unistack-org/labels_fix

fixup metric labels helper
2021-10-31 14:47:22 +03:00 · 2021-10-31 14:46:40 +03:00 · 2021-10-28 14:21:19 +03:00 · 2021-10-28 11:19:47 +00:00
4 changed files with 7 additions and 7 deletions
--- a/go.mod
+++ b/go.mod
@@ -4,5 +4,5 @@ go 1.16

 require (
 	github.com/VictoriaMetrics/metrics v1.18.0
-	go.unistack.org/micro/v3 v3.8.6
+	go.unistack.org/micro/v3 v3.8.7
 )
--- a/go.sum
+++ b/go.sum
@@ -15,8 +15,8 @@ github.com/valyala/histogram v1.2.0 h1:wyYGAZZt3CpwUiIb9AU/Zbllg1llXyrtApRS815OL
 github.com/valyala/histogram v1.2.0/go.mod h1:Hb4kBwb4UxsaNbbbh+RRz8ZR6pdodR57tzWUS3BUzXY=
 go.unistack.org/micro-proto/v3 v3.1.0 h1:q39FwjFiRZn+Ux/tt+d3bJTmDtsQQWa+3SLYVo1vLfA=
 go.unistack.org/micro-proto/v3 v3.1.0/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8=
-go.unistack.org/micro/v3 v3.8.6 h1:nU6dpNRF7iF8dtcTTfzdPan8RkhiDuTsfMrXBmpzG/g=
-go.unistack.org/micro/v3 v3.8.6/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA=
+go.unistack.org/micro/v3 v3.8.7 h1:k1zOpJ3uS8MxdhK8annRsa5J/LW7MpqPjwYuekW61wE=
+go.unistack.org/micro/v3 v3.8.7/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA=
 golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
--- a/victoriametrics.go
+++ b/victoriametrics.go
@@ -47,10 +47,10 @@ func (r *victoriametricsMeter) buildName(name string, labels ...string) string {
 		return meter.BuildName(name, nlabels...)
 	}

-	for idx := 0; idx <= len(nlabels)/2; idx += 2 {
+	for idx := 0; idx < nl; idx++ {
 		nlabels[idx] = r.opts.LabelPrefix + nlabels[idx]
+		idx++
 	}
-
 	return meter.BuildName(name, nlabels...)
 }

--- a/victoriametrics_test.go
+++ b/victoriametrics_test.go
@@ -14,8 +14,8 @@ import (
 func TestBuildName(t *testing.T) {
 	m := NewMeter()
 	im := m.(*victoriametricsMeter)
-	check := `micro_foo{micro_aaa="b",micro_bar="baz"}`
-	name := im.buildName("foo", "bar", "baz", "aaa", "b")
+	check := `micro_foo{micro_aaa="b",micro_bar="baz",micro_ccc="d"}`
+	name := im.buildName("foo", "bar", "baz", "aaa", "b", "ccc", "d")
 	if name != check {
 		t.Fatalf("metric name error: %s != %s", name, check)
 	}
Author	SHA1	Message	Date
Vasiliy Tolstov	e33004352b	Merge pull request #49 from unistack-org/labels_fix fixup metric labels helper	2021-10-31 14:47:22 +03:00
Vasiliy Tolstov	b308e073a0	fixup metric labels helper Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-10-31 14:46:40 +03:00
Vasiliy Tolstov	a65561a85e	Merge pull request #48 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.8.7 Bump go.unistack.org/micro/v3 from 3.8.6 to 3.8.7	2021-10-28 14:21:19 +03:00
dependabot[bot]	f5e7889daf	Bump go.unistack.org/micro/v3 from 3.8.6 to 3.8.7 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.6 to 3.8.7. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.6...v3.8.7) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2021-10-28 11:19:47 +00:00