Merge pull request 'micro v4 options fix' (#115) from options into master

Reviewed-on: #115

.github/workflows/autoapprove.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: approve
-        uses: hmarr/auto-approve-action@v3
+        uses: hmarr/auto-approve-action@v2
         if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
         id: approve
         with:

.github/workflows/build.yml

@@ -10,13 +10,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: setup
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.16
     - name: checkout
       uses: actions/checkout@v3
     - name: cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -34,7 +34,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v3.4.0
+        uses: golangci/golangci-lint-action@v3.1.0
         continue-on-error: true
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.

.github/workflows/codeql-analysis.yml

@@ -45,12 +45,12 @@ jobs:
     - name: checkout
       uses: actions/checkout@v3
     - name: setup
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.16
     # Initializes the CodeQL tools for scanning.
     - name: init
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v1
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -61,7 +61,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v1
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -75,4 +75,4 @@ jobs:
     #   make release
 
     - name: analyze
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v1

.github/workflows/dependabot-automerge.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.3.6
+        uses: dependabot/fetch-metadata@v1.3.0
         with:
           github-token: "${{ secrets.TOKEN }}"
       - name: merge

.github/workflows/pr.yml

@@ -10,13 +10,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: setup
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.16
     - name: checkout
       uses: actions/checkout@v3
     - name: cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -34,7 +34,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v3.4.0
+        uses: golangci/golangci-lint-action@v3.1.0
         continue-on-error: true
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.

go.mod

@@ -1,16 +1,14 @@
-module go.unistack.org/micro-meter-victoriametrics/v3
+module go.unistack.org/micro-meter-victoriametrics/v4
 
-go 1.22
+go 1.20
-
-toolchain go1.23.2
 
 require (
-	github.com/VictoriaMetrics/metrics v1.35.1
+	github.com/VictoriaMetrics/metrics v1.24.0
-	go.unistack.org/micro/v3 v3.10.100
+	go.unistack.org/micro/v4 v4.0.7
 )
 
 require (
 	github.com/valyala/fastrand v1.1.0 // indirect
 	github.com/valyala/histogram v1.2.0 // indirect
-	golang.org/x/sys v0.27.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
 )

go.sum

@@ -1,10 +1,13 @@
-github.com/VictoriaMetrics/metrics v1.35.1 h1:o84wtBKQbzLdDy14XeskkCZih6anG+veZ1SwJHFGwrU=
+github.com/VictoriaMetrics/metrics v1.23.1 h1:/j8DzeJBxSpL2qSIdqnRFLvQQhbJyJbbEi22yMm7oL0=
-github.com/VictoriaMetrics/metrics v1.35.1/go.mod h1:r7hveu6xMdUACXvB8TYdAj8WEsKzWB0EkpJN+RDtOf8=
+github.com/VictoriaMetrics/metrics v1.24.0 h1:ILavebReOjYctAGY5QU2F9X0MYvkcrG3aEn2RKa1Zkw=
+github.com/VictoriaMetrics/metrics v1.24.0/go.mod h1:eFT25kvsTidQFHb6U0oa0rTrDRdz4xTYjpL8+UPohys=
 github.com/valyala/fastrand v1.1.0 h1:f+5HkLW4rsgzdNoleUOB69hyT9IlD2ZQh9GyDMfb5G8=
 github.com/valyala/fastrand v1.1.0/go.mod h1:HWqCzkrkg6QXT8V2EXWvXCoow7vLwOFN002oeRzjapQ=
 github.com/valyala/histogram v1.2.0 h1:wyYGAZZt3CpwUiIb9AU/Zbllg1llXyrtApRS815OLoQ=
 github.com/valyala/histogram v1.2.0/go.mod h1:Hb4kBwb4UxsaNbbbh+RRz8ZR6pdodR57tzWUS3BUzXY=
-go.unistack.org/micro/v3 v3.10.100 h1:yWOaU0ImCGm5k5MUzlIobJUOr+KLfrR/BoDZvcHyKxM=
+go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo=
-go.unistack.org/micro/v3 v3.10.100/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
+go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs=
-golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
+go.unistack.org/micro/v4 v4.0.7 h1:2lwtZlHcSwgkahhFbkI4x1lOS79lw8uLHtcEhlFF+AM=
-golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+go.unistack.org/micro/v4 v4.0.7/go.mod h1:bVEYTlPi0EsdgZZt311bIroDg9ict7ky3C87dSCCAGk=
+golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

victoriametrics.go

@@ -5,7 +5,8 @@ import (
 	"time"
 
 	"github.com/VictoriaMetrics/metrics"
-	"go.unistack.org/micro/v3/meter"
+	"go.unistack.org/micro/v4/meter"
+	"go.unistack.org/micro/v4/options"
 )
 
 type victoriametricsMeter struct {
@@ -13,7 +14,7 @@ type victoriametricsMeter struct {
 	opts meter.Options
 }
 
-func NewMeter(opts ...meter.Option) meter.Meter {
+func NewMeter(opts ...options.Option) meter.Meter {
 	return &victoriametricsMeter{set: metrics.NewSet(), opts: meter.NewOptions(opts...)}
 }
 
@@ -21,7 +22,7 @@ func (r *victoriametricsMeter) Name() string {
 	return r.opts.Name
 }
 
-func (r *victoriametricsMeter) Clone(opts ...meter.Option) meter.Meter {
+func (r *victoriametricsMeter) Clone(opts ...options.Option) meter.Meter {
 	options := r.opts
 	for _, o := range opts {
 		o(&options)
@@ -30,6 +31,10 @@ func (r *victoriametricsMeter) Clone(opts ...meter.Option) meter.Meter {
 }
 
 func (r *victoriametricsMeter) buildName(name string, labels ...string) string {
+	if len(r.opts.MetricPrefix) > 0 {
+		name = r.opts.MetricPrefix + name
+	}
+
 	nl := len(r.opts.Labels) + len(labels)
 	if nl == 0 {
 		return name
@@ -39,6 +44,14 @@ func (r *victoriametricsMeter) buildName(name string, labels ...string) string {
 	nlabels = append(nlabels, r.opts.Labels...)
 	nlabels = append(nlabels, labels...)
 
+	if len(r.opts.LabelPrefix) == 0 {
+		return meter.BuildName(name, nlabels...)
+	}
+
+	for idx := 0; idx < nl; idx++ {
+		nlabels[idx] = r.opts.LabelPrefix + nlabels[idx]
+		idx++
+	}
 	return meter.BuildName(name, nlabels...)
 }
 
@@ -66,7 +79,7 @@ func (r *victoriametricsMeter) SummaryExt(name string, window time.Duration, qua
 	return r.set.GetOrCreateSummaryExt(r.buildName(name, labels...), window, quantiles)
 }
 
-func (r *victoriametricsMeter) Set(opts ...meter.Option) meter.Meter {
+func (r *victoriametricsMeter) Set(opts ...options.Option) meter.Meter {
 	m := &victoriametricsMeter{opts: r.opts}
 	for _, o := range opts {
 		o(&m.opts)
@@ -75,7 +88,7 @@ func (r *victoriametricsMeter) Set(opts ...meter.Option) meter.Meter {
 	return m
 }
 
-func (r *victoriametricsMeter) Init(opts ...meter.Option) error {
+func (r *victoriametricsMeter) Init(opts ...options.Option) error {
 	for _, o := range opts {
 		o(&r.opts)
 	}
@@ -83,7 +96,7 @@ func (r *victoriametricsMeter) Init(opts ...meter.Option) error {
 	return nil
 }
 
-func (r *victoriametricsMeter) Write(w io.Writer, opts ...meter.Option) error {
+func (r *victoriametricsMeter) Write(w io.Writer, opts ...options.Option) error {
 	options := r.opts
 	for _, o := range opts {
 		o(&options)

victoriametrics_test.go

@@ -1,14 +1,21 @@
 package victoriametrics
 
 import (
+	"bytes"
+	"context"
 	"testing"
+
+	"go.unistack.org/micro/v4/client"
+	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v4/meter"
+	"go.unistack.org/micro/v4/meter/wrapper"
 )
 
 func TestBuildName(t *testing.T) {
 	m := NewMeter()
 	im := m.(*victoriametricsMeter)
 	check := `micro_foo{micro_aaa="b",micro_bar="baz",micro_ccc="d"}`
-	name := im.buildName("micro_foo", "micro_bar", "baz", "micro_aaa", "b", "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)
 	}
@@ -16,3 +23,30 @@ func TestBuildName(t *testing.T) {
 	cnt := m.Counter("counter", "key", "val")
 	cnt.Inc()
 }
+
+func TestWrapper(t *testing.T) {
+	m := NewMeter() // meter.Labels("test_key", "test_val"))
+
+	w := wrapper.NewClientWrapper(
+		wrapper.ServiceName("svc1"),
+		wrapper.ServiceVersion("0.0.1"),
+		wrapper.ServiceID("12345"),
+		wrapper.Meter(m),
+	)
+
+	ctx := context.Background()
+
+	c := client.NewClient(client.Wrap(w))
+	if err := c.Init(); err != nil {
+		t.Fatal(err)
+	}
+	rsp := &codec.Frame{}
+	req := &codec.Frame{}
+	err := c.Call(ctx, c.NewRequest("svc2", "Service.Method", req), rsp)
+	_, _ = rsp, err
+	buf := bytes.NewBuffer(nil)
+	_ = m.Write(buf, meter.WriteProcessMetrics(false), meter.WriteFDMetrics(false))
+	if !bytes.Contains(buf.Bytes(), []byte(`micro_client_request_inflight{micro_endpoint="svc2.Service.Method"} 0`)) {
+		t.Fatalf("invalid metrics output: %s", buf.Bytes())
+	}
+}