Skip to content

Commit 52b5088

Browse files
pkoutsovasilispkoutsovasilis
authored
Merge branch 'main' into dependabot/go_modules/github.com/elastic/elastic-agent-system-metrics-0.12.0
2 parents 0efb2e3 + a5063b1 commit 52b5088

31 files changed

+803
-145
lines changed

‎.github/dependabot.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ updates:
1212
- automation
1313
- dependency
1414
- Team:Elastic-Agent-Control-Plane
15+
- backport-active-all
1516
open-pull-requests-limit: 10
1617
groups:
1718
elastic-apm:

‎.github/workflows/bump-elastic-stack-snapshot.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
fail-fast: false
3030
matrix: ${{ fromJson(needs.filter.outputs.matrix) }}
3131
steps:
32-
- uses: actions/checkout@v4
32+
- uses: actions/checkout@v5
3333

3434
- name: Install Updatecli in the runner
35-
uses: updatecli/updatecli-action@419b75cb4d4bd6b50b03da7b33e1e0065d383eaf # v2.89.0
35+
uses: updatecli/updatecli-action@a327da0e796f543b8fa4706e5ed63014852ead0e # v2.91.0
3636

3737
- name: Run Updatecli in Apply mode
3838
run: updatecli apply --config .ci/bump-elastic-stack-snapshot.yml

‎.github/workflows/bump-golang.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
pull-requests: write
2121
steps:
2222

23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v5
2424

2525
- name: Install Updatecli in the runner
26-
uses: updatecli/updatecli-action@419b75cb4d4bd6b50b03da7b33e1e0065d383eaf # v2.89.0
26+
uses: updatecli/updatecli-action@a327da0e796f543b8fa4706e5ed63014852ead0e # v2.91.0
2727

2828
- name: Run Updatecli in Apply mode
2929
run: updatecli apply --config .ci/bump-golang.yml

‎.github/workflows/catalog-info.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
contents: read
1919
packages: read
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222

2323
- uses: elastic/oblt-actions/elastic/validate-catalog@v1
2424

‎.github/workflows/golangci-lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
GOOS: ${{ matrix.GOOS }}
2828
run: echo Go GOOS=$GOOS
2929

30-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@v5
3131

3232
- uses: actions/setup-go@v5
3333
with:

‎.github/workflows/post-dependabot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
contents: write
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020

2121
- uses: actions/setup-go@v5
2222
with:

‎.go-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.24.5
1+
1.24.6

‎.golangci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ run:
44
timeout: 1m
55
build-tags:
66
- integration
7-
go: "1.24.5"
7+
go: "1.24.6"
88

99
issues:
1010
# Maximum count of issues with the same text.

‎NOTICE-fips.txt‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1535,11 +1535,11 @@ SOFTWARE.
15351535

15361536
--------------------------------------------------------------------------------
15371537
Dependency : github.com/go-chi/chi/v5
1538-
Version: v5.2.2
1538+
Version: v5.2.3
15391539
Licence type (autodetected): MIT
15401540
--------------------------------------------------------------------------------
15411541

1542-
Contents of probable licence file $GOMODCACHE/github.com/go-chi/chi/[email protected].2/LICENSE:
1542+
Contents of probable licence file $GOMODCACHE/github.com/go-chi/chi/[email protected].3/LICENSE:
15431543

