Skip to content

Commit 2aed558

Browse files
mergify[bot]dependabot[bot]ycombinator
authored
[8.18](backport #5424) build(deps): bump github.com/prometheus/client_golang from 1.23.0 to 1.23.1 (#5435)
* 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 a593b41 commit 2aed558

File tree

4 files changed

+89
-21
lines changed

4 files changed

+89
-21
lines changed

NOTICE.txt

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

30453045
--------------------------------------------------------------------------------
30463046
Dependency : github.com/prometheus/client_golang
3047-
Version: v1.22.0
3047+
Version: v1.23.1
30483048
Licence type (autodetected): Apache-2.0
30493049
--------------------------------------------------------------------------------
30503050

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

30533053
Apache License
30543054
Version 2.0, January 2004
@@ -12921,6 +12921,43 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1292112921
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1292212922

1292312923

12924+
--------------------------------------------------------------------------------
12925+
Dependency : github.com/grafana/regexp
12926+
Version: v0.0.0-20240518133315-a468a5bfb3bc
12927+
Licence type (autodetected): BSD-3-Clause
12928+
--------------------------------------------------------------------------------
12929+
12930+
Contents of probable licence file $GOMODCACHE/github.com/grafana/[email protected]/LICENSE:
12931+
12932+
Copyright (c) 2009 The Go Authors. All rights reserved.
12933+
12934+
Redistribution and use in source and binary forms, with or without
12935+
modification, are permitted provided that the following conditions are
12936+
met:
12937+
12938+
* Redistributions of source code must retain the above copyright
12939+
notice, this list of conditions and the following disclaimer.
12940+
* Redistributions in binary form must reproduce the above
12941+
copyright notice, this list of conditions and the following disclaimer
12942+
in the documentation and/or other materials provided with the
12943+
distribution.
12944+
* Neither the name of Google Inc. nor the names of its
12945+
contributors may be used to endorse or promote products derived from
12946+
this software without specific prior written permission.
12947+
12948+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
12949+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
12950+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
12951+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
12952+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
12953+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
12954+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
12955+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
12956+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
12957+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
12958+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
12959+
12960+
1292412961
--------------------------------------------------------------------------------
1292512962
Dependency : github.com/inconshreveable/mousetrap
1292612963
Version: v1.1.0
@@ -16698,11 +16735,11 @@ SOFTWARE.
1669816735

1669916736
--------------------------------------------------------------------------------
1670016737
Dependency : github.com/prometheus/client_model
16701-
Version: v0.6.1
16738+
Version: v0.6.2
1670216739
Licence type (autodetected): Apache-2.0
1670316740
--------------------------------------------------------------------------------
1670416741

16705-
Contents of probable licence file $GOMODCACHE/github.com/prometheus/[email protected].1/LICENSE:
16742+
Contents of probable licence file $GOMODCACHE/github.com/prometheus/[email protected].2/LICENSE:
1670616743

1670716744
Apache License
1670816745
Version 2.0, January 2004
@@ -16909,11 +16946,11 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_model
1690916946

1691016947
--------------------------------------------------------------------------------
1691116948
Dependency : github.com/prometheus/common
16912-
Version: v0.62.0
16949+
Version: v0.66.0
1691316950
Licence type (autodetected): Apache-2.0
1691416951
--------------------------------------------------------------------------------
1691516952

16916-
Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.62.0/LICENSE:
16953+
Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.66.0/LICENSE:
1691716954

1691816955
Apache License
1691916956
Version 2.0, January 2004
@@ -17120,11 +17157,11 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/[email protected]
1712017157

1712117158
--------------------------------------------------------------------------------
1712217159
Dependency : github.com/prometheus/procfs
17123-
Version: v0.15.1
17160+
Version: v0.16.1
1712417161
Licence type (autodetected): Apache-2.0
1712517162
--------------------------------------------------------------------------------
1712617163

17127-
Contents of probable licence file $GOMODCACHE/github.com/prometheus/procfs@v0.15.1/LICENSE:
17164+
Contents of probable licence file $GOMODCACHE/github.com/prometheus/procfs@v0.16.1/LICENSE:
1712817165

1712917166
Apache License
1713017167
Version 2.0, January 2004
@@ -21725,6 +21762,35 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.
2172521762
limitations under the License.
2172621763

2172721764

21765+
--------------------------------------------------------------------------------
21766+
Dependency : go.uber.org/atomic
21767+
Version: v1.11.0
21768+
Licence type (autodetected): MIT
21769+
--------------------------------------------------------------------------------
21770+
21771+
Contents of probable licence file $GOMODCACHE/go.uber.org/[email protected]/LICENSE.txt:
21772+
21773+
Copyright (c) 2016 Uber Technologies, Inc.
21774+
21775+
Permission is hereby granted, free of charge, to any person obtaining a copy
21776+
of this software and associated documentation files (the "Software"), to deal
21777+
in the Software without restriction, including without limitation the rights
21778+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
21779+
copies of the Software, and to permit persons to whom the Software is
21780+
furnished to do so, subject to the following conditions:
21781+
21782+
The above copyright notice and this permission notice shall be included in
21783+
all copies or substantial portions of the Software.
21784+
21785+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
21786+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21787+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21788+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21789+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21790+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21791+
THE SOFTWARE.
21792+
21793+
2172821794
--------------------------------------------------------------------------------
2172921795
Dependency : go.uber.org/goleak
2173021796
Version: v1.3.0

go.mod

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/miolini/datacounter v1.0.3
2323
github.com/oapi-codegen/runtime v1.1.1
2424
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
25-
github.com/prometheus/client_golang v1.22.0
25+
github.com/prometheus/client_golang v1.23.1
2626
github.com/rs/xid v1.6.0
2727
github.com/rs/zerolog v1.32.0
2828
github.com/spf13/cobra v1.10.1
@@ -63,6 +63,7 @@ require (
6363
github.com/go-ole/go-ole v1.3.0 // indirect
6464
github.com/gofrs/uuid/v5 v5.2.0 // indirect
6565
github.com/google/uuid v1.6.0 // indirect
66+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
6667
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6768
github.com/josharian/intern v1.0.0 // indirect
6869
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
@@ -72,9 +73,9 @@ require (
7273
github.com/pkg/errors v0.9.1 // indirect
7374
github.com/pmezard/go-difflib v1.0.0 // indirect
7475
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
75-
github.com/prometheus/client_model v0.6.1 // indirect
76-
github.com/prometheus/common v0.62.0 // indirect
77-
github.com/prometheus/procfs v0.15.1 // indirect
76+
github.com/prometheus/client_model v0.6.2 // indirect
77+
github.com/prometheus/common v0.66.0 // indirect
78+
github.com/prometheus/procfs v0.16.1 // indirect
7879
github.com/shirou/gopsutil/v4 v4.24.7 // indirect
7980
github.com/shoenig/go-m1cpu v0.1.6 // indirect
8081
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=
@@ -138,14 +140,14 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
138140
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
139141
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
140142
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
141-
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
142-
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
143-
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
144-
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
145-
github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
146-
github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
147-
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
148-
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
143+
github.com/prometheus/client_golang v1.23.1 h1:w6gXMLQGgd0jXXlote9lRHMe0nG01EbnJT+C0EJru2Y=
144+
github.com/prometheus/client_golang v1.23.1/go.mod h1:br8j//v2eg2K5Vvna5klK8Ku5pcU5r4ll73v6ik5dIQ=
145+
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
146+
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
147+
github.com/prometheus/common v0.66.0 h1:K/rJPHrG3+AoQs50r2+0t7zMnMzek2Vbv31OFVsMeVY=
148+
github.com/prometheus/common v0.66.0/go.mod h1:Ux6NtV1B4LatamKE63tJBntoxD++xmtI/lK0VtEplN4=
149+
github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
150+
github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
149151
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
150152
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
151153
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=

testing/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ require (
5959
github.com/pkg/errors v0.9.1 // indirect
6060
github.com/pmezard/go-difflib v1.0.0 // indirect
6161
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
62-
github.com/prometheus/procfs v0.16.1 // indirect
6362
github.com/shirou/gopsutil/v4 v4.25.5 // indirect
6463
github.com/sirupsen/logrus v1.9.3 // indirect
6564
github.com/tklauser/go-sysconf v0.3.15 // indirect

0 commit comments

Comments
 (0)