Skip to content

Commit 0580d31

Browse files
mergify[bot]dependabot[bot]pkoutsovasilis
authored
[8.17](backport #4964) build(deps): bump the elastic-apm group across 1 directory with 6 updates (#4970)
* build(deps): bump the elastic-apm group across 1 directory with 6 updates (#4964) * build(deps): bump the elastic-apm group across 1 directory with 6 updates Bumps the elastic-apm group with 4 updates in the / directory: [go.elastic.co/apm/module/apmchiv5/v2](https://github.com/elastic/apm-agent-go), [go.elastic.co/apm/module/apmelasticsearch/v2](https://github.com/elastic/apm-agent-go), [go.elastic.co/apm/module/apmprometheus/v2](https://github.com/elastic/apm-agent-go) and [go.elastic.co/apm/module/apmzerolog/v2](https://github.com/elastic/apm-agent-go). Updates `go.elastic.co/apm/module/apmchiv5/v2` from 2.7.0 to 2.7.1 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.md) - [Commits](elastic/apm-agent-go@v2.7.0...v2.7.1) Updates `go.elastic.co/apm/module/apmelasticsearch/v2` from 2.7.0 to 2.7.1 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.md) - [Commits](elastic/apm-agent-go@v2.7.0...v2.7.1) Updates `go.elastic.co/apm/module/apmhttp/v2` from 2.7.0 to 2.7.1 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.md) - [Commits](elastic/apm-agent-go@v2.7.0...v2.7.1) Updates `go.elastic.co/apm/module/apmprometheus/v2` from 2.7.0 to 2.7.1 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.md) - [Commits](elastic/apm-agent-go@v2.7.0...v2.7.1) Updates `go.elastic.co/apm/module/apmzerolog/v2` from 2.7.0 to 2.7.1 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.md) - [Commits](elastic/apm-agent-go@v2.7.0...v2.7.1) Updates `go.elastic.co/apm/v2` from 2.7.0 to 2.7.1 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.md) - [Commits](elastic/apm-agent-go@v2.7.0...v2.7.1) --- updated-dependencies: - dependency-name: go.elastic.co/apm/module/apmchiv5/v2 dependency-version: 2.7.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: elastic-apm - dependency-name: go.elastic.co/apm/module/apmelasticsearch/v2 dependency-version: 2.7.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: elastic-apm - dependency-name: go.elastic.co/apm/module/apmhttp/v2 dependency-version: 2.7.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: elastic-apm - dependency-name: go.elastic.co/apm/module/apmprometheus/v2 dependency-version: 2.7.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: elastic-apm - dependency-name: go.elastic.co/apm/module/apmzerolog/v2 dependency-version: 2.7.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: elastic-apm - dependency-name: go.elastic.co/apm/v2 dependency-version: 2.7.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: elastic-apm ... Signed-off-by: dependabot[bot] <support@github.com> * Post dependabot file modifications --------- Signed-off-by: dependabot[bot] <support@github.com> 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 7fa1283) # Conflicts: # NOTICE.txt # go.mod # go.sum # testing/go.sum * fix: resolve conflicts --------- Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Panos Koutsovasilis <panos.koutsovasilis@elastic.co>
1 parent eecb0bf commit 0580d31

File tree

4 files changed

+41
-41
lines changed

4 files changed

+41
-41
lines changed

‎NOTICE.txt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3530,11 +3530,11 @@ SOFTWARE.
35303530

35313531
--------------------------------------------------------------------------------
35323532
Dependency : go.elastic.co/apm/module/apmchiv5/v2
3533-
Version: v2.6.2
3533+
Version: v2.7.1
35343534
Licence type (autodetected): Apache-2.0
35353535
--------------------------------------------------------------------------------
35363536

3537-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmchiv5/v2@v2.6.2/LICENSE:
3537+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmchiv5/v2@v2.7.1/LICENSE:
35383538

35393539
Apache License
35403540
Version 2.0, January 2004
@@ -3741,11 +3741,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmchiv5/
37413741

37423742
--------------------------------------------------------------------------------
37433743
Dependency : go.elastic.co/apm/module/apmelasticsearch/v2
3744-
Version: v2.6.2
3744+
Version: v2.7.1
37453745
Licence type (autodetected): Apache-2.0
37463746
--------------------------------------------------------------------------------
37473747

3748-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.6.2/LICENSE:
3748+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.7.1/LICENSE:
37493749

37503750
Apache License
37513751
Version 2.0, January 2004
@@ -3952,11 +3952,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasti
39523952

39533953
--------------------------------------------------------------------------------
39543954
Dependency : go.elastic.co/apm/module/apmhttp/v2
3955-
Version: v2.6.2
3955+
Version: v2.7.1
39563956
Licence type (autodetected): Apache-2.0
39573957
--------------------------------------------------------------------------------
39583958

3959-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.6.2/LICENSE:
3959+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.7.1/LICENSE:
39603960

39613961
Apache License
39623962
Version 2.0, January 2004
@@ -4163,11 +4163,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v
41634163

41644164
--------------------------------------------------------------------------------
41654165
Dependency : go.elastic.co/apm/module/apmprometheus/v2
4166-
Version: v2.6.2
4166+
Version: v2.7.1
41674167
Licence type (autodetected): Apache-2.0
41684168
--------------------------------------------------------------------------------
41694169

4170-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmprometheus/v2@v2.6.2/LICENSE:
4170+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmprometheus/v2@v2.7.1/LICENSE:
41714171

41724172
Apache License
41734173
Version 2.0, January 2004
@@ -4374,11 +4374,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmpromet
43744374

43754375
--------------------------------------------------------------------------------
43764376
Dependency : go.elastic.co/apm/module/apmzerolog/v2
4377-
Version: v2.6.2
4377+
Version: v2.7.1
43784378
Licence type (autodetected): Apache-2.0
43794379
--------------------------------------------------------------------------------
43804380

4381-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzerolog/v2@v2.6.2/LICENSE:
4381+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzerolog/v2@v2.7.1/LICENSE:
43824382

43834383
Apache License
43844384
Version 2.0, January 2004
@@ -4585,11 +4585,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzerolo
45854585

45864586
--------------------------------------------------------------------------------
45874587
Dependency : go.elastic.co/apm/v2
4588-
Version: v2.6.2
4588+
Version: v2.7.1
45894589
Licence type (autodetected): Apache-2.0
45904590
--------------------------------------------------------------------------------
45914591

4592-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.6.2/LICENSE:
4592+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.7.1/LICENSE:
45934593

45944594
Apache License
45954595
Version 2.0, January 2004
@@ -19546,11 +19546,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/ecszap@v1.0.3/LICENS
1954619546

1954719547
--------------------------------------------------------------------------------
1954819548
Dependency : go.elastic.co/fastjson
19549-
Version: v1.4.0
19549+
Version: v1.5.1
1955019550
Licence type (autodetected): MIT
1955119551
--------------------------------------------------------------------------------
1955219552

19553-
Contents of probable licence file $GOMODCACHE/go.elastic.co/fastjson@v1.4.0/LICENSE:
19553+
Contents of probable licence file $GOMODCACHE/go.elastic.co/fastjson@v1.5.1/LICENSE:
1955419554

1955519555
Copyright 2018 Elasticsearch BV
1955619556

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ require (
2727
github.com/rs/zerolog v1.32.0
2828
github.com/spf13/cobra v1.9.1
2929
github.com/stretchr/testify v1.10.0
30-
go.elastic.co/apm/module/apmchiv5/v2 v2.6.2
31-
go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.2
32-
go.elastic.co/apm/module/apmhttp/v2 v2.6.2
33-
go.elastic.co/apm/module/apmprometheus/v2 v2.6.2
34-
go.elastic.co/apm/module/apmzerolog/v2 v2.6.2
35-
go.elastic.co/apm/v2 v2.6.2
30+
go.elastic.co/apm/module/apmchiv5/v2 v2.7.1
31+
go.elastic.co/apm/module/apmelasticsearch/v2 v2.7.1
32+
go.elastic.co/apm/module/apmhttp/v2 v2.7.1
33+
go.elastic.co/apm/module/apmprometheus/v2 v2.7.1
34+
go.elastic.co/apm/module/apmzerolog/v2 v2.7.1
35+
go.elastic.co/apm/v2 v2.7.1
3636
go.elastic.co/ecszerolog v0.2.0
3737
go.uber.org/zap v1.27.0
3838
golang.org/x/sync v0.14.0
@@ -83,7 +83,7 @@ require (
8383
github.com/x448/float16 v0.8.4 // indirect
8484
github.com/yusufpapurcu/wmi v1.2.4 // indirect
8585
go.elastic.co/ecszap v1.0.3 // indirect
86-
go.elastic.co/fastjson v1.4.0 // indirect
86+
go.elastic.co/fastjson v1.5.1 // indirect
8787
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
8888
go.opentelemetry.io/otel v1.34.0 // indirect
8989
go.opentelemetry.io/otel/metric v1.34.0 // indirect

‎go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -183,24 +183,24 @@ github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcY
183183
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
184184
github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
185185
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
186-
go.elastic.co/apm/module/apmchiv5/v2 v2.6.2 h1:1Uax17eE3oDrvDGQyjvB4x6TdtxD0C2Ky1stziovWfs=
187-
go.elastic.co/apm/module/apmchiv5/v2 v2.6.2/go.mod h1:T1zucL9BCzwkVPgcA1nrKIyBzSJLxj291u/8esPOjdw=
188-
go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.2 h1:x5LIkBAIo2XT8nBqoAjPeJKUJC94le7D9aclBYP9uCw=
189-
go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.2/go.mod h1:LkYiSaKsGns6yRqXKAMbFyz7Nk8ikPCD/5CGkgQOY/A=
190-
go.elastic.co/apm/module/apmhttp/v2 v2.6.2 h1:+aYtP1Lnrsm+XtEs87RWG2PAyU6LHDDnYnJl3Lth0Qk=
191-
go.elastic.co/apm/module/apmhttp/v2 v2.6.2/go.mod h1:vlH+vXHaEijKK4pk605LOK+lbLDKwcByhlq4J24PeXw=
192-
go.elastic.co/apm/module/apmprometheus/v2 v2.6.2 h1:woGTNrTqhf95RFNiAjCX6TCrt+wT2Osz0jJdBxng0zA=
193-
go.elastic.co/apm/module/apmprometheus/v2 v2.6.2/go.mod h1:H+uES+y5p2FYNVVcYMRa2+kENngHXh72SfDnR4mSdww=
194-
go.elastic.co/apm/module/apmzerolog/v2 v2.6.2 h1:3jkIbOYEqXBu8KSWxbt3tG35ZZmtirO39Kb0JuaMAuo=
195-
go.elastic.co/apm/module/apmzerolog/v2 v2.6.2/go.mod h1:z+Z9Eme5ffMcnrXeVVvAnCsNhikYjPVgEeChsDiz4I8=
196-
go.elastic.co/apm/v2 v2.6.2 h1:VBplAxgbOgTv+Giw/FS91xJpHYw/q8fz/XKPvqC+7/o=
197-
go.elastic.co/apm/v2 v2.6.2/go.mod h1:33rOXgtHwbgZcDgi6I/GtCSMZQqgxkHC0IQT3gudKvo=
186+
go.elastic.co/apm/module/apmchiv5/v2 v2.7.1 h1:7mZkjS9YxHNy1Gsh72jEz8pKenFnhbCQILGoCdxOs9s=
187+
go.elastic.co/apm/module/apmchiv5/v2 v2.7.1/go.mod h1:yB0ksX+UKlhgC5+4wBR+18dym3TZKEMe4VFmBlkB5S8=
188+
go.elastic.co/apm/module/apmelasticsearch/v2 v2.7.1 h1:nA7I325lIxf6hlVN1SdoOuVJG3gadWlejWngfadGUP8=
189+
go.elastic.co/apm/module/apmelasticsearch/v2 v2.7.1/go.mod h1:+Xna0uioc2zNzfQzal40RfZ5PPLd2jRBsv49TGHmF8Y=
190+
go.elastic.co/apm/module/apmhttp/v2 v2.7.1 h1:1uPHesdm9nKytQ/N0bPmlS7F69oXvkzW+IlvzQuDUs8=
191+
go.elastic.co/apm/module/apmhttp/v2 v2.7.1/go.mod h1:DlBnNivf+eArsEI1QtUx7fygo/JDbdMIcU9+i/Wid1U=
192+
go.elastic.co/apm/module/apmprometheus/v2 v2.7.1 h1:7N6ihtUgZD8Wpfy/ZG9wZaFlmP5jXuPu98dab1rL8y4=
193+
go.elastic.co/apm/module/apmprometheus/v2 v2.7.1/go.mod h1:wi/E2WnWK3tcKwaIhPijq7dmCo6H+pvx1R1G0yVzmkI=
194+
go.elastic.co/apm/module/apmzerolog/v2 v2.7.1 h1:C9+KrlqS8F4SZFu+ct0Jmv2YLmzDhWsI8htK6exd3vg=
195+
go.elastic.co/apm/module/apmzerolog/v2 v2.7.1/go.mod h1:wXViB7paxMUrERgZrmUb+0FCqgb13Dull1JOOd8Hcj0=
196+
go.elastic.co/apm/v2 v2.7.1 h1:OFjARuESjBsxw7wHrEAnfSVNCHGBATXSI/kPvBARY/A=
197+
go.elastic.co/apm/v2 v2.7.1/go.mod h1:tQhBAjwh93b2leuAdzGwta/sP7Yc7QoKTSjeIHHDuog=
198198
go.elastic.co/ecszap v1.0.3 h1:RQtagS3uSftE8mPZ3msqb6mVI67jgcDuy1PUqiMv8ow=
199199
go.elastic.co/ecszap v1.0.3/go.mod h1:fM1RLWDU25TB/L48RUJgz5Le2AnoCeY/g0zf2op8gDU=
200200
go.elastic.co/ecszerolog v0.2.0 h1:nbX4dQ08jb3+vsvACfmzAqGDoBh8F2HQDUgpqwAVTg0=
201201
go.elastic.co/ecszerolog v0.2.0/go.mod h1:wR5Mv0BVQJ17LopUX5Fd0LLKCC9iF++58iKY+lL09lc=
202-
go.elastic.co/fastjson v1.4.0 h1:a4BXUKXZHAzjVOPrqtEx2FDsIRBCMek01vCnrtyutWs=
203-
go.elastic.co/fastjson v1.4.0/go.mod h1:ZD5um63l0/8TIdddZbL2znD83FAr2IckYa3KR7VcdNA=
202+
go.elastic.co/fastjson v1.5.1 h1:zeh1xHrFH79aQ6Xsw7YxixvnOdAl3OSv0xch/jRDzko=
203+
go.elastic.co/fastjson v1.5.1/go.mod h1:WtvH5wz8z9pDOPqNYSYKoLLv/9zCWZLeejHWuvdL/EM=
204204
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
205205
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
206206
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA=

‎testing/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,14 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
154154
github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
155155
github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
156156
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
157-
go.elastic.co/apm/module/apmhttp/v2 v2.6.2 h1:+aYtP1Lnrsm+XtEs87RWG2PAyU6LHDDnYnJl3Lth0Qk=
158-
go.elastic.co/apm/module/apmhttp/v2 v2.6.2/go.mod h1:vlH+vXHaEijKK4pk605LOK+lbLDKwcByhlq4J24PeXw=
159-
go.elastic.co/apm/v2 v2.6.2 h1:VBplAxgbOgTv+Giw/FS91xJpHYw/q8fz/XKPvqC+7/o=
160-
go.elastic.co/apm/v2 v2.6.2/go.mod h1:33rOXgtHwbgZcDgi6I/GtCSMZQqgxkHC0IQT3gudKvo=
157+
go.elastic.co/apm/module/apmhttp/v2 v2.7.1 h1:1uPHesdm9nKytQ/N0bPmlS7F69oXvkzW+IlvzQuDUs8=
158+
go.elastic.co/apm/module/apmhttp/v2 v2.7.1/go.mod h1:DlBnNivf+eArsEI1QtUx7fygo/JDbdMIcU9+i/Wid1U=
159+
go.elastic.co/apm/v2 v2.7.1 h1:OFjARuESjBsxw7wHrEAnfSVNCHGBATXSI/kPvBARY/A=
160+
go.elastic.co/apm/v2 v2.7.1/go.mod h1:tQhBAjwh93b2leuAdzGwta/sP7Yc7QoKTSjeIHHDuog=
161161
go.elastic.co/ecszap v1.0.3 h1:RQtagS3uSftE8mPZ3msqb6mVI67jgcDuy1PUqiMv8ow=
162162
go.elastic.co/ecszap v1.0.3/go.mod h1:fM1RLWDU25TB/L48RUJgz5Le2AnoCeY/g0zf2op8gDU=
163-
go.elastic.co/fastjson v1.4.0 h1:a4BXUKXZHAzjVOPrqtEx2FDsIRBCMek01vCnrtyutWs=
164-
go.elastic.co/fastjson v1.4.0/go.mod h1:ZD5um63l0/8TIdddZbL2znD83FAr2IckYa3KR7VcdNA=
163+
go.elastic.co/fastjson v1.5.1 h1:zeh1xHrFH79aQ6Xsw7YxixvnOdAl3OSv0xch/jRDzko=
164+
go.elastic.co/fastjson v1.5.1/go.mod h1:WtvH5wz8z9pDOPqNYSYKoLLv/9zCWZLeejHWuvdL/EM=
165165
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
166166
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
167167
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=

0 commit comments

Comments
 (0)