15441544
Copyright (c) 2015-present Peter Kieltyka (https://github.com/pkieltyka), Google Inc.
15451545

@@ -4594,6 +4594,43 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
45944594
THE SOFTWARE.
45954595

45964596

4597+
--------------------------------------------------------------------------------
4598+
Dependency : golang.org/x/net
4599+
Version: v0.43.0
4600+
Licence type (autodetected): BSD-3-Clause
4601+
--------------------------------------------------------------------------------
4602+
4603+
Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]/LICENSE:
4604+
4605+
Copyright 2009 The Go Authors.
4606+
4607+
Redistribution and use in source and binary forms, with or without
4608+
modification, are permitted provided that the following conditions are
4609+
met:
4610+
4611+
* Redistributions of source code must retain the above copyright
4612+
notice, this list of conditions and the following disclaimer.
4613+
* Redistributions in binary form must reproduce the above
4614+
copyright notice, this list of conditions and the following disclaimer
4615+
in the documentation and/or other materials provided with the
4616+
distribution.
4617+
* Neither the name of Google LLC nor the names of its
4618+
contributors may be used to endorse or promote products derived from
4619+
this software without specific prior written permission.
4620+
4621+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
4622+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
4623+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
4624+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
4625+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
4626+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
4627+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
4628+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
4629+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
4630+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
4631+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4632+
4633+
45974634
--------------------------------------------------------------------------------
45984635
Dependency : golang.org/x/sync
45994636
Version: v0.16.0
@@ -9656,50 +9693,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
96569693
THE SOFTWARE.
96579694

96589695

9659-
--------------------------------------------------------------------------------
9660-
Dependency : golang.org/x/net
9661-
Version: v0.41.0
9662-
Licence type (autodetected): BSD-3-Clause
9663-
--------------------------------------------------------------------------------
9664-
9665-
Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]/LICENSE:
9666-
9667-
Copyright 2009 The Go Authors.
9668-
9669-
Redistribution and use in source and binary forms, with or without
9670-
modification, are permitted provided that the following conditions are
9671-
met:
9672-
9673-
* Redistributions of source code must retain the above copyright
9674-
notice, this list of conditions and the following disclaimer.
9675-
* Redistributions in binary form must reproduce the above
9676-
copyright notice, this list of conditions and the following disclaimer
9677-
in the documentation and/or other materials provided with the
9678-
distribution.
9679-
* Neither the name of Google LLC nor the names of its
9680-
contributors may be used to endorse or promote products derived from
9681-
this software without specific prior written permission.
9682-
9683-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
9684-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
9685-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
9686-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
9687-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
9688-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
9689-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
9690-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
9691-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
9692-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
9693-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9694-
9695-
96969696
--------------------------------------------------------------------------------
96979697
Dependency : golang.org/x/sys
9698-
Version: v0.33.0
9698+
Version: v0.35.0
96999699
Licence type (autodetected): BSD-3-Clause
97009700
--------------------------------------------------------------------------------
97019701

9702-
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.33.0/LICENSE:
9702+
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.35.0/LICENSE:
97039703

97049704
Copyright 2009 The Go Authors.
97059705

@@ -9732,11 +9732,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
97329732

97339733
--------------------------------------------------------------------------------
97349734
Dependency : golang.org/x/text
9735-
Version: v0.26.0
9735+
Version: v0.28.0
97369736
Licence type (autodetected): BSD-3-Clause
97379737
--------------------------------------------------------------------------------
97389738

9739-
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.26.0/LICENSE:
9739+
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.28.0/LICENSE:
97409740

97419741
Copyright 2009 The Go Authors.
97429742

‎NOTICE.txt‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1535,11 +1535,11 @@ SOFTWARE.
15351535

15361536
--------------------------------------------------------------------------------
15371537
Dependency : github.com/go-chi/chi/v5
1538-
Version: v5.2.2
1538+
Version: v5.2.3
15391539
Licence type (autodetected): MIT
15401540
--------------------------------------------------------------------------------
15411541

1542-
Contents of probable licence file $GOMODCACHE/github.com/go-chi/chi/[email protected].2/LICENSE:
1542+
Contents of probable licence file $GOMODCACHE/github.com/go-chi/chi/[email protected].3/LICENSE:
15431543

