Skip to content

Commit ad99e54

Browse files
thampiotrmattdurhamdehaansa
authored
v1.7.1 prep of release branch (#2848)
* fix targets conversion to maps for some components (#2834) * update to latest walqueue (#2845) * update to latest walqueue * fix typo * fix typo * Update ckit dependency (#2847) * changelog fix --------- Co-authored-by: mattdurham <[email protected]> Co-authored-by: Sam DeHaan <[email protected]>
1 parent 6313e11 commit ad99e54

File tree

9 files changed

+144
-54
lines changed

9 files changed

+144
-54
lines changed

‎CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ This document contains a historical list of changes between releases. Only
77
changes that impact end-user behavior are listed; changes to documentation or
88
internal API changes are not present.
99

10+
v1.7.1
11+
-----------------
12+
13+
### Bugfixes
14+
15+
- Fixed an issue where some exporters such as `prometheus.exporter.snmp` couldn't accept targets from other components
16+
with an error `conversion to '*map[string]string' is not supported"`. (@thampiotr)
17+
18+
- Enable batching of calls to the appender in `prometheus.write.queue` to reduce lock contention when scraping, which
19+
will lead to reduced scrape duration. (@mattdurham)
1020

1121
v1.7.0
1222
-----------------

‎docs/sources/reference/components/prometheus/prometheus.write.queue.md

+6
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,12 @@ They generally behave the same, but there are likely edge cases where they diffe
181181
* `prometheus_remote_write_wal_samples_appended_total` (counter): Total number of samples appended to the WAL.
182182
* `prometheus_remote_write_wal_storage_created_series_total` (counter): Total number of created series appended to the WAL.
183183
* `prometheus_remote_write_wal_storage_removed_series_total` (counter): Total number of series removed from the WAL.
184+
* `prometheus_remote_storage_bytes_total` (counter): Total number of bytes of data sent by queues after compression.
185+
* `prometheus_remote_storage_sent_bytes_total` (counter): Total number of bytes of data sent by queues after compression. (same as `prometheus_remote_storage_bytes_total`)
186+
* `prometheus_remote_storage_sent_batch_duration_seconds` (histogram): Duration of send calls to remote storage.
187+
* `prometheus_remote_storage_shards_max` (gauge): The maximum number of a shards a queue is allowed to run.
188+
* `prometheus_remote_storage_shards_min` (gauge): The minimum number of shards a queue is allowed to run.
189+
* `prometheus_remote_storage_shards` (gauge): The number of shards used for concurrent delivery of metrics to an endpoint.
184190

185191
Metrics that are new to `prometheus.write.queue`. These are highly subject to change.
186192

‎go.mod

+10-9
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ require (
5959
github.com/grafana/alloy-remote-config v0.0.10
6060
github.com/grafana/alloy/syntax v0.1.0
6161
github.com/grafana/catchpoint-prometheus-exporter v0.0.0-20250218151502-6e97feaee761
62-
github.com/grafana/ckit v0.0.0-20241128150632-1e6dfe1c6183
62+
github.com/grafana/ckit v0.0.0-20250226083311-4f9f4aacabb5
6363
github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2
6464
github.com/grafana/dskit v0.0.0-20250131191929-eab36484cec2
6565
github.com/grafana/go-gelf/v2 v2.0.1
@@ -75,7 +75,7 @@ require (
7575
github.com/grafana/snowflake-prometheus-exporter v0.0.0-20240813124544-9995e8354548
7676
github.com/grafana/tail v0.0.0-20230510142333-77b18831edf0
7777
github.com/grafana/vmware_exporter v0.0.5-beta.0.20250218170317-73398ba08329
78-
github.com/grafana/walqueue v0.0.0-20250222022458-49d08775d0f4
78+
github.com/grafana/walqueue v0.0.0-20250226140916-7365e13bbede
7979
github.com/hashicorp/consul/api v1.31.0
8080
github.com/hashicorp/go-discover v0.0.0-20230724184603-e89ebd1b2f65
8181
github.com/hashicorp/go-multierror v1.1.1
@@ -260,14 +260,14 @@ require (
260260
go.uber.org/goleak v1.3.0
261261
go.uber.org/multierr v1.11.0
262262
go.uber.org/zap v1.27.0
263-
golang.org/x/crypto v0.32.0
263+
golang.org/x/crypto v0.33.0
264264
golang.org/x/crypto/x509roots/fallback v0.0.0-20240208163226-62c9f1799c91
265265
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
266-
golang.org/x/net v0.34.0
266+
golang.org/x/net v0.35.0
267267
golang.org/x/oauth2 v0.25.0
268-
golang.org/x/sync v0.10.0
269-
golang.org/x/sys v0.29.0
270-
golang.org/x/text v0.21.0
268+
golang.org/x/sync v0.11.0
269+
golang.org/x/sys v0.30.0
270+
golang.org/x/text v0.22.0
271271
golang.org/x/time v0.9.0
272272
golang.org/x/tools v0.29.0
273273
google.golang.org/api v0.217.0
@@ -584,6 +584,7 @@ require (
584584
github.com/hashicorp/go-envparse v0.1.0 // indirect
585585
github.com/hashicorp/go-hclog v1.6.3 // indirect
586586
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
587+
github.com/hashicorp/go-metrics v0.5.4 // indirect
587588
github.com/hashicorp/go-msgpack v1.1.5 // indirect
588589
github.com/hashicorp/go-msgpack/v2 v2.1.1 // indirect
589590
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
@@ -596,7 +597,7 @@ require (
596597
github.com/hashicorp/go-version v1.7.0 // indirect
597598
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
598599
github.com/hashicorp/mdns v1.0.4 // indirect
599-
github.com/hashicorp/memberlist v0.5.1 // indirect
600+
github.com/hashicorp/memberlist v0.5.3 // indirect
600601
github.com/hashicorp/nomad/api v0.0.0-20240717122358-3d93bd3778f3 // indirect
601602
github.com/hashicorp/serf v0.10.1 // indirect
602603
github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443 // indirect
@@ -870,7 +871,7 @@ require (
870871
golang.design/x/chann v0.1.2 // indirect
871872
golang.org/x/arch v0.7.0 // indirect
872873
golang.org/x/mod v0.22.0 // indirect
873-
golang.org/x/term v0.28.0 // indirect
874+
golang.org/x/term v0.29.0 // indirect
874875
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
875876
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
876877
gonum.org/v1/gonum v0.15.1 // indirect

‎go.sum

+20-16
Original file line numberDiff line numberDiff line change
@@ -1252,8 +1252,8 @@ github.com/grafana/cadvisor v0.0.0-20240729082359-1f04a91701e2 h1:ju6EcY2aEobeBg
12521252
github.com/grafana/cadvisor v0.0.0-20240729082359-1f04a91701e2/go.mod h1:8sLW/G7rcFe1CKMaA4pYT4mX3P1xQVGqM6luzEzx/2g=
12531253
github.com/grafana/catchpoint-prometheus-exporter v0.0.0-20250218151502-6e97feaee761 h1:dPJOIEwtQ8uR3Qa79pb/lsSFJQ6j4P9vpCUQ4fKimG4=
12541254
github.com/grafana/catchpoint-prometheus-exporter v0.0.0-20250218151502-6e97feaee761/go.mod h1:S/M+H/0B7LSWtXbvzEOwqCl96xP6c1NOInW21+bzol0=
1255-
github.com/grafana/ckit v0.0.0-20241128150632-1e6dfe1c6183 h1:9ubc4+JkJ6lChOOxXsFalg0LMAqUX6eXZqu80luIvlA=
1256-
github.com/grafana/ckit v0.0.0-20241128150632-1e6dfe1c6183/go.mod h1:+Ddq4Cmuz2NnrPzhlZyEdxcDzsPhT6CW270t1aiCj5k=
1255+
github.com/grafana/ckit v0.0.0-20250226083311-4f9f4aacabb5 h1:EkW+rjr8zqiB4Jd7Gn5BmUhDz6PsZ0w33/4osKRd5x8=
1256+
github.com/grafana/ckit v0.0.0-20250226083311-4f9f4aacabb5/go.mod h1:izhHi8mZ16lxMxsdlFjPHzkopbjKNdorTtitYyzAejY=
12571257
github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2 h1:qhugDMdQ4Vp68H0tp/0iN17DM2ehRo1rLEdOFe/gB8I=
12581258
github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2/go.mod h1:w/aiO1POVIeXUQyl0VQSZjl5OAGDTL5aX+4v0RA1tcw=
12591259
github.com/grafana/dskit v0.0.0-20250131191929-eab36484cec2 h1:9xJDVoTFhzJZzvghXGDDQJapDQfYvVM+/TcWySUZ1VE=
@@ -1303,8 +1303,8 @@ github.com/grafana/tail v0.0.0-20230510142333-77b18831edf0 h1:bjh0PVYSVVFxzINqPF
13031303
github.com/grafana/tail v0.0.0-20230510142333-77b18831edf0/go.mod h1:7t5XR+2IA8P2qggOAHTj/GCZfoLBle3OvNSYh1VkRBU=
13041304
github.com/grafana/vmware_exporter v0.0.5-beta.0.20250218170317-73398ba08329 h1:Rs4H1yv2Abk3xE82qpyhMGGA8rswAOA0HQZde/BYkFo=
13051305
github.com/grafana/vmware_exporter v0.0.5-beta.0.20250218170317-73398ba08329/go.mod h1:Z28219aViNlsLlPvuCnlgHDagRdZBAZ7JOnQg1b3eWg=
1306-
github.com/grafana/walqueue v0.0.0-20250222022458-49d08775d0f4 h1:oEDouKyuO62LKR46nb/4Z1nKx2tcxLK9eLMmHJtNdwQ=
1307-
github.com/grafana/walqueue v0.0.0-20250222022458-49d08775d0f4/go.mod h1:++oxbVcfnIzbSKHNxpO3WpQJG5ufmnwtBJqh5rvEmVo=
1306+
github.com/grafana/walqueue v0.0.0-20250226140916-7365e13bbede h1:9xJHxsGrN7RPwXNPDSwmE6ivdJMRVnTRQITopBtxKik=
1307+
github.com/grafana/walqueue v0.0.0-20250226140916-7365e13bbede/go.mod h1:++oxbVcfnIzbSKHNxpO3WpQJG5ufmnwtBJqh5rvEmVo=
13081308
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
13091309
github.com/grobie/gomemcache v0.0.0-20230213081705-239240bbc445 h1:FlKQKUYPZ5yDCN248M3R7x8yu2E3yEZ0H7aLomE4EoE=
13101310
github.com/grobie/gomemcache v0.0.0-20230213081705-239240bbc445/go.mod h1:L69/dBlPQlWkcnU76WgcppK5e4rrxzQdi6LhLnK/ytA=
@@ -1371,6 +1371,8 @@ github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJ
13711371
github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
13721372
github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod h1:d1g9WGtAunDNpek8jUIEJnBlbgKS1N2Q61QkHiZyR1g=
13731373
github.com/hashicorp/go-memdb v0.0.0-20180223233045-1289e7fffe71/go.mod h1:kbfItVoBJwCfKXDXN4YoAXjxcFVZ7MRrJzyTX6H4giE=
1374+
github.com/hashicorp/go-metrics v0.5.4 h1:8mmPiIJkTPPEbAiV97IxdAGNdRdaWwVap1BU6elejKY=
1375+
github.com/hashicorp/go-metrics v0.5.4/go.mod h1:CG5yz4NZ/AI/aQt9Ucm/vdBnbh7fvmv4lxZ350i+QQI=
13741376
github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
13751377
github.com/hashicorp/go-msgpack v0.5.4/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
13761378
github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
@@ -1446,8 +1448,8 @@ github.com/hashicorp/memberlist v0.1.4/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p
14461448
github.com/hashicorp/memberlist v0.1.5/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
14471449
github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
14481450
github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
1449-
github.com/hashicorp/memberlist v0.5.1 h1:mk5dRuzeDNis2bi6LLoQIXfMH7JQvAzt3mQD0vNZZUo=
1450-
github.com/hashicorp/memberlist v0.5.1/go.mod h1:zGDXV6AqbDTKTM6yxW0I4+JtFzZAJVoIPvss4hV8F24=
1451+
github.com/hashicorp/memberlist v0.5.3 h1:tQ1jOCypD0WvMemw/ZhhtH+PWpzcftQvgCorLu0hndk=
1452+
github.com/hashicorp/memberlist v0.5.3/go.mod h1:h60o12SZn/ua/j0B6iKAZezA4eDaGsIuPO70eOaJ6WE=
14511453
github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod h1:/z+jUGRBlwVpUZfjute9jWaF6/HuhjuFQuL1YXzVD1Q=
14521454
github.com/hashicorp/nomad/api v0.0.0-20240717122358-3d93bd3778f3 h1:fgVfQ4AC1avVOnu2cfms8VAiD8lUq3vWI8mTocOXN/w=
14531455
github.com/hashicorp/nomad/api v0.0.0-20240717122358-3d93bd3778f3/go.mod h1:svtxn6QnrQ69P23VvIWMR34tg3vmwLz4UdUzm1dSCgE=
@@ -2969,8 +2971,8 @@ golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq
29692971
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
29702972
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
29712973
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
2972-
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
2973-
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
2974+
golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
2975+
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
29742976
golang.org/x/crypto/x509roots/fallback v0.0.0-20240208163226-62c9f1799c91 h1:Lyizcy9jX02jYR0ceBkL6S+jRys8Uepf7wt1vrz6Ras=
29752977
golang.org/x/crypto/x509roots/fallback v0.0.0-20240208163226-62c9f1799c91/go.mod h1:kNa9WdvYnzFwC79zRpLRMJbdEFlhyM5RPFBBZp/wWH8=
29762978
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -3099,8 +3101,8 @@ golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
30993101
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
31003102
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
31013103
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
3102-
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
3103-
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
3104+
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
3105+
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
31043106
golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
31053107
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
31063108
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -3135,8 +3137,9 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
31353137
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
31363138
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
31373139
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
3138-
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
31393140
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
3141+
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
3142+
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
31403143
golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
31413144
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
31423145
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -3259,8 +3262,8 @@ golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
32593262
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
32603263
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
32613264
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
3262-
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
3263-
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
3265+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
3266+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
32643267
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
32653268
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
32663269
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -3276,8 +3279,8 @@ golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
32763279
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
32773280
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
32783281
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
3279-
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
3280-
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
3282+
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
3283+
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
32813284
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
32823285
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
32833286
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -3297,8 +3300,9 @@ golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
32973300
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
32983301
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
32993302
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
3300-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
33013303
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
3304+
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
3305+
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
33023306
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
33033307
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
33043308
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎internal/component/discovery/discovery_test.go

+3-5
Original file line numberDiff line numberDiff line change
@@ -268,11 +268,11 @@ func updateDiscoverer(comp *Component, discoverer *fakeDiscoverer) {
268268

269269
type fakeDiscoverer struct {
270270
publishChan chan<- []*targetgroup.Group
271-
ready sync.WaitGroup
271+
ready *sync.WaitGroup
272272
}
273273

274274
func newFakeDiscoverer() *fakeDiscoverer {
275-
ready := sync.WaitGroup{}
275+
ready := &sync.WaitGroup{}
276276
ready.Add(1)
277277
return &fakeDiscoverer{
278278
ready: ready,
@@ -287,9 +287,7 @@ func (f *fakeDiscoverer) Publish(tg []*targetgroup.Group) {
287287
func (f *fakeDiscoverer) Run(ctx context.Context, publishChan chan<- []*targetgroup.Group) {
288288
f.publishChan = publishChan
289289
f.ready.Done()
290-
select {
291-
case <-ctx.Done():
292-
}
290+
<-ctx.Done()
293291
}
294292

295293
func (f *fakeDiscoverer) Register() error { return nil }

‎internal/component/discovery/target.go

+18-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,17 @@ func (t Target) ConvertInto(dst interface{}) error {
188188
})
189189
*dst = result
190190
return nil
191+
case *map[string]string:
192+
result := make(map[string]string, t.Len())
193+
// NOTE: no need to sort as value_tokens.go in syntax/token/builder package sorts the map's keys.
194+
t.ForEachLabel(func(key string, value string) bool {
195+
result[key] = value
196+
return true
197+
})
198+
*dst = result
199+
return nil
191200
}
201+
192202
return fmt.Errorf("target::ConvertInto: conversion to '%T' is not supported", dst)
193203
}
194204

@@ -211,8 +221,15 @@ func (t *Target) ConvertFrom(src interface{}) error {
211221
}
212222
*t = NewTargetFromLabelSet(labelSet)
213223
return nil
224+
case map[string]string:
225+
labelSet := make(commonlabels.LabelSet, len(src))
226+
for k, v := range src {
227+
labelSet[commonlabels.LabelName(k)] = commonlabels.LabelValue(v)
228+
}
229+
*t = NewTargetFromLabelSet(labelSet)
230+
return nil
214231
}
215-
return fmt.Errorf("target: conversion from '%T' is not supported", src)
232+
return fmt.Errorf("target::ConvertFrom: conversion from '%T' is not supported", src)
216233
}
217234

218235
func (t Target) String() string {

‎internal/component/discovery/target_builder.go

+3-5
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func (t targetBuilder) Get(label string) string {
7272
if ok {
7373
return string(lv)
7474
}
75-
lv, ok = t.group[commonlabels.LabelName(label)]
75+
lv = t.group[commonlabels.LabelName(label)]
7676
return string(lv)
7777
}
7878

@@ -114,10 +114,8 @@ func (t targetBuilder) Set(label string, val string) {
114114
func (t targetBuilder) Del(labels ...string) {
115115
for _, label := range labels {
116116
t.toDel[label] = struct{}{}
117-
// If we were adding one, need to clean it up too.
118-
if _, ok := t.toAdd[label]; ok {
119-
delete(t.toAdd, label)
120-
}
117+
// If we were adding one, may need to clean it up too.
118+
delete(t.toAdd, label)
121119
}
122120
}
123121

0 commit comments

Comments
 (0)