fix: build after Go 1.17 and Prometheus upgrades (#8916)
* fix: go mod tidy * fix: update expected prometheus metrics Go 1.17 includes some new runtime metrics that are automatically published by the Prometheus client, so this adds them to the expected metric list so that the tests pass and we don't accidentally drop them in the future.
Gus Eggert committed
Apr 27, 2022 at 13:38 UTC
d4879a464b4afe3cef552b83873e0a70d7847d48
2 files changed
+99
-18
go.mod
+20
-18
@@ -135,8 +135,8 @@ require (
135
github.com/beorn7/perks v1.0.1 // indirect
136
github.com/btcsuite/btcd v0.22.0-beta // indirect
137
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
138
- github.com/cenkalti/backoff/v4 v4.1.1 // indirect
139
- github.com/cespare/xxhash/v2 v2.1.1 // indirect
138
+ github.com/cenkalti/backoff/v4 v4.1.2 // indirect
139
+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
140
github.com/cheekybits/genny v1.0.0 // indirect
141
github.com/containerd/cgroups v0.0.0-20201119153540-4cbc285b3327 // indirect
142
github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3 // indirect
@@ -150,18 +150,20 @@ require (
150
github.com/felixge/httpsnoop v1.0.2 // indirect
151
github.com/flynn/noise v1.0.0 // indirect
152
github.com/francoispqt/gojay v1.2.13 // indirect
153
- github.com/go-kit/log v0.1.0 // indirect
154
- github.com/go-logfmt/logfmt v0.5.0 // indirect
153
+ github.com/go-kit/log v0.2.0 // indirect
154
+ github.com/go-logfmt/logfmt v0.5.1 // indirect
155
+ github.com/go-logr/logr v1.2.3 // indirect
156
+ github.com/go-logr/stdr v1.2.2 // indirect
157
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
158
github.com/godbus/dbus/v5 v5.0.4 // indirect
159
github.com/gogo/protobuf v1.3.2 // indirect
160
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
161
github.com/golang/protobuf v1.5.2 // indirect
160
- github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
162
+ github.com/golang/snappy v0.0.4 // indirect
163
github.com/google/gopacket v1.1.19 // indirect
164
github.com/google/uuid v1.3.0 // indirect
165
github.com/gorilla/websocket v1.4.2 // indirect
164
- github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
166
+ github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
167
github.com/hannahhoward/go-pubsub v0.0.0-20200423002714-8d62886cc36e // indirect
168
github.com/hashicorp/errwrap v1.0.0 // indirect
169
github.com/hashicorp/golang-lru v0.5.4 // indirect
@@ -220,13 +222,13 @@ require (
222
github.com/multiformats/go-multistream v0.2.2 // indirect
223
github.com/multiformats/go-varint v0.0.6 // indirect
224
github.com/nxadm/tail v1.4.8 // indirect
223
- github.com/onsi/ginkgo v1.16.4 // indirect
225
+ github.com/onsi/ginkgo v1.16.5 // indirect
226
github.com/opencontainers/runtime-spec v1.0.2 // indirect
227
+ github.com/openzipkin/zipkin-go v0.4.0 // indirect
228
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
229
github.com/pmezard/go-difflib v1.0.0 // indirect
230
github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e // indirect
231
github.com/prometheus/client_model v0.2.0 // indirect
229
- github.com/prometheus/common v0.30.0 // indirect
232
github.com/prometheus/procfs v0.7.3 // indirect
233
github.com/prometheus/statsd_exporter v0.21.0 // indirect
234
github.com/raulk/clock v1.1.0 // indirect
@@ -244,25 +246,25 @@ require (
246
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
247
github.com/whyrusleeping/mdns v0.0.0-20190826153040-b9b60ed33aa9 // indirect
248
github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee // indirect
247
- go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.2.0 // indirect
248
- go.opentelemetry.io/otel/internal/metric v0.25.0 // indirect
249
- go.opentelemetry.io/otel/metric v0.25.0 // indirect
250
- go.opentelemetry.io/proto/otlp v0.10.0 // indirect
249
+ go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.3 // indirect
250
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.6.3 // indirect
251
+ go.opentelemetry.io/otel/metric v0.28.0 // indirect
252
+ go.opentelemetry.io/proto/otlp v0.15.0 // indirect
253
go.uber.org/atomic v1.9.0 // indirect
254
go.uber.org/multierr v1.7.0 // indirect
255
go4.org v0.0.0-20200411211856-f5505b9728dd // indirect
256
golang.org/x/exp v0.0.0-20210615023648-acb5c1269671 // indirect
257
golang.org/x/mod v0.4.2 // indirect
256
- golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
257
- golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c // indirect
258
- golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
258
+ golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
259
+ golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
260
+ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
261
golang.org/x/text v0.3.7 // indirect
262
golang.org/x/tools v0.1.5 // indirect
263
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
264
google.golang.org/appengine v1.6.6 // indirect
263
- google.golang.org/genproto v0.0.0-20200825200019-8632dd797987 // indirect
264
- google.golang.org/grpc v1.42.0 // indirect
265
- google.golang.org/protobuf v1.27.1 // indirect
265
+ google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1 // indirect
266
+ google.golang.org/grpc v1.45.0 // indirect
267
+ google.golang.org/protobuf v1.28.0 // indirect
268
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
269
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
270
gopkg.in/yaml.v2 v2.4.0 // indirect
test/sharness/t0116-prometheus-data/prometheus_metrics
+79
@@ -159,6 +159,9 @@ flatfs_datastore_sync_latency_seconds_bucket
159
flatfs_datastore_sync_latency_seconds_count
160
flatfs_datastore_sync_latency_seconds_sum
161
flatfs_datastore_sync_total
162
+go_gc_cycles_automatic_gc_cycles_total
163
+go_gc_cycles_forced_gc_cycles_total
164
+go_gc_cycles_total_gc_cycles_total
165
go_gc_duration_seconds
166
go_gc_duration_seconds
167
go_gc_duration_seconds
@@ -166,8 +169,70 @@ go_gc_duration_seconds
169
go_gc_duration_seconds
170
go_gc_duration_seconds_count
171
go_gc_duration_seconds_sum
172
+go_gc_heap_allocs_by_size_bytes_total_bucket
173
+go_gc_heap_allocs_by_size_bytes_total_bucket
174
+go_gc_heap_allocs_by_size_bytes_total_bucket
175
+go_gc_heap_allocs_by_size_bytes_total_bucket
176
+go_gc_heap_allocs_by_size_bytes_total_bucket
177
+go_gc_heap_allocs_by_size_bytes_total_bucket
178
+go_gc_heap_allocs_by_size_bytes_total_bucket
179
+go_gc_heap_allocs_by_size_bytes_total_bucket
180
+go_gc_heap_allocs_by_size_bytes_total_bucket
181
+go_gc_heap_allocs_by_size_bytes_total_bucket
182
+go_gc_heap_allocs_by_size_bytes_total_bucket
183
+go_gc_heap_allocs_by_size_bytes_total_bucket
184
+go_gc_heap_allocs_by_size_bytes_total_count
185
+go_gc_heap_allocs_by_size_bytes_total_sum
186
+go_gc_heap_allocs_bytes_total
187
+go_gc_heap_allocs_objects_total
188
+go_gc_heap_frees_by_size_bytes_total_bucket
189
+go_gc_heap_frees_by_size_bytes_total_bucket
190
+go_gc_heap_frees_by_size_bytes_total_bucket
191
+go_gc_heap_frees_by_size_bytes_total_bucket
192
+go_gc_heap_frees_by_size_bytes_total_bucket
193
+go_gc_heap_frees_by_size_bytes_total_bucket
194
+go_gc_heap_frees_by_size_bytes_total_bucket
195
+go_gc_heap_frees_by_size_bytes_total_bucket
196
+go_gc_heap_frees_by_size_bytes_total_bucket
197
+go_gc_heap_frees_by_size_bytes_total_bucket
198
+go_gc_heap_frees_by_size_bytes_total_bucket
199
+go_gc_heap_frees_by_size_bytes_total_bucket
200
+go_gc_heap_frees_by_size_bytes_total_count
201
+go_gc_heap_frees_by_size_bytes_total_sum
202
+go_gc_heap_frees_bytes_total
203
+go_gc_heap_frees_objects_total
204
+go_gc_heap_goal_bytes
205
+go_gc_heap_objects_objects
206
+go_gc_heap_tiny_allocs_objects_total
207
+go_gc_pauses_seconds_total_bucket
208
+go_gc_pauses_seconds_total_bucket
209
+go_gc_pauses_seconds_total_bucket
210
+go_gc_pauses_seconds_total_bucket
211
+go_gc_pauses_seconds_total_bucket
212
+go_gc_pauses_seconds_total_bucket
213
+go_gc_pauses_seconds_total_bucket
214
+go_gc_pauses_seconds_total_bucket
215
+go_gc_pauses_seconds_total_bucket
216
+go_gc_pauses_seconds_total_bucket
217
+go_gc_pauses_seconds_total_bucket
218
+go_gc_pauses_seconds_total_count
219
+go_gc_pauses_seconds_total_sum
220
go_goroutines
221
go_info
222
+go_memory_classes_heap_free_bytes
223
+go_memory_classes_heap_objects_bytes
224
+go_memory_classes_heap_released_bytes
225
+go_memory_classes_heap_stacks_bytes
226
+go_memory_classes_heap_unused_bytes
227
+go_memory_classes_metadata_mcache_free_bytes
228
+go_memory_classes_metadata_mcache_inuse_bytes
229
+go_memory_classes_metadata_mspan_free_bytes
230
+go_memory_classes_metadata_mspan_inuse_bytes
231
+go_memory_classes_metadata_other_bytes
232
+go_memory_classes_os_stacks_bytes
233
+go_memory_classes_other_bytes
234
+go_memory_classes_profiling_buckets_bytes
235
+go_memory_classes_total_bytes
236
go_memstats_alloc_bytes
237
go_memstats_alloc_bytes_total
238
go_memstats_buck_hash_sys_bytes
@@ -192,6 +257,20 @@ go_memstats_other_sys_bytes
257
go_memstats_stack_inuse_bytes
258
go_memstats_stack_sys_bytes
259
go_memstats_sys_bytes
260
+go_sched_goroutines_goroutines
261
+go_sched_latencies_seconds_bucket
262
+go_sched_latencies_seconds_bucket
263
+go_sched_latencies_seconds_bucket
264
+go_sched_latencies_seconds_bucket
265
+go_sched_latencies_seconds_bucket
266
+go_sched_latencies_seconds_bucket
267
+go_sched_latencies_seconds_bucket
268
+go_sched_latencies_seconds_bucket
269
+go_sched_latencies_seconds_bucket
270
+go_sched_latencies_seconds_bucket
271
+go_sched_latencies_seconds_bucket
272
+go_sched_latencies_seconds_count
273
+go_sched_latencies_seconds_sum
274
go_threads
275
ipfs_bitswap_active_block_tasks
276
ipfs_bitswap_active_tasks