update deps, minimise memory allocations
Some checks failed
build / test (push) Failing after 9s
build / lint (push) Failing after 8s
codeql / analyze (go) (push) Failing after 11s

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2024-09-20 18:50:08 +03:00
parent 1dc55cc0c9
commit fc9be7fb46
4 changed files with 98 additions and 1503 deletions

319
go.mod
View File

@ -5,320 +5,21 @@ go 1.21
toolchain go1.22.0
require (
github.com/prometheus/client_golang v1.19.0
github.com/prometheus/client_model v0.6.0
github.com/prometheus/common v0.51.1
go.unistack.org/micro/v3 v3.10.53
github.com/prometheus/client_golang v1.20.4
github.com/prometheus/client_model v0.6.1
github.com/prometheus/common v0.59.1
go.unistack.org/micro/v3 v3.10.91
)
require (
cloud.google.com/go v0.110.2 // indirect
cloud.google.com/go/accessapproval v1.6.0 // indirect
cloud.google.com/go/accesscontextmanager v1.7.0 // indirect
cloud.google.com/go/aiplatform v1.37.0 // indirect
cloud.google.com/go/analytics v0.19.0 // indirect
cloud.google.com/go/apigateway v1.5.0 // indirect
cloud.google.com/go/apigeeconnect v1.5.0 // indirect
cloud.google.com/go/apigeeregistry v0.6.0 // indirect
cloud.google.com/go/apikeys v0.6.0 // indirect
cloud.google.com/go/appengine v1.7.1 // indirect
cloud.google.com/go/area120 v0.7.1 // indirect
cloud.google.com/go/artifactregistry v1.13.0 // indirect
cloud.google.com/go/asset v1.13.0 // indirect
cloud.google.com/go/assuredworkloads v1.10.0 // indirect
cloud.google.com/go/automl v1.12.0 // indirect
cloud.google.com/go/baremetalsolution v0.5.0 // indirect
cloud.google.com/go/batch v0.7.0 // indirect
cloud.google.com/go/beyondcorp v0.5.0 // indirect
cloud.google.com/go/bigquery v1.50.0 // indirect
cloud.google.com/go/billing v1.13.0 // indirect
cloud.google.com/go/binaryauthorization v1.5.0 // indirect
cloud.google.com/go/certificatemanager v1.6.0 // indirect
cloud.google.com/go/channel v1.12.0 // indirect
cloud.google.com/go/cloudbuild v1.9.0 // indirect
cloud.google.com/go/clouddms v1.5.0 // indirect
cloud.google.com/go/cloudtasks v1.10.0 // indirect
cloud.google.com/go/compute v1.20.1 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/contactcenterinsights v1.6.0 // indirect
cloud.google.com/go/container v1.15.0 // indirect
cloud.google.com/go/containeranalysis v0.9.0 // indirect
cloud.google.com/go/datacatalog v1.13.0 // indirect
cloud.google.com/go/dataflow v0.8.0 // indirect
cloud.google.com/go/dataform v0.7.0 // indirect
cloud.google.com/go/datafusion v1.6.0 // indirect
cloud.google.com/go/datalabeling v0.7.0 // indirect
cloud.google.com/go/dataplex v1.6.0 // indirect
cloud.google.com/go/dataproc v1.12.0 // indirect
cloud.google.com/go/dataqna v0.7.0 // indirect
cloud.google.com/go/datastore v1.11.0 // indirect
cloud.google.com/go/datastream v1.7.0 // indirect
cloud.google.com/go/deploy v1.8.0 // indirect
cloud.google.com/go/dialogflow v1.32.0 // indirect
cloud.google.com/go/dlp v1.9.0 // indirect
cloud.google.com/go/documentai v1.18.0 // indirect
cloud.google.com/go/domains v0.8.0 // indirect
cloud.google.com/go/edgecontainer v1.0.0 // indirect
cloud.google.com/go/errorreporting v0.3.0 // indirect
cloud.google.com/go/essentialcontacts v1.5.0 // indirect
cloud.google.com/go/eventarc v1.11.0 // indirect
cloud.google.com/go/filestore v1.6.0 // indirect
cloud.google.com/go/firestore v1.9.0 // indirect
cloud.google.com/go/functions v1.13.0 // indirect
cloud.google.com/go/gaming v1.9.0 // indirect
cloud.google.com/go/gkebackup v0.4.0 // indirect
cloud.google.com/go/gkeconnect v0.7.0 // indirect
cloud.google.com/go/gkehub v0.12.0 // indirect
cloud.google.com/go/gkemulticloud v0.5.0 // indirect
cloud.google.com/go/grafeas v0.2.0 // indirect
cloud.google.com/go/gsuiteaddons v1.5.0 // indirect
cloud.google.com/go/iam v0.13.0 // indirect
cloud.google.com/go/iap v1.7.1 // indirect
cloud.google.com/go/ids v1.3.0 // indirect
cloud.google.com/go/iot v1.6.0 // indirect
cloud.google.com/go/kms v1.10.1 // indirect
cloud.google.com/go/language v1.9.0 // indirect
cloud.google.com/go/lifesciences v0.8.0 // indirect
cloud.google.com/go/logging v1.7.0 // indirect
cloud.google.com/go/longrunning v0.4.1 // indirect
cloud.google.com/go/managedidentities v1.5.0 // indirect
cloud.google.com/go/maps v0.7.0 // indirect
cloud.google.com/go/mediatranslation v0.7.0 // indirect
cloud.google.com/go/memcache v1.9.0 // indirect
cloud.google.com/go/metastore v1.10.0 // indirect
cloud.google.com/go/monitoring v1.13.0 // indirect
cloud.google.com/go/networkconnectivity v1.11.0 // indirect
cloud.google.com/go/networkmanagement v1.6.0 // indirect
cloud.google.com/go/networksecurity v0.8.0 // indirect
cloud.google.com/go/notebooks v1.8.0 // indirect
cloud.google.com/go/optimization v1.3.1 // indirect
cloud.google.com/go/orchestration v1.6.0 // indirect
cloud.google.com/go/orgpolicy v1.10.0 // indirect
cloud.google.com/go/osconfig v1.11.0 // indirect
cloud.google.com/go/oslogin v1.9.0 // indirect
cloud.google.com/go/phishingprotection v0.7.0 // indirect
cloud.google.com/go/policytroubleshooter v1.6.0 // indirect
cloud.google.com/go/privatecatalog v0.8.0 // indirect
cloud.google.com/go/pubsub v1.30.0 // indirect
cloud.google.com/go/pubsublite v1.7.0 // indirect
cloud.google.com/go/recaptchaenterprise v1.3.1 // indirect
cloud.google.com/go/recaptchaenterprise/v2 v2.7.0 // indirect
cloud.google.com/go/recommendationengine v0.7.0 // indirect
cloud.google.com/go/recommender v1.9.0 // indirect
cloud.google.com/go/redis v1.11.0 // indirect
cloud.google.com/go/resourcemanager v1.7.0 // indirect
cloud.google.com/go/resourcesettings v1.5.0 // indirect
cloud.google.com/go/retail v1.12.0 // indirect
cloud.google.com/go/run v0.9.0 // indirect
cloud.google.com/go/scheduler v1.9.0 // indirect
cloud.google.com/go/secretmanager v1.10.0 // indirect
cloud.google.com/go/security v1.13.0 // indirect
cloud.google.com/go/securitycenter v1.19.0 // indirect
cloud.google.com/go/servicecontrol v1.11.1 // indirect
cloud.google.com/go/servicedirectory v1.9.0 // indirect
cloud.google.com/go/servicemanagement v1.8.0 // indirect
cloud.google.com/go/serviceusage v1.6.0 // indirect
cloud.google.com/go/shell v1.6.0 // indirect
cloud.google.com/go/spanner v1.45.0 // indirect
cloud.google.com/go/speech v1.15.0 // indirect
cloud.google.com/go/storage v1.29.0 // indirect
cloud.google.com/go/storagetransfer v1.8.0 // indirect
cloud.google.com/go/talent v1.5.0 // indirect
cloud.google.com/go/texttospeech v1.6.0 // indirect
cloud.google.com/go/tpu v1.5.0 // indirect
cloud.google.com/go/trace v1.9.0 // indirect
cloud.google.com/go/translate v1.7.0 // indirect
cloud.google.com/go/video v1.15.0 // indirect
cloud.google.com/go/videointelligence v1.10.0 // indirect
cloud.google.com/go/vision v1.2.0 // indirect
cloud.google.com/go/vision/v2 v2.7.0 // indirect
cloud.google.com/go/vmmigration v1.6.0 // indirect
cloud.google.com/go/vmwareengine v0.3.0 // indirect
cloud.google.com/go/vpcaccess v1.6.0 // indirect
cloud.google.com/go/webrisk v1.8.0 // indirect
cloud.google.com/go/websecurityscanner v1.5.0 // indirect
cloud.google.com/go/workflows v1.10.0 // indirect
dario.cat/mergo v1.0.0 // indirect
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 // indirect
gioui.org v0.0.0-20210308172011-57750fc8a0a6 // indirect
git.sr.ht/~sbinet/gg v0.3.1 // indirect
github.com/BurntSushi/toml v0.3.1 // indirect
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 // indirect
github.com/DATA-DOG/go-sqlmock v1.5.0 // indirect
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
github.com/OneOfOne/xxhash v1.2.2 // indirect
github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9 // indirect
github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19 // indirect
github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b // indirect
github.com/alecthomas/kingpin/v2 v2.4.0 // indirect
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
github.com/andybalholm/brotli v1.0.4 // indirect
github.com/antihax/optional v1.0.0 // indirect
github.com/apache/arrow/go/v10 v10.0.1 // indirect
github.com/apache/arrow/go/v11 v11.0.0 // indirect
github.com/apache/thrift v0.16.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/boombuler/barcode v1.0.1 // indirect
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chzyer/logex v1.1.10 // indirect
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 // indirect
github.com/client9/misspell v0.3.4 // indirect
github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect
github.com/creack/pty v1.1.9 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f // indirect
github.com/envoyproxy/protoc-gen-validate v0.10.1 // indirect
github.com/fogleman/gg v1.3.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-fonts/dejavu v0.1.0 // indirect
github.com/go-fonts/latin-modern v0.2.0 // indirect
github.com/go-fonts/liberation v0.2.0 // indirect
github.com/go-fonts/stix v0.1.0 // indirect
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 // indirect
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 // indirect
github.com/go-kit/kit v0.9.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-pdf/fpdf v0.6.0 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/goccy/go-json v0.9.11 // indirect
github.com/gogo/protobuf v1.1.1 // indirect
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
github.com/golang/glog v1.1.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/btree v1.0.0 // indirect
github.com/google/flatbuffers v2.0.8+incompatible // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.0.0 // indirect
github.com/google/martian v2.1.0+incompatible // indirect
github.com/google/martian/v3 v3.3.2 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/renameio v0.1.0 // indirect
github.com/google/s2a-go v0.1.4 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
github.com/googleapis/go-type-adapters v1.0.0 // indirect
github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
github.com/hashicorp/golang-lru v0.5.1 // indirect
github.com/iancoleman/strcase v0.2.0 // indirect
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/jstemmer/go-junit-report v0.9.1 // indirect
github.com/julienschmidt/httprouter v1.3.0 // indirect
github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/kisielk/gotool v1.0.0 // indirect
github.com/klauspost/asmfmt v1.3.2 // indirect
github.com/klauspost/compress v1.15.9 // indirect
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/pty v1.1.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/lyft/protoc-gen-star v0.6.1 // indirect
github.com/lyft/protoc-gen-star/v2 v2.0.1 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/mattn/go-sqlite3 v1.14.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/phpdave11/gofpdf v1.4.2 // indirect
github.com/phpdave11/gofpdi v1.0.13 // indirect
github.com/pierrec/lz4/v4 v4.1.15 // indirect
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pkg/sftp v1.13.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/procfs v0.13.0 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
github.com/rogpeppe/fastuuid v1.2.0 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245 // indirect
github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5 // indirect
github.com/sirupsen/logrus v1.6.0 // indirect
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 // indirect
github.com/spf13/afero v1.9.2 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/stretchr/testify v1.8.3 // indirect
github.com/xhit/go-str2duration v1.2.0 // indirect
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
github.com/yuin/goldmark v1.4.13 // indirect
github.com/zeebo/assert v1.3.0 // indirect
github.com/zeebo/xxh3 v1.0.2 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
golang.org/x/image v0.0.0-20220302094943-723b81ca9867 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 // indirect
golang.org/x/mod v0.9.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/oauth2 v0.18.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.7.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gonum.org/v1/gonum v0.11.0 // indirect
gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0 // indirect
gonum.org/v1/plot v0.10.1 // indirect
google.golang.org/api v0.126.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/genproto/googleapis/bytestream v0.0.0-20230530153820-e85fd2cbaebc // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
go.unistack.org/micro-proto/v3 v3.4.1 // indirect
golang.org/x/sys v0.25.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/grpc v1.57.0 // indirect
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/errgo.v2 v2.1.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
honnef.co/go/tools v0.1.3 // indirect
lukechampine.com/uint128 v1.2.0 // indirect
modernc.org/cc/v3 v3.36.3 // indirect
modernc.org/ccgo/v3 v3.16.9 // indirect
modernc.org/ccorpus v1.11.6 // indirect
modernc.org/httpfs v1.0.6 // indirect
modernc.org/libc v1.17.1 // indirect
modernc.org/mathutil v1.5.0 // indirect
modernc.org/memory v1.2.1 // indirect
modernc.org/opt v0.1.3 // indirect
modernc.org/sqlite v1.18.1 // indirect
modernc.org/strutil v1.1.3 // indirect
modernc.org/tcl v1.13.1 // indirect
modernc.org/token v1.0.0 // indirect
modernc.org/z v1.5.1 // indirect
rsc.io/binaryregexp v0.2.0 // indirect
rsc.io/pdf v0.1.1 // indirect
rsc.io/quote/v3 v3.1.0 // indirect
rsc.io/sampler v1.3.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
)

