Skip to content

Commit b2f5556

Browse files
mergify[bot]dependabot[bot]ycombinator
authored
[9.1](backport #5424) build(deps): bump github.com/prometheus/client_golang from 1.23.0 to 1.23.1 (#5438)
* build(deps): bump github.com/prometheus/client_golang from 1.23.0 to 1.23.1 (#5424) * build(deps): bump github.com/prometheus/client_golang Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.23.0 to 1.23.1. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.23.0...v1.23.1) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-version: 1.23.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Post dependabot file modifications --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> (cherry picked from commit d532de4) # Conflicts: # NOTICE-fips.txt # NOTICE.txt # go.mod # go.sum * Fixing conflicts --------- Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Shaunak Kashyap <[email protected]>
1 parent 9536337 commit b2f5556

File tree

4 files changed

+105
-28
lines changed

4 files changed

+105
-28
lines changed

‎NOTICE-fips.txt‎

Lines changed: 45 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2634,11 +2634,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26342634

26352635
--------------------------------------------------------------------------------
26362636
Dependency : github.com/prometheus/client_golang
2637-
Version: v1.22.0
2637+
Version: v1.23.1
26382638
Licence type (autodetected): Apache-2.0
26392639
--------------------------------------------------------------------------------
26402640

2641-
Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_golang@v1.22.0/LICENSE:
2641+
Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_golang@v1.23.1/LICENSE:
26422642

26432643
Apache License
26442644
Version 2.0, January 2004
@@ -6783,6 +6783,43 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
67836783
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
67846784

67856785

6786+
--------------------------------------------------------------------------------
6787+
Dependency : github.com/grafana/regexp
6788+
Version: v0.0.0-20240518133315-a468a5bfb3bc
6789+
Licence type (autodetected): BSD-3-Clause
6790+
--------------------------------------------------------------------------------
6791+
6792+
Contents of probable licence file $GOMODCACHE/github.com/grafana/[email protected]/LICENSE:
6793+
6794+
Copyright (c) 2009 The Go Authors. All rights reserved.
6795+
6796+
Redistribution and use in source and binary forms, with or without
6797+
modification, are permitted provided that the following conditions are
6798+
met:
6799+
6800+
* Redistributions of source code must retain the above copyright
6801+
notice, this list of conditions and the following disclaimer.
6802+
* Redistributions in binary form must reproduce the above
6803+
copyright notice, this list of conditions and the following disclaimer
6804+
in the documentation and/or other materials provided with the
6805+
distribution.
6806+
* Neither the name of Google Inc. nor the names of its
6807+
contributors may be used to endorse or promote products derived from
6808+
this software without specific prior written permission.
6809+
6810+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
6811+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
6812+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
6813+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
6814+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
6815+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
6816+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
6817+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
6818+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
6819+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6820+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6821+
6822+
67866823
--------------------------------------------------------------------------------
67876824
Dependency : github.com/inconshreveable/mousetrap
67886825
Version: v1.1.0
@@ -7151,11 +7188,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
71517188

71527189
--------------------------------------------------------------------------------
71537190
Dependency : github.com/prometheus/client_model
7154-
Version: v0.6.1
7191+
Version: v0.6.2
71557192
Licence type (autodetected): Apache-2.0
71567193
--------------------------------------------------------------------------------
71577194

7158-
Contents of probable licence file $GOMODCACHE/github.com/prometheus/[email protected].1/LICENSE:
7195+
Contents of probable licence file $GOMODCACHE/github.com/prometheus/[email protected].2/LICENSE:
71597196

71607197
Apache License
71617198
Version 2.0, January 2004
@@ -7362,11 +7399,11 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_model
73627399

73637400
--------------------------------------------------------------------------------
73647401
Dependency : github.com/prometheus/common
7365-
Version: v0.62.0
7402+
Version: v0.66.0
73667403
Licence type (autodetected): Apache-2.0
73677404
--------------------------------------------------------------------------------
73687405

7369-
Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.62.0/LICENSE:
7406+
Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.66.0/LICENSE:
73707407

73717408
Apache License
73727409
Version 2.0, January 2004
@@ -7573,11 +7610,11 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/[email protected]
75737610

75747611
--------------------------------------------------------------------------------
75757612
Dependency : github.com/prometheus/procfs
7576-
Version: v0.15.1
7613+
Version: v0.16.1
75777614
Licence type (autodetected): Apache-2.0
75787615
--------------------------------------------------------------------------------
75797616

7580-
Contents of probable licence file $GOMODCACHE/github.com/prometheus/procfs@v0.15.1/LICENSE:
7617+
Contents of probable licence file $GOMODCACHE/github.com/prometheus/procfs@v0.16.1/LICENSE:
75817618

75827619
Apache License
75837620
Version 2.0, January 2004

‎NOTICE.txt‎

Lines changed: 45 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2634,11 +2634,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26342634

26352635
--------------------------------------------------------------------------------
26362636
Dependency : github.com/prometheus/client_golang
2637-
Version: v1.22.0
2637+
Version: v1.23.1
26382638
Licence type (autodetected): Apache-2.0
26392639
--------------------------------------------------------------------------------
26402640

2641-
Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_golang@v1.22.0/LICENSE:
2641+
Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_golang@v1.23.1/LICENSE:
26422642

26432643
Apache License
26442644
Version 2.0, January 2004
@@ -6813,6 +6813,43 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
68136813
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
68146814

68156815

6816+
--------------------------------------------------------------------------------
6817+
Dependency : github.com/grafana/regexp
6818+
Version: v0.0.0-20240518133315-a468a5bfb3bc
6819+
Licence type (autodetected): BSD-3-Clause
6820+
--------------------------------------------------------------------------------
6821+
6822+
Contents of probable licence file $GOMODCACHE/github.com/grafana/[email protected]/LICENSE:
6823+
6824+
Copyright (c) 2009 The Go Authors. All rights reserved.
6825+
6826+
Redistribution and use in source and binary forms, with or without
6827+
modification, are permitted provided that the following conditions are
6828+
met:
6829+
6830+
* Redistributions of source code must retain the above copyright
6831+
notice, this list of conditions and the following disclaimer.
6832+
* Redistributions in binary form must reproduce the above
6833+
copyright notice, this list of conditions and the following disclaimer
6834+
in the documentation and/or other materials provided with the
6835+
distribution.
6836+
* Neither the name of Google Inc. nor the names of its
6837+
contributors may be used to endorse or promote products derived from
6838+
this software without specific prior written permission.
6839+
6840+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
6841+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
6842+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
6843+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
6844+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
6845+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
6846+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
6847+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
6848+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
6849+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6850+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6851+
6852+
68166853
--------------------------------------------------------------------------------
68176854
Dependency : github.com/inconshreveable/mousetrap
68186855
Version: v1.1.0
@@ -7181,11 +7218,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
71817218

71827219
--------------------------------------------------------------------------------
71837220
Dependency : github.com/prometheus/client_model
7184-
Version: v0.6.1
7221+
Version: v0.6.2
71857222
Licence type (autodetected): Apache-2.0
71867223
--------------------------------------------------------------------------------
71877224

7188-
Contents of probable licence file $GOMODCACHE/github.com/prometheus/[email protected].1/LICENSE:
7225+
Contents of probable licence file $GOMODCACHE/github.com/prometheus/[email protected].2/LICENSE:
71897226

71907227
Apache License
71917228
Version 2.0, January 2004
@@ -7392,11 +7429,11 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_model
73927429

73937430
--------------------------------------------------------------------------------
73947431
Dependency : github.com/prometheus/common
7395-
Version: v0.62.0
7432+
Version: v0.66.0
73967433
Licence type (autodetected): Apache-2.0
73977434
--------------------------------------------------------------------------------
73987435

7399-
Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.62.0/LICENSE:
7436+
Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.66.0/LICENSE:
74007437

74017438
Apache License
74027439
Version 2.0, January 2004
@@ -7603,11 +7640,11 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/[email protected]
76037640

76047641
--------------------------------------------------------------------------------
76057642
Dependency : github.com/prometheus/procfs
7606-
Version: v0.15.1
7643+
Version: v0.16.1
76077644
Licence type (autodetected): Apache-2.0
76087645
--------------------------------------------------------------------------------
76097646

7610-
Contents of probable licence file $GOMODCACHE/github.com/prometheus/procfs@v0.15.1/LICENSE:
7647+
Contents of probable licence file $GOMODCACHE/github.com/prometheus/procfs@v0.16.1/LICENSE:
76117648

76127649
Apache License
76137650
Version 2.0, January 2004

‎go.mod‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
github.com/miolini/datacounter v1.0.3
2525
github.com/oapi-codegen/runtime v1.1.1
2626
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
27-
github.com/prometheus/client_golang v1.22.0
27+
github.com/prometheus/client_golang v1.23.1
2828
github.com/rs/xid v1.6.0
2929
github.com/rs/zerolog v1.34.0
3030
github.com/spf13/cobra v1.10.1
@@ -64,6 +64,7 @@ require (
6464
github.com/go-logr/stdr v1.2.2 // indirect
6565
github.com/go-ole/go-ole v1.3.0 // indirect
6666
github.com/google/uuid v1.6.0 // indirect
67+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
6768
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6869
github.com/josharian/intern v1.0.0 // indirect
6970
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
@@ -73,9 +74,9 @@ require (
7374
github.com/pkg/errors v0.9.1 // indirect
7475
github.com/pmezard/go-difflib v1.0.0 // indirect
7576
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
76-
github.com/prometheus/client_model v0.6.1 // indirect
77-
github.com/prometheus/common v0.62.0 // indirect
78-
github.com/prometheus/procfs v0.15.1 // indirect
77+
github.com/prometheus/client_model v0.6.2 // indirect
78+
github.com/prometheus/common v0.66.0 // indirect
79+
github.com/prometheus/procfs v0.16.1 // indirect
7980
github.com/shirou/gopsutil/v4 v4.24.7 // indirect
8081
github.com/shoenig/go-m1cpu v0.1.6 // indirect
8182
github.com/spf13/pflag v1.0.9 // indirect

‎go.sum‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ github.com/google/pprof v0.0.0-20230426061923-93006964c1fc h1:AGDHt781oIcL4EFk7c
8585
github.com/google/pprof v0.0.0-20230426061923-93006964c1fc/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk=
8686
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
8787
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
88+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248=
89+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk=
8890
github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
8991
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
9092
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
@@ -140,14 +142,14 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
140142
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
141143
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
142144
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
143-
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
144-
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
145-
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
146-
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
147-
github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
148-
github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
149-
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
150-
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
145+
github.com/prometheus/client_golang v1.23.1 h1:w6gXMLQGgd0jXXlote9lRHMe0nG01EbnJT+C0EJru2Y=
146+
github.com/prometheus/client_golang v1.23.1/go.mod h1:br8j//v2eg2K5Vvna5klK8Ku5pcU5r4ll73v6ik5dIQ=
147+
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
148+
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
149+
github.com/prometheus/common v0.66.0 h1:K/rJPHrG3+AoQs50r2+0t7zMnMzek2Vbv31OFVsMeVY=
150+
github.com/prometheus/common v0.66.0/go.mod h1:Ux6NtV1B4LatamKE63tJBntoxD++xmtI/lK0VtEplN4=
151+
github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
152+
github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
151153
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
152154
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
153155
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=

0 commit comments

Comments
 (0)