15441544
Copyright (c) 2015-present Peter Kieltyka (https://github.com/pkieltyka), Google Inc.
15451545

@@ -4594,6 +4594,43 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
45944594
THE SOFTWARE.
45954595

45964596

4597+
--------------------------------------------------------------------------------
4598+
Dependency : golang.org/x/net
4599+
Version: v0.43.0
4600+
Licence type (autodetected): BSD-3-Clause
4601+
--------------------------------------------------------------------------------
4602+
4603+
Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]/LICENSE:
4604+
4605+
Copyright 2009 The Go Authors.
4606+
4607+
Redistribution and use in source and binary forms, with or without
4608+
modification, are permitted provided that the following conditions are
4609+
met:
4610+
4611+
* Redistributions of source code must retain the above copyright
4612+
notice, this list of conditions and the following disclaimer.
4613+
* Redistributions in binary form must reproduce the above
4614+
copyright notice, this list of conditions and the following disclaimer
4615+
in the documentation and/or other materials provided with the
4616+
distribution.
4617+
* Neither the name of Google LLC nor the names of its
4618+
contributors may be used to endorse or promote products derived from
4619+
this software without specific prior written permission.
4620+
4621+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
4622+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
4623+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
4624+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
4625+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
4626+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
4627+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
4628+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
4629+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
4630+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
4631+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4632+
4633+
45974634
--------------------------------------------------------------------------------
45984635
Dependency : golang.org/x/sync
45994636
Version: v0.16.0
@@ -9688,48 +9725,11 @@ THE SOFTWARE.
96889725

96899726
--------------------------------------------------------------------------------
96909727
Dependency : golang.org/x/crypto
9691-
Version: v0.39.0
9692-
Licence type (autodetected): BSD-3-Clause
9693-
--------------------------------------------------------------------------------
9694-
9695-
Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]/LICENSE:
9696-
9697-
Copyright 2009 The Go Authors.
9698-
9699-
Redistribution and use in source and binary forms, with or without
9700-
modification, are permitted provided that the following conditions are
9701-
met:
9702-
9703-
* Redistributions of source code must retain the above copyright
9704-
notice, this list of conditions and the following disclaimer.
9705-
* Redistributions in binary form must reproduce the above
9706-
copyright notice, this list of conditions and the following disclaimer
9707-
in the documentation and/or other materials provided with the
9708-
distribution.
9709-
* Neither the name of Google LLC nor the names of its
9710-
contributors may be used to endorse or promote products derived from
9711-
this software without specific prior written permission.
9712-
9713-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
9714-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
9715-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
9716-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
9717-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
9718-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
9719-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
9720-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
9721-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
9722-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
9723-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9724-
9725-
9726-
--------------------------------------------------------------------------------
9727-
Dependency : golang.org/x/net
97289728
Version: v0.41.0
97299729
Licence type (autodetected): BSD-3-Clause
97309730
--------------------------------------------------------------------------------
97319731

9732-
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.41.0/LICENSE:
9732+
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.41.0/LICENSE:
97339733

97349734
Copyright 2009 The Go Authors.
97359735

@@ -9762,11 +9762,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
97629762

97639763
--------------------------------------------------------------------------------
97649764
Dependency : golang.org/x/sys
9765-
Version: v0.33.0
9765+
Version: v0.35.0
97669766
Licence type (autodetected): BSD-3-Clause
97679767
--------------------------------------------------------------------------------
97689768

9769-
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.33.0/LICENSE:
9769+
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.35.0/LICENSE:
97709770

97719771
Copyright 2009 The Go Authors.
97729772

@@ -9799,11 +9799,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
97999799

98009800
--------------------------------------------------------------------------------
98019801
Dependency : golang.org/x/text
9802-
Version: v0.26.0
9802+
Version: v0.28.0
98039803
Licence type (autodetected): BSD-3-Clause
98049804
--------------------------------------------------------------------------------
98059805

9806-
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.26.0/LICENSE:
9806+
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.28.0/LICENSE:
98079807

98089808
Copyright 2009 The Go Authors.
98099809

0 commit comments

Comments
 (0)