@cryptotaxi247 / netdata-1 / commits / e574aee83

Update go.d.plugin packages (#17145)

Ilya Mashchenko committed Mar 11, 2024 at 12:55 UTC e574aee83af5c3b2db1c2e70767687640b443390
10 files changed +204 -148
src/go/collectors/go.d.plugin/go.mod
+27 -18
@@ -2,7 +2,7 @@ module github.com/netdata/netdata/go/go.d.plugin
2
3 go 1.21
4
5 -replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.36.2
5 +replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.50.1
6
7 require (
8 github.com/DATA-DOG/go-sqlmock v1.5.2
@@ -10,14 +10,14 @@ require (
10 github.com/Wing924/ltsv v0.3.1
11 github.com/apparentlymart/go-cidr v1.1.0
12 github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
13 - github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc
13 + github.com/axiomhq/hyperloglog v0.0.0-20240124082744-24bca3a5b39b
14 github.com/blang/semver/v4 v4.0.0
15 github.com/bmatcuk/doublestar/v4 v4.6.1
16 github.com/clbanning/rfile/v2 v2.0.0-20231024120205-ac3fca974b0e
17 github.com/cloudflare/cfssl v1.6.5
18 github.com/coreos/go-systemd/v22 v22.5.0
19 - github.com/docker/docker v24.0.7+incompatible
20 - github.com/facebook/time v0.0.0-20230914161634-c95c229720fd
19 + github.com/docker/docker v25.0.4+incompatible
20 + github.com/facebook/time v0.0.0-20240301144314-9afaa3836e98
21 github.com/fsnotify/fsnotify v1.7.0
22 github.com/go-redis/redis/v8 v8.11.5
23 github.com/go-sql-driver/mysql v1.8.0
@@ -37,6 +37,7 @@ require (
37 github.com/mitchellh/go-homedir v1.1.0
38 github.com/muesli/cancelreader v0.2.2
39 github.com/prometheus-community/pro-bing v0.4.0
40 + github.com/prometheus/common v0.48.0
41 github.com/prometheus/prometheus v2.5.0+incompatible
42 github.com/stretchr/testify v1.9.0
43 github.com/tomasen/fcgi_client v0.0.0-20180423082037-2bb3d819fd19
@@ -59,20 +60,22 @@ require (
60 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
61 github.com/Masterminds/goutils v1.1.1 // indirect
62 github.com/Masterminds/semver/v3 v3.2.0 // indirect
62 - github.com/Microsoft/go-winio v0.5.1 // indirect
63 + github.com/Microsoft/go-winio v0.6.1 // indirect
64 github.com/cespare/xxhash/v2 v2.2.0 // indirect
64 - github.com/davecgh/go-spew v1.1.1 // indirect
65 + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
66 github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect
67 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
67 - github.com/docker/distribution v2.8.2+incompatible // indirect
68 + github.com/distribution/reference v0.5.0 // indirect
69 github.com/docker/go-connections v0.4.0 // indirect
69 - github.com/docker/go-units v0.4.0 // indirect
70 + github.com/docker/go-units v0.5.0 // indirect
71 github.com/emicklei/go-restful/v3 v3.11.0 // indirect
72 github.com/evanphx/json-patch v5.6.0+incompatible // indirect
72 - github.com/go-logr/logr v1.3.0 // indirect
73 - github.com/go-openapi/jsonpointer v0.19.6 // indirect
73 + github.com/felixge/httpsnoop v1.0.4 // indirect
74 + github.com/go-logr/logr v1.4.1 // indirect
75 + github.com/go-logr/stdr v1.2.2 // indirect
76 + github.com/go-openapi/jsonpointer v0.20.0 // indirect
77 github.com/go-openapi/jsonreference v0.20.2 // indirect
75 - github.com/go-openapi/swag v0.22.3 // indirect
78 + github.com/go-openapi/swag v0.22.4 // indirect
79 github.com/gogo/protobuf v1.3.2 // indirect
80 github.com/golang/protobuf v1.5.3 // indirect
81 github.com/golang/snappy v0.0.4 // indirect
@@ -81,9 +84,9 @@ require (
84 github.com/google/go-cmp v0.6.0 // indirect
85 github.com/google/gofuzz v1.2.0 // indirect
86 github.com/google/uuid v1.6.0 // indirect
84 - github.com/grafana/regexp v0.0.0-20220304095617-2e8d9baf4ac2 // indirect
87 + github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
88 github.com/huandu/xstrings v1.3.3 // indirect
86 - github.com/imdario/mergo v0.3.12 // indirect
89 + github.com/imdario/mergo v0.3.16 // indirect
90 github.com/jackc/chunkreader/v2 v2.0.1 // indirect
91 github.com/jackc/pgconn v1.14.3 // indirect
92 github.com/jackc/pgio v1.0.0 // indirect
@@ -94,7 +97,7 @@ require (
97 github.com/josharian/intern v1.0.0 // indirect
98 github.com/josharian/native v1.1.0 // indirect
99 github.com/json-iterator/go v1.1.12 // indirect
97 - github.com/klauspost/compress v1.13.6 // indirect
100 + github.com/klauspost/compress v1.17.4 // indirect
101 github.com/likexian/gokit v0.25.13 // indirect
102 github.com/mailru/easyjson v0.7.7 // indirect
103 github.com/mdlayher/genetlink v1.3.2 // indirect
@@ -109,7 +112,8 @@ require (
112 github.com/opencontainers/go-digest v1.0.0 // indirect
113 github.com/opencontainers/image-spec v1.0.2 // indirect
114 github.com/pkg/errors v0.9.1 // indirect
112 - github.com/pmezard/go-difflib v1.0.0 // indirect
115 + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
116 + github.com/prometheus/client_model v0.5.0 // indirect
117 github.com/shopspring/decimal v1.2.0 // indirect
118 github.com/sirupsen/logrus v1.9.3 // indirect
119 github.com/spf13/cast v1.3.1 // indirect
@@ -118,13 +122,18 @@ require (
122 github.com/xdg-go/scram v1.1.2 // indirect
123 github.com/xdg-go/stringprep v1.0.4 // indirect
124 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
125 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
126 + go.opentelemetry.io/otel v1.22.0 // indirect
127 + go.opentelemetry.io/otel/metric v1.22.0 // indirect
128 + go.opentelemetry.io/otel/trace v1.22.0 // indirect
129 golang.org/x/crypto v0.21.0 // indirect
130 + golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
131 golang.org/x/mod v0.14.0 // indirect
123 - golang.org/x/oauth2 v0.13.0 // indirect
132 + golang.org/x/oauth2 v0.16.0 // indirect
133 golang.org/x/sync v0.6.0 // indirect
134 golang.org/x/sys v0.18.0 // indirect
135 golang.org/x/term v0.18.0 // indirect
127 - golang.org/x/time v0.3.0 // indirect
136 + golang.org/x/time v0.5.0 // indirect
137 golang.org/x/tools v0.17.0 // indirect
138 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
139 golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b // indirect
@@ -132,7 +141,7 @@ require (
141 google.golang.org/protobuf v1.32.0 // indirect
142 gopkg.in/inf.v0 v0.9.1 // indirect
143 gopkg.in/yaml.v3 v3.0.1 // indirect
135 - k8s.io/klog/v2 v2.110.1 // indirect
144 + k8s.io/klog/v2 v2.120.1 // indirect
145 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
146 k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
147 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
src/go/collectors/go.d.plugin/go.sum
+75 -36
@@ -12,20 +12,22 @@ github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7Y
12 github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
13 github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA=
14 github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM=
15 -github.com/Microsoft/go-winio v0.5.1 h1:aPJp2QD7OOrhO5tQXqQoGSJc+DjDtWTGLOmNyAm6FgY=
16 -github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
15 +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
16 +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
17 github.com/Wing924/ltsv v0.3.1 h1:hbjzQ6YuS/sOm7nQJG7ddT9ua1yYmcH25Q8lsuiQE0A=
18 github.com/Wing924/ltsv v0.3.1/go.mod h1:zl47wq7H23LocdDHg7yJAH/Qdc4MWHXu1Evx9Ahilmo=
19 github.com/apparentlymart/go-cidr v1.1.0 h1:2mAhrMoF+nhXqxTzSZMUzDHkLjmIHC+Zzn4tdgBZjnU=
20 github.com/apparentlymart/go-cidr v1.1.0/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc=
21 github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de h1:FxWPpzIjnTlhPwqqXc4/vE0f7GvRjuAsbW+HOIe8KnA=
22 github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de/go.mod h1:DCaWoUhZrYW9p1lxo/cm8EmUOOzAPSEZNGF2DK1dJgw=
23 -github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc h1:Keo7wQ7UODUaHcEi7ltENhbAK2VgZjfat6mLy03tQzo=
24 -github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc/go.mod h1:k08r+Yj1PRAmuayFiRK6MYuR5Ve4IuZtTfxErMIh0+c=
23 +github.com/axiomhq/hyperloglog v0.0.0-20240124082744-24bca3a5b39b h1:F3yMzKumBUQ6Fn0sYI1YQ16vQRucpZOfBQ9HXWl5+XI=
24 +github.com/axiomhq/hyperloglog v0.0.0-20240124082744-24bca3a5b39b/go.mod h1:k08r+Yj1PRAmuayFiRK6MYuR5Ve4IuZtTfxErMIh0+c=
25 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
26 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
27 github.com/bmatcuk/doublestar/v4 v4.6.1 h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I=
28 github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
29 +github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
30 +github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
31 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
32 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
33 github.com/clbanning/rfile/v2 v2.0.0-20231024120205-ac3fca974b0e h1:Iw4JdD/TlCUvlVWIjuV1M98rGNo/C+NxM6U5ghStom4=
@@ -34,6 +36,8 @@ github.com/cloudflare/cfssl v1.6.5 h1:46zpNkm6dlNkMZH/wMW22ejih6gIaJbzL2du6vD7Ze
36 github.com/cloudflare/cfssl v1.6.5/go.mod h1:Bk1si7sq8h2+yVEDrFJiz3d7Aw+pfjjJSZVaD+Taky4=
37 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
38 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
39 +github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
40 +github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
41 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
42 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
43 github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
@@ -41,38 +45,46 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV
45 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
46 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
47 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
44 -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
48 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
49 +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
50 +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
51 github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc h1:8WFBn63wegobsYAX0YjD+8suexZDga5CctH4CCTx2+8=
52 github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw=
53 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
54 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
50 -github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
51 -github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
52 -github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=
53 -github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
55 +github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
56 +github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
57 +github.com/docker/docker v25.0.4+incompatible h1:XITZTrq+52tZyZxUOtFIahUf3aH367FLxJzt9vZeAF8=
58 +github.com/docker/docker v25.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
59 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
60 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
56 -github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
57 -github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
61 +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
62 +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
63 github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
64 github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
65 github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
66 github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
62 -github.com/facebook/time v0.0.0-20230914161634-c95c229720fd h1:HLODj3PC4arOjLcAbTf7m9sqHniOALu52g5Wi4Wa8n4=
63 -github.com/facebook/time v0.0.0-20230914161634-c95c229720fd/go.mod h1:dfouHrgxDA7FxAzPYOFIGHFcrFlG2trLpeLtA5+hs+Q=
67 +github.com/facebook/time v0.0.0-20240301144314-9afaa3836e98 h1:iPJBHuAMhTf7A4/NaVIcH8Lyb8GH/c/uB1iDdtO5HuQ=
68 +github.com/facebook/time v0.0.0-20240301144314-9afaa3836e98/go.mod h1:NBW7VY75BPCsOPrSsARAengTlgOICicHey4Bv70lCUI=
69 +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
70 +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
71 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
72 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
73 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
74 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
68 -github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
69 -github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
70 -github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
75 +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
76 +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
77 +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
78 +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
79 +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
80 github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
81 +github.com/go-openapi/jsonpointer v0.20.0 h1:ESKJdU9ASRfaPNOPRx12IUyA1vn3R9GiE3KYD14BXdQ=
82 +github.com/go-openapi/jsonpointer v0.20.0/go.mod h1:6PGzBjjIIumbLYysB73Klnms1mwnU4G3YHOECG3CedA=
83 github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
84 github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
74 -github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
85 github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
86 +github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=
87 +github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
88 github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
89 github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
90 github.com/go-sql-driver/mysql v1.8.0 h1:UtktXaU2Nb64z/pLiGIxY4431SJ4/dR5cjMmlVHgnT4=
@@ -108,23 +120,26 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
120 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
121 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
122 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
111 -github.com/google/pprof v0.0.0-20220520215854-d04f2422c8a1 h1:K4bn56FHdjFCfjSo3wWaD6rJL8r9yvmmncJNMhdkKrw=
112 -github.com/google/pprof v0.0.0-20220520215854-d04f2422c8a1/go.mod h1:gSuNB+gJaOiQKLEZ+q+PK9Mq3SOzhRcw2GsGS/FhYDk=
123 +github.com/google/pprof v0.0.0-20240117000934-35fc243c5815 h1:WzfWbQz/Ze8v6l++GGbGNFZnUShVpP/0xffCPLL+ax8=
124 +github.com/google/pprof v0.0.0-20240117000934-35fc243c5815/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
125 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
126 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
127 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
128 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
129 github.com/gosnmp/gosnmp v1.37.0 h1:/Tf8D3b9wrnNuf/SfbvO+44mPrjVphBhRtcGg22V07Y=
130 github.com/gosnmp/gosnmp v1.37.0/go.mod h1:GDH9vNqpsD7f2HvZhKs5dlqSEcAS6s6Qp099oZRCR+M=
119 -github.com/grafana/regexp v0.0.0-20220304095617-2e8d9baf4ac2 h1:uirlL/j72L93RhV4+mkWhjv0cov2I0MIgPOG9rMDr1k=
120 -github.com/grafana/regexp v0.0.0-20220304095617-2e8d9baf4ac2/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A=
131 +github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd h1:PpuIBO5P3e9hpqBD0O/HjhShYuM6XE0i/lbE6J94kww=
132 +github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A=
133 +github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
134 +github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 h1:RtRsiaGvWxcwd8y3BiRZxsylPT8hLWZ5SPcfI+3IDNk=
135 +github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0/go.mod h1:TzP6duP4Py2pHLVPPQp42aoYI92+PCrVotyR5e8Vqlk=
136 github.com/huandu/xstrings v1.3.3 h1:/Gcsuc1x8JVbJ9/rlye4xZnVAbEkGauT8lbebqcQws4=
137 github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
138 github.com/ilyam8/hashstructure v1.1.0 h1:N8t8hzzKLf2Da87XgC/DBYqXUmSbclgx+2cZxS5/klU=
139 github.com/ilyam8/hashstructure v1.1.0/go.mod h1:LoLuwBSNpZOi3eTMfAqe2i4oW9QkI08e6g1Pci9h7hs=
140 github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
126 -github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
127 -github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
141 +github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
142 +github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
143 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
144 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
145 github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
@@ -183,8 +198,8 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm
198 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
199 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
200 github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE=
186 -github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
187 -github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
201 +github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
202 +github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
203 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
204 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
205 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -269,16 +284,17 @@ github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zM
284 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
285 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
286 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
272 -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
287 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
288 +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
289 +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
290 github.com/prometheus-community/pro-bing v0.4.0 h1:YMbv+i08gQz97OZZBwLyvmmQEEzyfyrrjEaAchdy3R4=
291 github.com/prometheus-community/pro-bing v0.4.0/go.mod h1:b7wRYZtCcPmt4Sz319BykUU241rWLe1VFXyiyWK/dH4=
292 github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
293 github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
294 github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE=
295 github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc=
280 -github.com/prometheus/prometheus v0.36.2 h1:ZMqiEKdamv/YgI/7V5WtQGWbwEerCsXJ26CZgeXDUXM=
281 -github.com/prometheus/prometheus v0.36.2/go.mod h1:GBcYMr17Nr2/iDIrWmiy9wC5GKl0NOQ5R9XynB1HAG8=
296 +github.com/prometheus/prometheus v0.50.1 h1:N2L+DYrxqPh4WZStU+o1p/gQlBaqFbcLBTjlp3vpdXw=
297 +github.com/prometheus/prometheus v0.50.1/go.mod h1:FvE8dtQ1Ww63IlyKBn1V4s+zMwF9kHkVNkQBR1pM4CU=
298 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
299 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
300 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
@@ -293,7 +309,6 @@ github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXY
309 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
310 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
311 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
296 -github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
312 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
313 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
314 github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
@@ -336,6 +351,22 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t
351 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
352 go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80=
353 go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
354 +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08=
355 +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw=
356 +go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y=
357 +go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI=
358 +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 h1:9M3+rhx7kZCIQQhQRYaZCdNu1V73tm4TvXs2ntl98C4=
359 +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0/go.mod h1:noq80iT8rrHP1SfybmPiRGc9dc5M8RPmGvtwo7Oo7tc=
360 +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 h1:FyjCyI9jVEfqhUh2MoSkmolPjfh5fp2hnV0b0irxH4Q=
361 +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0/go.mod h1:hYwym2nDEeZfG/motx0p7L7J1N1vyzIThemQsb4g2qY=
362 +go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg=
363 +go.opentelemetry.io/otel/metric v1.22.0/go.mod h1:evJGjVpZv0mQ5QBRJoBF64yMuOf4xCWdXjK8pzFvliY=
364 +go.opentelemetry.io/otel/sdk v1.22.0 h1:6coWHw9xw7EfClIC/+O31R8IY3/+EiRFHevmHafB2Gw=
365 +go.opentelemetry.io/otel/sdk v1.22.0/go.mod h1:iu7luyVGYovrRpe2fmj3CVKouQNdTOkxtLzPvPz1DOc=
366 +go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0=
367 +go.opentelemetry.io/otel/trace v1.22.0/go.mod h1:RbbHXVqKES9QhzZq/fE5UnOSILqRt40a21sPw2He1xo=
368 +go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
369 +go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
370 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
371 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
372 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
@@ -360,6 +391,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
391 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
392 golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
393 golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
394 +golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA=
395 +golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
396 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
397 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
398 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
@@ -381,8 +414,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
414 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
415 golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
416 golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
384 -golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY=
385 -golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0=
417 +golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ=
418 +golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o=
419 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
420 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
421 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -402,7 +435,6 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w
435 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
436 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
437 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
405 -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
438 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
439 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
440 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -431,8 +463,8 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
463 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
464 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
465 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
434 -golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
435 -golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
466 +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
467 +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
468 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
469 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
470 golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
@@ -463,6 +495,13 @@ golang.zx2c4.com/wireguard/wgctrl v0.0.0-20220504211119-3d4a969bb56b h1:9JncmKXc
495 golang.zx2c4.com/wireguard/wgctrl v0.0.0-20220504211119-3d4a969bb56b/go.mod h1:yp4gl6zOlnDGOZeWeDfMwQcsdOIQnMdhuPx9mwwWBL4=
496 google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
497 google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
498 +google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 h1:nz5NESFLZbJGPFxDT/HCn+V1mZ8JGNoY4nUpmW/Y2eg=
499 +google.golang.org/genproto/googleapis/api v0.0.0-20240116215550-a9fa1716bcac h1:OZkkudMUu9LVQMCoRUbI/1p5VCo9BOrlvkqMvWtqa6s=
500 +google.golang.org/genproto/googleapis/api v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:B5xPO//w8qmBDjGReYLpR6UJPnkldGkCSMoH/2vxJeg=
501 +google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac h1:nUQEQmH/csSvFECKYRv6HWEyypysidKl2I6Qpsglq/0=
502 +google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:daQN87bsDqDoe316QbbvX60nMoJQa4r6Ds0ZuoAe5yA=
503 +google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0=
504 +google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs=
505 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
506 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
507 google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
@@ -496,8 +535,8 @@ k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8=
535 k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU=
536 k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg=
537 k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA=
499 -k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
500 -k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
538 +k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
539 +k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
540 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
541 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
542 k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
src/go/collectors/go.d.plugin/modules/docker/collect.go
+2 -1
@@ -8,6 +8,7 @@ import (
8 "strings"
9
10 "github.com/docker/docker/api/types"
11 + typesContainer "github.com/docker/docker/api/types/container"
12 "github.com/docker/docker/api/types/filters"
13 )
14
@@ -109,7 +110,7 @@ func (d *Docker) collectContainers(mx map[string]int64) error {
110 ctx, cancel := context.WithTimeout(context.Background(), d.Timeout.Duration())
111 defer cancel()
112
112 - v, err := d.client.ContainerList(ctx, types.ContainerListOptions{
113 + v, err := d.client.ContainerList(ctx, typesContainer.ListOptions{
114 All: true,
115 Filters: filters.NewArgs(filters.KeyValuePair{Key: "health", Value: status}),
116 Size: d.CollectContainerSize,
src/go/collectors/go.d.plugin/modules/docker/docker.go
+6 -3
@@ -12,6 +12,9 @@ import (
12 "github.com/netdata/netdata/go/go.d.plugin/pkg/web"
13
14 "github.com/docker/docker/api/types"
15 + typesContainer "github.com/docker/docker/api/types/container"
16 + typesImage "github.com/docker/docker/api/types/image"
17 + typesSystem "github.com/docker/docker/api/types/system"
18 docker "github.com/docker/docker/client"
19 )
20
@@ -63,9 +66,9 @@ type (
66 }
67 dockerClient interface {
68 NegotiateAPIVersion(context.Context)
66 - Info(context.Context) (types.Info, error)
67 - ImageList(context.Context, types.ImageListOptions) ([]types.ImageSummary, error)
68 - ContainerList(context.Context, types.ContainerListOptions) ([]types.Container, error)
69 + Info(context.Context) (typesSystem.Info, error)
70 + ImageList(context.Context, types.ImageListOptions) ([]typesImage.Summary, error)
71 + ContainerList(context.Context, typesContainer.ListOptions) ([]types.Container, error)
72 Close() error
73 }
74 )
src/go/collectors/go.d.plugin/modules/docker/docker_test.go
+9 -6
@@ -11,6 +11,9 @@ import (
11 "github.com/netdata/netdata/go/go.d.plugin/agent/module"
12
13 "github.com/docker/docker/api/types"
14 + typesContainer "github.com/docker/docker/api/types/container"
15 + typesImage "github.com/docker/docker/api/types/image"
16 + typesSystem "github.com/docker/docker/api/types/system"
17 "github.com/stretchr/testify/assert"
18 "github.com/stretchr/testify/require"
19 )
@@ -756,19 +759,19 @@ type mockClient struct {
759 closeCalled bool
760 }
761
759 -func (m *mockClient) Info(_ context.Context) (types.Info, error) {
762 +func (m *mockClient) Info(_ context.Context) (typesSystem.Info, error) {
763 if m.errOnInfo {
761 - return types.Info{}, errors.New("mockClient.Info() error")
764 + return typesSystem.Info{}, errors.New("mockClient.Info() error")
765 }
766
764 - return types.Info{
767 + return typesSystem.Info{
768 ContainersRunning: 4,
769 ContainersPaused: 5,
770 ContainersStopped: 6,
771 }, nil
772 }
773
771 -func (m *mockClient) ContainerList(_ context.Context, opts types.ContainerListOptions) ([]types.Container, error) {
774 +func (m *mockClient) ContainerList(_ context.Context, opts typesContainer.ListOptions) ([]types.Container, error) {
775 if m.errOnContainerList {
776 return nil, errors.New("mockClient.ContainerList() error")
777 }
@@ -822,12 +825,12 @@ func (m *mockClient) ContainerList(_ context.Context, opts types.ContainerListOp
825 return containers, nil
826 }
827
825 -func (m *mockClient) ImageList(_ context.Context, _ types.ImageListOptions) ([]types.ImageSummary, error) {
828 +func (m *mockClient) ImageList(_ context.Context, _ types.ImageListOptions) ([]typesImage.Summary, error) {
829 if m.errOnImageList {
830 return nil, errors.New("mockClient.ImageList() error")
831 }
832
830 - return []types.ImageSummary{
833 + return []typesImage.Summary{
834 {
835 Containers: 0,
836 Size: 100,
src/go/collectors/go.d.plugin/modules/prometheus/collect.go
+6 -6
@@ -10,8 +10,8 @@ import (
10
11 "github.com/netdata/netdata/go/go.d.plugin/pkg/prometheus"
12
13 + "github.com/prometheus/common/model"
14 "github.com/prometheus/prometheus/model/labels"
14 - "github.com/prometheus/prometheus/model/textparse"
15 )
16
17 const (
@@ -61,15 +61,15 @@ func (p *Prometheus) collect() (map[string]int64, error) {
61 }
62
63 switch mf.Type() {
64 - case textparse.MetricTypeGauge:
64 + case model.MetricTypeGauge:
65 p.collectGauge(mx, mf)
66 - case textparse.MetricTypeCounter:
66 + case model.MetricTypeCounter:
67 p.collectCounter(mx, mf)
68 - case textparse.MetricTypeSummary:
68 + case model.MetricTypeSummary:
69 p.collectSummary(mx, mf)
70 - case textparse.MetricTypeHistogram:
70 + case model.MetricTypeHistogram:
71 p.collectHistogram(mx, mf)
72 - case textparse.MetricTypeUnknown:
72 + case model.MetricTypeUnknown:
73 p.collectUntyped(mx, mf)
74 }
75 }
src/go/collectors/go.d.plugin/pkg/prometheus/metric_family.go
+11 -11
@@ -3,8 +3,8 @@
3 package prometheus
4
5 import (
6 + "github.com/prometheus/common/model"
7 "github.com/prometheus/prometheus/model/labels"
7 - "github.com/prometheus/prometheus/model/textparse"
8 )
9
10 type (
@@ -13,7 +13,7 @@ type (
13 MetricFamily struct {
14 name string
15 help string
16 - typ textparse.MetricType
16 + typ model.MetricType
17 metrics []Metric
18 }
19 Metric struct {
@@ -62,22 +62,22 @@ func (mfs MetricFamilies) Get(name string) *MetricFamily {
62 }
63
64 func (mfs MetricFamilies) GetGauge(name string) *MetricFamily {
65 - return mfs.get(name, textparse.MetricTypeGauge)
65 + return mfs.get(name, model.MetricTypeGauge)
66 }
67
68 func (mfs MetricFamilies) GetCounter(name string) *MetricFamily {
69 - return mfs.get(name, textparse.MetricTypeCounter)
69 + return mfs.get(name, model.MetricTypeCounter)
70 }
71
72 func (mfs MetricFamilies) GetSummary(name string) *MetricFamily {
73 - return mfs.get(name, textparse.MetricTypeSummary)
73 + return mfs.get(name, model.MetricTypeSummary)
74 }
75
76 func (mfs MetricFamilies) GetHistogram(name string) *MetricFamily {
77 - return mfs.get(name, textparse.MetricTypeHistogram)
77 + return mfs.get(name, model.MetricTypeHistogram)
78 }
79
80 -func (mfs MetricFamilies) get(name string, typ textparse.MetricType) *MetricFamily {
80 +func (mfs MetricFamilies) get(name string, typ model.MetricType) *MetricFamily {
81 mf := mfs.Get(name)
82 if mf == nil || mf.typ != typ {
83 return nil
@@ -85,10 +85,10 @@ func (mfs MetricFamilies) get(name string, typ textparse.MetricType) *MetricFami
85 return mf
86 }
87
88 -func (mf *MetricFamily) Name() string { return mf.name }
89 -func (mf *MetricFamily) Help() string { return mf.help }
90 -func (mf *MetricFamily) Type() textparse.MetricType { return mf.typ }
91 -func (mf *MetricFamily) Metrics() []Metric { return mf.metrics }
88 +func (mf *MetricFamily) Name() string { return mf.name }
89 +func (mf *MetricFamily) Help() string { return mf.help }
90 +func (mf *MetricFamily) Type() model.MetricType { return mf.typ }
91 +func (mf *MetricFamily) Metrics() []Metric { return mf.metrics }
92
93 func (m *Metric) Labels() labels.Labels { return m.labels }
94 func (m *Metric) Gauge() *Gauge { return m.gauge }
src/go/collectors/go.d.plugin/pkg/prometheus/metric_family_test.go
+19 -19
@@ -3,8 +3,8 @@ package prometheus
3 import (
4 "testing"
5
6 + "github.com/prometheus/common/model"
7 "github.com/prometheus/prometheus/model/labels"
7 - "github.com/prometheus/prometheus/model/textparse"
8 "github.com/stretchr/testify/assert"
9 )
10
@@ -66,15 +66,15 @@ func TestMetricFamilies_GetGauge(t *testing.T) {
66 wantMF *MetricFamily
67 }{
68 "metric is found and is Gauge": {
69 - mfs: MetricFamilies{n: &MetricFamily{name: n, typ: textparse.MetricTypeGauge}},
70 - wantMF: &MetricFamily{name: n, typ: textparse.MetricTypeGauge},
69 + mfs: MetricFamilies{n: &MetricFamily{name: n, typ: model.MetricTypeGauge}},
70 + wantMF: &MetricFamily{name: n, typ: model.MetricTypeGauge},
71 },
72 "metric is found but it is not Gauge": {
73 - mfs: MetricFamilies{n: &MetricFamily{name: n, typ: textparse.MetricTypeUnknown}},
73 + mfs: MetricFamilies{n: &MetricFamily{name: n, typ: model.MetricTypeUnknown}},
74 wantMF: nil,
75 },
76 "metric is not found": {
77 - mfs: MetricFamilies{"!" + n: &MetricFamily{name: n, typ: textparse.MetricTypeGauge}},
77 + mfs: MetricFamilies{"!" + n: &MetricFamily{name: n, typ: model.MetricTypeGauge}},
78 wantMF: nil,
79 },
80 "not initialized": {
@@ -98,15 +98,15 @@ func TestMetricFamilies_GetCounter(t *testing.T) {
98 wantMF *MetricFamily
99 }{
100 "metric is found and is Counter": {
101 - mfs: MetricFamilies{n: &MetricFamily{name: n, typ: textparse.MetricTypeCounter}},
102 - wantMF: &MetricFamily{name: n, typ: textparse.MetricTypeCounter},
101 + mfs: MetricFamilies{n: &MetricFamily{name: n, typ: model.MetricTypeCounter}},
102 + wantMF: &MetricFamily{name: n, typ: model.MetricTypeCounter},
103 },
104 "metric is found but it is not Counter": {
105 - mfs: MetricFamilies{n: &MetricFamily{name: n, typ: textparse.MetricTypeGauge}},
105 + mfs: MetricFamilies{n: &MetricFamily{name: n, typ: model.MetricTypeGauge}},
106 wantMF: nil,
107 },
108 "metric is not found": {
109 - mfs: MetricFamilies{"!" + n: &MetricFamily{name: n, typ: textparse.MetricTypeGauge}},
109 + mfs: MetricFamilies{"!" + n: &MetricFamily{name: n, typ: model.MetricTypeGauge}},
110 wantMF: nil,
111 },
112 "not initialized": {
@@ -130,15 +130,15 @@ func TestMetricFamilies_GetSummary(t *testing.T) {
130 wantMF *MetricFamily
131 }{
132 "metric is found and is Summary": {
133 - mfs: MetricFamilies{n: &MetricFamily{name: n, typ: textparse.MetricTypeSummary}},
134 - wantMF: &MetricFamily{name: n, typ: textparse.MetricTypeSummary},
133 + mfs: MetricFamilies{n: &MetricFamily{name: n, typ: model.MetricTypeSummary}},
134 + wantMF: &MetricFamily{name: n, typ: model.MetricTypeSummary},
135 },
136 "metric is found but it is not Summary": {
137 - mfs: MetricFamilies{n: &MetricFamily{name: n, typ: textparse.MetricTypeGauge}},
137 + mfs: MetricFamilies{n: &MetricFamily{name: n, typ: model.MetricTypeGauge}},
138 wantMF: nil,
139 },
140 "metric is not found": {
141 - mfs: MetricFamilies{"!" + n: &MetricFamily{name: n, typ: textparse.MetricTypeGauge}},
141 + mfs: MetricFamilies{"!" + n: &MetricFamily{name: n, typ: model.MetricTypeGauge}},
142 wantMF: nil,
143 },
144 "not initialized": {
@@ -162,15 +162,15 @@ func TestMetricFamilies_GetHistogram(t *testing.T) {
162 wantMF *MetricFamily
163 }{
164 "metric is found and is Histogram": {
165 - mfs: MetricFamilies{n: &MetricFamily{name: n, typ: textparse.MetricTypeHistogram}},
166 - wantMF: &MetricFamily{name: n, typ: textparse.MetricTypeHistogram},
165 + mfs: MetricFamilies{n: &MetricFamily{name: n, typ: model.MetricTypeHistogram}},
166 + wantMF: &MetricFamily{name: n, typ: model.MetricTypeHistogram},
167 },
168 "metric is found but it is not Histogram": {
169 - mfs: MetricFamilies{n: &MetricFamily{name: n, typ: textparse.MetricTypeGauge}},
169 + mfs: MetricFamilies{n: &MetricFamily{name: n, typ: model.MetricTypeGauge}},
170 wantMF: nil,
171 },
172 "metric is not found": {
173 - mfs: MetricFamilies{"!" + n: &MetricFamily{name: n, typ: textparse.MetricTypeGauge}},
173 + mfs: MetricFamilies{"!" + n: &MetricFamily{name: n, typ: model.MetricTypeGauge}},
174 wantMF: nil,
175 },
176 "not initialized": {
@@ -192,8 +192,8 @@ func TestMetricFamily_Name(t *testing.T) {
192 }
193
194 func TestMetricFamily_Type(t *testing.T) {
195 - mf := &MetricFamily{typ: textparse.MetricTypeGauge}
196 - assert.Equal(t, mf.Type(), textparse.MetricTypeGauge)
195 + mf := &MetricFamily{typ: model.MetricTypeGauge}
196 + assert.Equal(t, mf.Type(), model.MetricTypeGauge)
197 }
198
199 func TestMetricFamily_Help(t *testing.T) {
src/go/collectors/go.d.plugin/pkg/prometheus/parse.go
+14 -13
@@ -9,6 +9,7 @@ import (
9
10 "github.com/netdata/netdata/go/go.d.plugin/pkg/prometheus/selector"
11
12 + "github.com/prometheus/common/model"
13 "github.com/prometheus/prometheus/model/labels"
14 "github.com/prometheus/prometheus/model/textparse"
15 )
@@ -126,15 +127,15 @@ func (p *promTextParser) parseToMetricFamilies(text []byte) (MetricFamilies, err
127 _, _, value := parser.Series()
128
129 switch p.currMF.typ {
129 - case textparse.MetricTypeGauge:
130 + case model.MetricTypeGauge:
131 p.addGauge(value)
131 - case textparse.MetricTypeCounter:
132 + case model.MetricTypeCounter:
133 p.addCounter(value)
133 - case textparse.MetricTypeSummary:
134 + case model.MetricTypeSummary:
135 p.addSummary(value)
135 - case textparse.MetricTypeHistogram:
136 + case model.MetricTypeHistogram:
137 p.addHistogram(value)
137 - case textparse.MetricTypeUnknown:
138 + case model.MetricTypeUnknown:
139 p.addUnknown(value)
140 }
141 }
@@ -152,7 +153,7 @@ func (p *promTextParser) parseToMetricFamilies(text []byte) (MetricFamilies, err
153 func (p *promTextParser) setMetricFamilyByName(name string) {
154 mf, ok := p.metrics[name]
155 if !ok {
155 - mf = &MetricFamily{name: name, typ: textparse.MetricTypeUnknown}
156 + mf = &MetricFamily{name: name, typ: model.MetricTypeUnknown}
157 p.metrics[name] = mf
158 }
159 p.currMF = mf
@@ -165,13 +166,13 @@ func (p *promTextParser) setMetricFamilyBySeries() {
166 name := p.currSeries[0].Value
167
168 if p.currMF != nil && p.currMF.name == name {
168 - if p.currMF.typ == textparse.MetricTypeSummary {
169 + if p.currMF.typ == model.MetricTypeSummary {
170 p.setQuantile()
171 }
172 return
173 }
174
174 - typ := textparse.MetricTypeUnknown
175 + typ := model.MetricTypeUnknown
176
177 switch {
178 case strings.HasSuffix(name, sumSuffix):
@@ -202,15 +203,15 @@ func (p *promTextParser) setMetricFamilyBySeries() {
203 p.currSeries[0].Value = n
204 p.setBucket()
205 name = n
205 - typ = textparse.MetricTypeHistogram
206 + typ = model.MetricTypeHistogram
207 }
208 case p.currSeries.Has(quantileLabel):
208 - typ = textparse.MetricTypeSummary
209 + typ = model.MetricTypeSummary
210 p.setQuantile()
211 }
212
213 p.setMetricFamilyByName(name)
213 - if p.currMF.typ == "" || p.currMF.typ == textparse.MetricTypeUnknown {
214 + if p.currMF.typ == "" || p.currMF.typ == model.MetricTypeUnknown {
215 p.currMF.typ = typ
216 }
217 }
@@ -407,6 +408,6 @@ func removeLabel(lbs labels.Labels, name string) (labels.Labels, string, bool) {
408 return lbs, "", false
409 }
410
410 -func isSummaryOrHistogram(typ textparse.MetricType) bool {
411 - return typ == textparse.MetricTypeSummary || typ == textparse.MetricTypeHistogram
411 +func isSummaryOrHistogram(typ model.MetricType) bool {
412 + return typ == model.MetricTypeSummary || typ == model.MetricTypeHistogram
413 }
src/go/collectors/go.d.plugin/pkg/prometheus/parse_test.go
+35 -35
@@ -9,8 +9,8 @@ import (
9
10 "github.com/netdata/netdata/go/go.d.plugin/pkg/prometheus/selector"
11
12 + "github.com/prometheus/common/model"
13 "github.com/prometheus/prometheus/model/labels"
13 - "github.com/prometheus/prometheus/model/textparse"
14 "github.com/stretchr/testify/assert"
15 "github.com/stretchr/testify/require"
16 )
@@ -60,7 +60,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
60 "test_gauge_metric_1": {
61 name: "test_gauge_metric_1",
62 help: "First line. Second line.",
63 - typ: textparse.MetricTypeGauge,
63 + typ: model.MetricTypeGauge,
64 metrics: []Metric{
65 {
66 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -76,7 +76,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
76 "test_gauge_metric_1": {
77 name: "test_gauge_metric_1",
78 help: "Test Gauge Metric 1",
79 - typ: textparse.MetricTypeGauge,
79 + typ: model.MetricTypeGauge,
80 metrics: []Metric{
81 {
82 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -98,7 +98,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
98 },
99 "test_gauge_metric_2": {
100 name: "test_gauge_metric_2",
101 - typ: textparse.MetricTypeGauge,
101 + typ: model.MetricTypeGauge,
102 metrics: []Metric{
103 {
104 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -126,7 +126,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
126 "test_counter_metric_1_total": {
127 name: "test_counter_metric_1_total",
128 help: "Test Counter Metric 1",
129 - typ: textparse.MetricTypeCounter,
129 + typ: model.MetricTypeCounter,
130 metrics: []Metric{
131 {
132 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -148,7 +148,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
148 },
149 "test_counter_metric_2_total": {
150 name: "test_counter_metric_2_total",
151 - typ: textparse.MetricTypeCounter,
151 + typ: model.MetricTypeCounter,
152 metrics: []Metric{
153 {
154 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -176,7 +176,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
176 "test_summary_1_duration_microseconds": {
177 name: "test_summary_1_duration_microseconds",
178 help: "Test Summary Metric 1",
179 - typ: textparse.MetricTypeSummary,
179 + typ: model.MetricTypeSummary,
180 metrics: []Metric{
181 {
182 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -230,7 +230,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
230 },
231 "test_summary_2_duration_microseconds": {
232 name: "test_summary_2_duration_microseconds",
233 - typ: textparse.MetricTypeSummary,
233 + typ: model.MetricTypeSummary,
234 metrics: []Metric{
235 {
236 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -290,7 +290,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
290 "test_histogram_1_duration_seconds": {
291 name: "test_histogram_1_duration_seconds",
292 help: "Test Histogram Metric 1",
293 - typ: textparse.MetricTypeHistogram,
293 + typ: model.MetricTypeHistogram,
294 metrics: []Metric{
295 {
296 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -344,7 +344,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
344 },
345 "test_histogram_2_duration_seconds": {
346 name: "test_histogram_2_duration_seconds",
347 - typ: textparse.MetricTypeHistogram,
347 + typ: model.MetricTypeHistogram,
348 metrics: []Metric{
349 {
350 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -403,7 +403,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
403 want: MetricFamilies{
404 "test_gauge_no_meta_metric_1": {
405 name: "test_gauge_no_meta_metric_1",
406 - typ: textparse.MetricTypeUnknown,
406 + typ: model.MetricTypeUnknown,
407 metrics: []Metric{
408 {
409 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -425,7 +425,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
425 },
426 "test_gauge_no_meta_metric_2": {
427 name: "test_gauge_no_meta_metric_2",
428 - typ: textparse.MetricTypeUnknown,
428 + typ: model.MetricTypeUnknown,
429 metrics: []Metric{
430 {
431 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -452,7 +452,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
452 want: MetricFamilies{
453 "test_counter_no_meta_metric_1_total": {
454 name: "test_counter_no_meta_metric_1_total",
455 - typ: textparse.MetricTypeUnknown,
455 + typ: model.MetricTypeUnknown,
456 metrics: []Metric{
457 {
458 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -474,7 +474,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
474 },
475 "test_counter_no_meta_metric_2_total": {
476 name: "test_counter_no_meta_metric_2_total",
477 - typ: textparse.MetricTypeUnknown,
477 + typ: model.MetricTypeUnknown,
478 metrics: []Metric{
479 {
480 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -501,7 +501,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
501 want: MetricFamilies{
502 "test_summary_no_meta_1_duration_microseconds": {
503 name: "test_summary_no_meta_1_duration_microseconds",
504 - typ: textparse.MetricTypeSummary,
504 + typ: model.MetricTypeSummary,
505 metrics: []Metric{
506 {
507 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -555,7 +555,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
555 },
556 "test_summary_no_meta_2_duration_microseconds": {
557 name: "test_summary_no_meta_2_duration_microseconds",
558 - typ: textparse.MetricTypeSummary,
558 + typ: model.MetricTypeSummary,
559 metrics: []Metric{
560 {
561 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -614,7 +614,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
614 want: MetricFamilies{
615 "test_histogram_no_meta_1_duration_seconds": {
616 name: "test_histogram_no_meta_1_duration_seconds",
617 - typ: textparse.MetricTypeHistogram,
617 + typ: model.MetricTypeHistogram,
618 metrics: []Metric{
619 {
620 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -668,7 +668,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
668 },
669 "test_histogram_no_meta_2_duration_seconds": {
670 name: "test_histogram_no_meta_2_duration_seconds",
671 - typ: textparse.MetricTypeHistogram,
671 + typ: model.MetricTypeHistogram,
672 metrics: []Metric{
673 {
674 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -728,7 +728,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
728 "test_gauge_metric_1": {
729 name: "test_gauge_metric_1",
730 help: "Test Gauge Metric 1",
731 - typ: textparse.MetricTypeGauge,
731 + typ: model.MetricTypeGauge,
732 metrics: []Metric{
733 {
734 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -750,7 +750,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
750 },
751 "test_gauge_metric_2": {
752 name: "test_gauge_metric_2",
753 - typ: textparse.MetricTypeGauge,
753 + typ: model.MetricTypeGauge,
754 metrics: []Metric{
755 {
756 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -773,7 +773,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
773 "test_counter_metric_1_total": {
774 name: "test_counter_metric_1_total",
775 help: "Test Counter Metric 1",
776 - typ: textparse.MetricTypeCounter,
776 + typ: model.MetricTypeCounter,
777 metrics: []Metric{
778 {
779 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -795,7 +795,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
795 },
796 "test_counter_metric_2_total": {
797 name: "test_counter_metric_2_total",
798 - typ: textparse.MetricTypeCounter,
798 + typ: model.MetricTypeCounter,
799 metrics: []Metric{
800 {
801 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -818,7 +818,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
818 "test_summary_1_duration_microseconds": {
819 name: "test_summary_1_duration_microseconds",
820 help: "Test Summary Metric 1",
821 - typ: textparse.MetricTypeSummary,
821 + typ: model.MetricTypeSummary,
822 metrics: []Metric{
823 {
824 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -872,7 +872,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
872 },
873 "test_summary_2_duration_microseconds": {
874 name: "test_summary_2_duration_microseconds",
875 - typ: textparse.MetricTypeSummary,
875 + typ: model.MetricTypeSummary,
876 metrics: []Metric{
877 {
878 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -927,7 +927,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
927 "test_histogram_1_duration_seconds": {
928 name: "test_histogram_1_duration_seconds",
929 help: "Test Histogram Metric 1",
930 - typ: textparse.MetricTypeHistogram,
930 + typ: model.MetricTypeHistogram,
931 metrics: []Metric{
932 {
933 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -981,7 +981,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
981 },
982 "test_histogram_2_duration_seconds": {
983 name: "test_histogram_2_duration_seconds",
984 - typ: textparse.MetricTypeHistogram,
984 + typ: model.MetricTypeHistogram,
985 metrics: []Metric{
986 {
987 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -1035,7 +1035,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
1035 },
1036 "test_gauge_no_meta_metric_1": {
1037 name: "test_gauge_no_meta_metric_1",
1038 - typ: textparse.MetricTypeUnknown,
1038 + typ: model.MetricTypeUnknown,
1039 metrics: []Metric{
1040 {
1041 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -1057,7 +1057,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
1057 },
1058 "test_gauge_no_meta_metric_2": {
1059 name: "test_gauge_no_meta_metric_2",
1060 - typ: textparse.MetricTypeUnknown,
1060 + typ: model.MetricTypeUnknown,
1061 metrics: []Metric{
1062 {
1063 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -1079,7 +1079,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
1079 },
1080 "test_counter_no_meta_metric_1_total": {
1081 name: "test_counter_no_meta_metric_1_total",
1082 - typ: textparse.MetricTypeUnknown,
1082 + typ: model.MetricTypeUnknown,
1083 metrics: []Metric{
1084 {
1085 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -1101,7 +1101,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
1101 },
1102 "test_counter_no_meta_metric_2_total": {
1103 name: "test_counter_no_meta_metric_2_total",
1104 - typ: textparse.MetricTypeUnknown,
1104 + typ: model.MetricTypeUnknown,
1105 metrics: []Metric{
1106 {
1107 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -1123,7 +1123,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
1123 },
1124 "test_summary_no_meta_1_duration_microseconds": {
1125 name: "test_summary_no_meta_1_duration_microseconds",
1126 - typ: textparse.MetricTypeSummary,
1126 + typ: model.MetricTypeSummary,
1127 metrics: []Metric{
1128 {
1129 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -1177,7 +1177,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
1177 },
1178 "test_summary_no_meta_2_duration_microseconds": {
1179 name: "test_summary_no_meta_2_duration_microseconds",
1180 - typ: textparse.MetricTypeSummary,
1180 + typ: model.MetricTypeSummary,
1181 metrics: []Metric{
1182 {
1183 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -1231,7 +1231,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
1231 },
1232 "test_histogram_no_meta_1_duration_seconds": {
1233 name: "test_histogram_no_meta_1_duration_seconds",
1234 - typ: textparse.MetricTypeHistogram,
1234 + typ: model.MetricTypeHistogram,
1235 metrics: []Metric{
1236 {
1237 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -1285,7 +1285,7 @@ func TestPromTextParser_parseToMetricFamilies(t *testing.T) {
1285 },
1286 "test_histogram_no_meta_2_duration_seconds": {
1287 name: "test_histogram_no_meta_2_duration_seconds",
1288 - typ: textparse.MetricTypeHistogram,
1288 + typ: model.MetricTypeHistogram,
1289 metrics: []Metric{
1290 {
1291 labels: labels.Labels{{Name: "label1", Value: "value1"}},
@@ -1375,7 +1375,7 @@ test_gauge_metric_2{label1="value2"} 1
1375 want := MetricFamilies{
1376 "test_gauge_metric_1": &MetricFamily{
1377 name: "test_gauge_metric_1",
1378 - typ: textparse.MetricTypeUnknown,
1378 + typ: model.MetricTypeUnknown,
1379 metrics: []Metric{
1380 {labels: labels.Labels{{Name: "label1", Value: "value2"}}, untyped: &Untyped{value: 1}},
1381 },