Skip to content

Commit 7fad94d

Browse files
mergify[bot]dependabot[bot]pkoutsovasilis
authored
[9.0](backport #4964) build(deps): bump the elastic-apm group across 1 directory with 6 updates (#4973)
* 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 5c7037c commit 7fad94d

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
@@ -3560,11 +3560,11 @@ SOFTWARE.
35603560

35613561
--------------------------------------------------------------------------------
35623562
Dependency : go.elastic.co/apm/module/apmchiv5/v2
3563-
Version: v2.6.3
3563+
Version: v2.7.1
35643564
Licence type (autodetected): Apache-2.0
35653565
--------------------------------------------------------------------------------
35663566

3567-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmchiv5/v2@v2.6.3/LICENSE:
3567+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmchiv5/v2@v2.7.1/LICENSE:
35683568

35693569
Apache License
35703570
Version 2.0, January 2004
@@ -3771,11 +3771,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmchiv5/
37713771

37723772
--------------------------------------------------------------------------------
37733773
Dependency : go.elastic.co/apm/module/apmelasticsearch/v2
3774-
Version: v2.6.3
3774+
Version: v2.7.1
37753775
Licence type (autodetected): Apache-2.0
37763776
--------------------------------------------------------------------------------
37773777

3778-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.6.3/LICENSE:
3778+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.7.1/LICENSE:
37793779

37803780
Apache License
37813781
Version 2.0, January 2004
@@ -3982,11 +3982,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasti
39823982

39833983
--------------------------------------------------------------------------------
39843984
Dependency : go.elastic.co/apm/module/apmhttp/v2
3985-
Version: v2.6.3
3985+
Version: v2.7.1
39863986
Licence type (autodetected): Apache-2.0
39873987
--------------------------------------------------------------------------------
39883988

3989-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.6.3/LICENSE:
3989+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.7.1/LICENSE:
39903990

39913991
Apache License
39923992
Version 2.0, January 2004
@@ -4193,11 +4193,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v
41934193

41944194
--------------------------------------------------------------------------------
41954195
Dependency : go.elastic.co/apm/module/apmprometheus/v2
4196-
Version: v2.6.3
4196+
Version: v2.7.1
41974197
Licence type (autodetected): Apache-2.0
41984198
--------------------------------------------------------------------------------
41994199

4200-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmprometheus/v2@v2.6.3/LICENSE:
4200+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmprometheus/v2@v2.7.1/LICENSE:
42014201

42024202
Apache License
42034203
Version 2.0, January 2004
@@ -4404,11 +4404,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmpromet
44044404

44054405
--------------------------------------------------------------------------------
44064406
Dependency : go.elastic.co/apm/module/apmzerolog/v2
4407-
Version: v2.6.3
4407+
Version: v2.7.1
44084408
Licence type (autodetected): Apache-2.0
44094409
--------------------------------------------------------------------------------
44104410

4411-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzerolog/v2@v2.6.3/LICENSE:
4411+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzerolog/v2@v2.7.1/LICENSE:
44124412

44134413
Apache License
44144414
Version 2.0, January 2004
@@ -4615,11 +4615,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzerolo
46154615

46164616
--------------------------------------------------------------------------------
46174617
Dependency : go.elastic.co/apm/v2
4618-
Version: v2.6.3
4618+
Version: v2.7.1
46194619
Licence type (autodetected): Apache-2.0
46204620
--------------------------------------------------------------------------------
46214621

4622-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.6.3/LICENSE:
4622+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.7.1/LICENSE:
46234623

46244624
Apache License
46254625
Version 2.0, January 2004
@@ -19576,11 +19576,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/ecszap@v1.0.3/LICENS
1957619576

1957719577
--------------------------------------------------------------------------------
1957819578
Dependency : go.elastic.co/fastjson
19579-
Version: v1.5.0
19579+
Version: v1.5.1
1958019580
Licence type (autodetected): MIT
1958119581
--------------------------------------------------------------------------------
1958219582

19583-
Contents of probable licence file $GOMODCACHE/go.elastic.co/fastjson@v1.5.0/LICENSE:
19583+
Contents of probable licence file $GOMODCACHE/go.elastic.co/fastjson@v1.5.1/LICENSE:
1958419584

1958519585
Copyright 2018 Elasticsearch BV
1958619586

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ require (
2828
github.com/rs/zerolog v1.32.0
2929
github.com/spf13/cobra v1.9.1
3030
github.com/stretchr/testify v1.10.0
31-
go.elastic.co/apm/module/apmchiv5/v2 v2.6.3
32-
go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.3
33-
go.elastic.co/apm/module/apmhttp/v2 v2.6.3
34-
go.elastic.co/apm/module/apmprometheus/v2 v2.6.3
35-
go.elastic.co/apm/module/apmzerolog/v2 v2.6.3
36-
go.elastic.co/apm/v2 v2.6.3
31+
go.elastic.co/apm/module/apmchiv5/v2 v2.7.1
32+
go.elastic.co/apm/module/apmelasticsearch/v2 v2.7.1
33+
go.elastic.co/apm/module/apmhttp/v2 v2.7.1
34+
go.elastic.co/apm/module/apmprometheus/v2 v2.7.1
35+
go.elastic.co/apm/module/apmzerolog/v2 v2.7.1
36+
go.elastic.co/apm/v2 v2.7.1
3737
go.elastic.co/ecszerolog v0.2.0
3838
go.uber.org/zap v1.27.0
3939
golang.org/x/sync v0.14.0
@@ -84,7 +84,7 @@ require (
8484
github.com/x448/float16 v0.8.4 // indirect
8585
github.com/yusufpapurcu/wmi v1.2.4 // indirect
8686
go.elastic.co/ecszap v1.0.3 // indirect
87-
go.elastic.co/fastjson v1.5.0 // indirect
87+
go.elastic.co/fastjson v1.5.1 // indirect
8888
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
8989
go.opentelemetry.io/otel v1.34.0 // indirect
9090
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
@@ -185,24 +185,24 @@ github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcY
185185
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
186186
github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
187187
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
188-
go.elastic.co/apm/module/apmchiv5/v2 v2.6.3 h1:1BiQVsJLnP/L0L7CfsHN5GgVFXFkdJajIsrKUOqXmcg=
189-
go.elastic.co/apm/module/apmchiv5/v2 v2.6.3/go.mod h1:C50/8lsoq0l6HNwyCSqiimSTkdyEGRYvrVpr0eDJba8=
190-
go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.3 h1:5CuemBg1oZnXI6jz+jkLqM95Np1XHasdy0CCelX62Ec=
191-
go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.3/go.mod h1:MVK2TIrvMGQaL7bnO4dbnJ+jpDNqmkj+BukDRBYTI60=
192-
go.elastic.co/apm/module/apmhttp/v2 v2.6.3 h1:jwFovJZkccySKCyy2oE9ZKvUry/a4gdQHF/MtZUQVtE=
193-
go.elastic.co/apm/module/apmhttp/v2 v2.6.3/go.mod h1:w94Gkk6uzI/K+eJYKDLB66tvWC5uK0fSHyWcyX2jPlQ=
194-
go.elastic.co/apm/module/apmprometheus/v2 v2.6.3 h1:4HMrW/u+HFSe/XxlWMikVlqKu77PL7euGFBZ1wtVR2Y=
195-
go.elastic.co/apm/module/apmprometheus/v2 v2.6.3/go.mod h1:rKbOroM9YDOeqpR0SvR4Lawy/gUmZTmyWRbGKoGFn3s=
196-
go.elastic.co/apm/module/apmzerolog/v2 v2.6.3 h1:aCgY9dqrhI71dELPfFTgud53KH6WMslCTU8LaGuV/+I=
197-
go.elastic.co/apm/module/apmzerolog/v2 v2.6.3/go.mod h1:7XstrBgue34PSqEaGq0Cr5cr17ckivIh9AfQRgSwwps=
198-
go.elastic.co/apm/v2 v2.6.3 h1:yVKFPLnmHOxpzLMGd3aexcik20ziXmRHqgcn9NZn/VU=
199-
go.elastic.co/apm/v2 v2.6.3/go.mod h1:33rOXgtHwbgZcDgi6I/GtCSMZQqgxkHC0IQT3gudKvo=
188+
go.elastic.co/apm/module/apmchiv5/v2 v2.7.1 h1:7mZkjS9YxHNy1Gsh72jEz8pKenFnhbCQILGoCdxOs9s=
189+
go.elastic.co/apm/module/apmchiv5/v2 v2.7.1/go.mod h1:yB0ksX+UKlhgC5+4wBR+18dym3TZKEMe4VFmBlkB5S8=
190+
go.elastic.co/apm/module/apmelasticsearch/v2 v2.7.1 h1:nA7I325lIxf6hlVN1SdoOuVJG3gadWlejWngfadGUP8=
191+
go.elastic.co/apm/module/apmelasticsearch/v2 v2.7.1/go.mod h1:+Xna0uioc2zNzfQzal40RfZ5PPLd2jRBsv49TGHmF8Y=
192+
go.elastic.co/apm/module/apmhttp/v2 v2.7.1 h1:1uPHesdm9nKytQ/N0bPmlS7F69oXvkzW+IlvzQuDUs8=
193+
go.elastic.co/apm/module/apmhttp/v2 v2.7.1/go.mod h1:DlBnNivf+eArsEI1QtUx7fygo/JDbdMIcU9+i/Wid1U=
194+
go.elastic.co/apm/module/apmprometheus/v2 v2.7.1 h1:7N6ihtUgZD8Wpfy/ZG9wZaFlmP5jXuPu98dab1rL8y4=
195+
go.elastic.co/apm/module/apmprometheus/v2 v2.7.1/go.mod h1:wi/E2WnWK3tcKwaIhPijq7dmCo6H+pvx1R1G0yVzmkI=
196+
go.elastic.co/apm/module/apmzerolog/v2 v2.7.1 h1:C9+KrlqS8F4SZFu+ct0Jmv2YLmzDhWsI8htK6exd3vg=
197+
go.elastic.co/apm/module/apmzerolog/v2 v2.7.1/go.mod h1:wXViB7paxMUrERgZrmUb+0FCqgb13Dull1JOOd8Hcj0=
198+
go.elastic.co/apm/v2 v2.7.1 h1:OFjARuESjBsxw7wHrEAnfSVNCHGBATXSI/kPvBARY/A=
199+
go.elastic.co/apm/v2 v2.7.1/go.mod h1:tQhBAjwh93b2leuAdzGwta/sP7Yc7QoKTSjeIHHDuog=
200200
go.elastic.co/ecszap v1.0.3 h1:RQtagS3uSftE8mPZ3msqb6mVI67jgcDuy1PUqiMv8ow=
201201
go.elastic.co/ecszap v1.0.3/go.mod h1:fM1RLWDU25TB/L48RUJgz5Le2AnoCeY/g0zf2op8gDU=
202202
go.elastic.co/ecszerolog v0.2.0 h1:nbX4dQ08jb3+vsvACfmzAqGDoBh8F2HQDUgpqwAVTg0=
203203
go.elastic.co/ecszerolog v0.2.0/go.mod h1:wR5Mv0BVQJ17LopUX5Fd0LLKCC9iF++58iKY+lL09lc=
204-
go.elastic.co/fastjson v1.5.0 h1:XAQ7wrNObNnDiXC8qQKblkmLwh0vJjX3Z/jEj6/08SI=
205-
go.elastic.co/fastjson v1.5.0/go.mod h1:WtvH5wz8z9pDOPqNYSYKoLLv/9zCWZLeejHWuvdL/EM=
204+
go.elastic.co/fastjson v1.5.1 h1:zeh1xHrFH79aQ6Xsw7YxixvnOdAl3OSv0xch/jRDzko=
205+
go.elastic.co/fastjson v1.5.1/go.mod h1:WtvH5wz8z9pDOPqNYSYKoLLv/9zCWZLeejHWuvdL/EM=
206206
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
207207
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
208208
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.3 h1:jwFovJZkccySKCyy2oE9ZKvUry/a4gdQHF/MtZUQVtE=
158-
go.elastic.co/apm/module/apmhttp/v2 v2.6.3/go.mod h1:w94Gkk6uzI/K+eJYKDLB66tvWC5uK0fSHyWcyX2jPlQ=
159-
go.elastic.co/apm/v2 v2.6.3 h1:yVKFPLnmHOxpzLMGd3aexcik20ziXmRHqgcn9NZn/VU=
160-
go.elastic.co/apm/v2 v2.6.3/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.5.0 h1:XAQ7wrNObNnDiXC8qQKblkmLwh0vJjX3Z/jEj6/08SI=
164-
go.elastic.co/fastjson v1.5.0/go.mod h1:WtvH5wz8z9pDOPqNYSYKoLLv/9zCWZLeejHWuvdL/EM=
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)