1096
go.sum

File diff suppressed because it is too large Load Diff

View File

@ -15,7 +15,7 @@ import (
"go.unistack.org/micro/v3/meter"
)
var _ meter.Meter = &prometheusMeter{}
var _ meter.Meter = (*prometheusMeter)(nil)
type prometheusMeter struct {
opts meter.Options
@ -48,16 +48,6 @@ type floatCounters struct {
cs *sync.Map
}
func newFloat64(v float64) *float64 {
nv := v
return &nv
}
func newString(v string) *string {
nv := v
return &nv
}
func NewMeter(opts ...meter.Option) *prometheusMeter {
return &prometheusMeter{
set: prometheus.NewRegistry(), // prometheus.DefaultRegisterer,
@ -70,52 +60,6 @@ func NewMeter(opts ...meter.Option) *prometheusMeter {
}
}
func (m *prometheusMeter) buildMetric(name string, labels ...string) string {
if len(m.opts.MetricPrefix) > 0 {
name = m.opts.MetricPrefix + name
}
nl := len(m.opts.Labels) + len(labels)
if nl == 0 {
return name
}
nlabels := make([]string, 0, nl)
nlabels = append(nlabels, m.opts.Labels...)
nlabels = append(nlabels, labels...)
if len(m.opts.LabelPrefix) == 0 {
return meter.BuildName(name, nlabels...)
}
for idx := 0; idx < nl; idx += 2 {
nlabels[idx] = m.opts.LabelPrefix + nlabels[idx]
}
return meter.BuildName(name, nlabels...)
}
func (m *prometheusMeter) buildName(name string) string {
if len(m.opts.MetricPrefix) > 0 {
name = m.opts.MetricPrefix + name
}
return name
}
func (m *prometheusMeter) buildLabels(labels ...string) []string {
nl := len(labels)
if nl == 0 {
return nil
}
nlabels := make([]string, 0, nl)
for idx := 0; idx < nl; idx += 2 {
nlabels = append(nlabels, m.opts.LabelPrefix+labels[idx])
nlabels = append(nlabels, labels[idx+1])
}
return nlabels
}
func (m *prometheusMeter) Name() string {
return m.opts.Name
}
@ -123,23 +67,22 @@ func (m *prometheusMeter) Name() string {
func (m *prometheusMeter) Counter(name string, labels ...string) meter.Counter {
m.Lock()
defer m.Unlock()
nm := m.buildName(name)
labels = m.buildLabels(append(m.opts.Labels, labels...)...) // TODO: Read prometheus.go:128
vcd, ok := m.counter.Load(nm)
labels = append(m.opts.Labels, labels...)
vcd, ok := m.counter.Load(name)
h := newHash(labels)
if !ok {
cd := &counters{cs: &sync.Map{}}
c := &prometheusCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
c := &prometheusCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: name}), labels: labels}
cd.cs.Store(h, c)
m.counter.Store(nm, cd)
m.counter.Store(name, cd)
return c
}
cd := vcd.(*counters)
vc, ok := cd.cs.Load(h)
if !ok {
c := &prometheusCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
c := &prometheusCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: name}), labels: labels}
cd.cs.Store(h, c)
m.counter.Store(nm, cd)
m.counter.Store(name, cd)
return c
}
c := vc.(*prometheusCounter)
@ -149,23 +92,22 @@ func (m *prometheusMeter) Counter(name string, labels ...string) meter.Counter {
func (m *prometheusMeter) FloatCounter(name string, labels ...string) meter.FloatCounter {
m.Lock()
defer m.Unlock()
nm := m.buildName(name)
labels = m.buildLabels(append(m.opts.Labels, labels...)...)
vcd, ok := m.floatCounter.Load(nm)
labels = append(m.opts.Labels, labels...)
vcd, ok := m.floatCounter.Load(name)
h := newHash(labels)
if !ok {
cd := &floatCounters{cs: &sync.Map{}}
c := &prometheusFloatCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
c := &prometheusFloatCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: name}), labels: labels}
cd.cs.Store(h, c)
m.floatCounter.Store(nm, cd)
m.floatCounter.Store(name, cd)
return c
}
cd := vcd.(*floatCounters)
vc, ok := cd.cs.Load(h)
if !ok {
c := &prometheusFloatCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
c := &prometheusFloatCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: name}), labels: labels}
cd.cs.Store(h, c)
m.floatCounter.Store(nm, cd)
m.floatCounter.Store(name, cd)
return c
}
c := vc.(*prometheusFloatCounter)
@ -175,23 +117,22 @@ func (m *prometheusMeter) FloatCounter(name string, labels ...string) meter.Floa
func (m *prometheusMeter) Gauge(name string, fn func() float64, labels ...string) meter.Gauge {
m.Lock()
defer m.Unlock()
nm := m.buildName(name)
labels = m.buildLabels(append(m.opts.Labels, labels...)...)
vcd, ok := m.gauge.Load(nm)
labels = append(m.opts.Labels, labels...)
vcd, ok := m.gauge.Load(name)
h := newHash(labels)
if !ok {
cd := &gauges{cs: &sync.Map{}}
c := &prometheusGauge{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
c := &prometheusGauge{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: name}), labels: labels}
cd.cs.Store(h, c)
m.gauge.Store(nm, cd)
m.gauge.Store(name, cd)
return c
}
cd := vcd.(*gauges)
vc, ok := cd.cs.Load(h)
if !ok {
c := &prometheusGauge{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
c := &prometheusGauge{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: name}), labels: labels}
cd.cs.Store(h, c)
m.gauge.Store(nm, cd)
m.gauge.Store(name, cd)
return c
}
c := vc.(*prometheusGauge)
@ -201,23 +142,22 @@ func (m *prometheusMeter) Gauge(name string, fn func() float64, labels ...string
func (m *prometheusMeter) Histogram(name string, labels ...string) meter.Histogram {
m.Lock()
defer m.Unlock()
nm := m.buildName(name)
labels = m.buildLabels(append(m.opts.Labels, labels...)...)
vcd, ok := m.histogram.Load(nm)
labels = append(m.opts.Labels, labels...)
vcd, ok := m.histogram.Load(name)
h := newHash(labels)
if !ok {
cd := &histograms{cs: &sync.Map{}}
c := &prometheusHistogram{c: prometheus.NewHistogram(prometheus.HistogramOpts{Name: nm}), labels: labels}
c := &prometheusHistogram{c: prometheus.NewHistogram(prometheus.HistogramOpts{Name: name}), labels: labels}
cd.cs.Store(h, c)
m.histogram.Store(nm, cd)
m.histogram.Store(name, cd)
return c
}
cd := vcd.(*histograms)
vc, ok := cd.cs.Load(h)
if !ok {
c := &prometheusHistogram{c: prometheus.NewHistogram(prometheus.HistogramOpts{Name: nm}), labels: labels}
c := &prometheusHistogram{c: prometheus.NewHistogram(prometheus.HistogramOpts{Name: name}), labels: labels}
cd.cs.Store(h, c)
m.histogram.Store(nm, cd)
m.histogram.Store(name, cd)
return c
}
c := vc.(*prometheusHistogram)
@ -227,23 +167,22 @@ func (m *prometheusMeter) Histogram(name string, labels ...string) meter.Histogr
func (m *prometheusMeter) Summary(name string, labels ...string) meter.Summary {
m.Lock()
defer m.Unlock()
nm := m.buildName(name)
labels = m.buildLabels(append(m.opts.Labels, labels...)...)
vcd, ok := m.summary.Load(nm)
labels = append(m.opts.Labels, labels...)
vcd, ok := m.summary.Load(name)
h := newHash(labels)
if !ok {
cd := &summaries{cs: &sync.Map{}}
c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{Name: nm}), labels: labels}
c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{Name: name}), labels: labels}
cd.cs.Store(h, c)
m.summary.Store(nm, cd)
m.summary.Store(name, cd)
return c
}
cd := vcd.(*summaries)
vc, ok := cd.cs.Load(h)
if !ok {
c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{Name: nm}), labels: labels}
c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{Name: name}), labels: labels}
cd.cs.Store(h, c)
m.summary.Store(nm, cd)
m.summary.Store(name, cd)
return c
}
c := vc.(*prometheusSummary)
@ -253,31 +192,30 @@ func (m *prometheusMeter) Summary(name string, labels ...string) meter.Summary {
func (m *prometheusMeter) SummaryExt(name string, window time.Duration, quantiles []float64, labels ...string) meter.Summary {
m.Lock()
defer m.Unlock()
nm := m.buildName(name)
labels = m.buildLabels(append(m.opts.Labels, labels...)...)
vcd, ok := m.summary.Load(nm)
labels = append(m.opts.Labels, labels...)
vcd, ok := m.summary.Load(name)
h := newHash(labels)
if !ok {
cd := &summaries{cs: &sync.Map{}}
c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{
Name: nm,
Name: name,
MaxAge: window,
Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001},
}), labels: labels}
cd.cs.Store(h, c)
m.summary.Store(nm, cd)
m.summary.Store(name, cd)
return c
}
cd := vcd.(*summaries)
vc, ok := cd.cs.Load(h)
if !ok {
c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{
Name: nm,
Name: name,
MaxAge: window,
Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001},
}), labels: labels}
cd.cs.Store(h, c)
m.summary.Store(nm, cd)
m.summary.Store(name, cd)
return c
}
c := vc.(*prometheusSummary)
@ -320,7 +258,7 @@ func (m *prometheusMeter) Write(w io.Writer, opts ...meter.Option) error {
m.counter.Range(func(k, v any) bool {
name := k.(string)
mf := &dto.MetricFamily{
Name: newString(name),
Name: &name,
Type: dto.MetricType_GAUGE.Enum(),
}
v.(*counters).cs.Range(func(_, nv any) bool {
@ -338,7 +276,7 @@ func (m *prometheusMeter) Write(w io.Writer, opts ...meter.Option) error {
m.gauge.Range(func(k, v any) bool {
name := k.(string)
mf := &dto.MetricFamily{
Name: newString(name),
Name: &name,
Type: dto.MetricType_GAUGE.Enum(),
}
v.(*gauges).cs.Range(func(_, nv any) bool {
@ -356,7 +294,7 @@ func (m *prometheusMeter) Write(w io.Writer, opts ...meter.Option) error {
m.floatCounter.Range(func(k, v any) bool {
name := k.(string)
mf := &dto.MetricFamily{
Name: newString(name),
Name: &name,
Type: dto.MetricType_GAUGE.Enum(),
}
v.(*floatCounters).cs.Range(func(_, nv any) bool {
@ -374,7 +312,7 @@ func (m *prometheusMeter) Write(w io.Writer, opts ...meter.Option) error {
m.histogram.Range(func(k, v any) bool {
name := k.(string)
mf := &dto.MetricFamily{
Name: newString(name),
Name: &name,
Type: dto.MetricType_HISTOGRAM.Enum(),
}
v.(*histograms).cs.Range(func(_, nv any) bool {
@ -392,7 +330,7 @@ func (m *prometheusMeter) Write(w io.Writer, opts ...meter.Option) error {
m.summary.Range(func(k, v any) bool {
name := k.(string)
mf := &dto.MetricFamily{
Name: newString(name),
Name: &name,
Type: dto.MetricType_SUMMARY.Enum(),
}
v.(*summaries).cs.Range(func(_, nv any) bool {
@ -566,8 +504,8 @@ func fillMetric(m *dto.Metric, labels []string) *dto.Metric {
continue
}
m.Label = append(m.Label, &dto.LabelPair{
Name: newString(labels[idx]),
Value: newString(labels[idx+1]),
Name: &(labels[idx]),
Value: &(labels[idx+1]),
})
seen[labels[idx]] = true
}

View File

@ -8,7 +8,6 @@ import (
"go.unistack.org/micro/v3/client"
"go.unistack.org/micro/v3/codec"
"go.unistack.org/micro/v3/meter"
"go.unistack.org/micro/v3/meter/wrapper"
)
func TestStd(t *testing.T) {
@ -23,31 +22,12 @@ func TestStd(t *testing.T) {
}
}
func TestBuildName(t *testing.T) {
m := NewMeter()
check := `micro_foo{micro_aaa="b",micro_bar="baz",micro_ccc="d"}`
name := m.buildMetric("foo", "bar", "baz", "aaa", "b", "ccc", "d")
if name != check {
t.Fatalf("metric name error: %s != %s", name, check)
}
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))
c := client.NewClient(client.Meter(m))
if err := c.Init(); err != nil {
t.Fatal(err)
}
@ -57,7 +37,7 @@ func TestWrapper(t *testing.T) {
_, _ = 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`)) {
if !bytes.Contains(buf.Bytes(), []byte(`micro_client_request_inflight{endpoint="Service.Method"} 0`)) {
t.Fatalf("invalid metrics output: %s", buf.Bytes())
}
}
@ -65,17 +45,17 @@ func TestWrapper(t *testing.T) {
func TestMultiple(t *testing.T) {
m := NewMeter() // meter.Labels("test_key", "test_val"))
m.Counter("server", "endpoint", "ep1", "path", "/path1").Inc()
m.Counter("server", "endpoint", "ep1", "path", "/path1").Inc()
m.Counter("micro_server", "endpoint", "ep1", "path", "/path1").Inc()
m.Counter("micro_server", "endpoint", "ep1", "path", "/path1").Inc()
m.Counter("server", "endpoint", "ep2", "path", "/path2").Inc()
m.Counter("server", "endpoint", "ep2", "path", "/path2").Inc()
m.Counter("micro_server", "endpoint", "ep2", "path", "/path2").Inc()
m.Counter("micro_server", "endpoint", "ep2", "path", "/path2").Inc()
m.Counter("server", "endpoint", "ep3", "path", "/path3", "status", "success").Inc()
m.Counter("micro_server", "endpoint", "ep3", "path", "/path3", "status", "success").Inc()
buf := bytes.NewBuffer(nil)
_ = m.Write(buf, meter.WriteProcessMetrics(false), meter.WriteFDMetrics(false))
if !bytes.Contains(buf.Bytes(), []byte(`micro_server{micro_endpoint="ep1",micro_path="/path1"} 2`)) {
if !bytes.Contains(buf.Bytes(), []byte(`micro_server{endpoint="ep1",path="/path1"} 2`)) {
// t.Fatal("XXXX")
t.Fatalf("invalid metrics output: %s", buf.Bytes())
}