Skip to content

Commit cfbc418

Browse files
elastic-renovate-prod[bot]barkbay
elastic-renovate-prod[bot]
and
barkbay
authored
fix(deps): update module go.elastic.co/apm/v2/* to v2.6.3 (#8440)
* fix(deps): update module go.elastic.co/apm/v2 to v2.6.3 * Update go.elastic.co/apm/* * make generate * tidy --------- Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> Co-authored-by: Michael Morello <[email protected]>
1 parent 6fc3e45 commit cfbc418

File tree

6 files changed

+156
-1272
lines changed

6 files changed

+156
-1272
lines changed

‎NOTICE.txt‎

Lines changed: 71 additions & 1160 deletions
Large diffs are not rendered by default.

‎docs/reference/dependencies.asciidoc‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ This page lists the third-party dependencies used to build {n}.
4545
| link:https://github.com/spf13/pflag[$$github.com/spf13/pflag$$] | v1.0.5 | BSD-3-Clause
4646
| link:https://github.com/spf13/viper[$$github.com/spf13/viper$$] | v1.19.0 | MIT
4747
| link:https://github.com/stretchr/testify[$$github.com/stretchr/testify$$] | v1.10.0 | MIT
48-
| link:https://go.elastic.co/apm/module/apmelasticsearch/v2[$$go.elastic.co/apm/module/apmelasticsearch/v2$$] | v2.6.2 | Apache-2.0
49-
| link:https://go.elastic.co/apm/module/apmhttp/v2[$$go.elastic.co/apm/module/apmhttp/v2$$] | v2.6.2 | Apache-2.0
50-
| link:https://go.elastic.co/apm/module/apmzap/v2[$$go.elastic.co/apm/module/apmzap/v2$$] | v2.6.2 | Apache-2.0
51-
| link:https://go.elastic.co/apm/v2[$$go.elastic.co/apm/v2$$] | v2.6.2 | Apache-2.0
48+
| link:https://go.elastic.co/apm/module/apmelasticsearch/v2[$$go.elastic.co/apm/module/apmelasticsearch/v2$$] | v2.6.3 | Apache-2.0
49+
| link:https://go.elastic.co/apm/module/apmhttp/v2[$$go.elastic.co/apm/module/apmhttp/v2$$] | v2.6.3 | Apache-2.0
50+
| link:https://go.elastic.co/apm/module/apmzap/v2[$$go.elastic.co/apm/module/apmzap/v2$$] | v2.6.3 | Apache-2.0
51+
| link:https://go.elastic.co/apm/v2[$$go.elastic.co/apm/v2$$] | v2.6.3 | Apache-2.0
5252
| link:https://go.uber.org/automaxprocs[$$go.uber.org/automaxprocs$$] | v1.6.0 | MIT
5353
| link:https://go.uber.org/zap[$$go.uber.org/zap$$] | v1.27.0 | MIT
54-
| link:https://golang.org/x/crypto[$$golang.org/x/crypto$$] | v0.32.0 | BSD-3-Clause
54+
| link:https://golang.org/x/crypto[$$golang.org/x/crypto$$] | v0.33.0 | BSD-3-Clause
5555
| link:https://golang.org/x/exp[$$golang.org/x/exp$$] | v0.0.0-20240808152545-0cdaa3abc0fa | BSD-3-Clause
5656
| link:https://gopkg.in/yaml.v3[$$gopkg.in/yaml.v3$$] | v3.0.1 | MIT
5757
| link:https://github.com/kubernetes/api[$$k8s.io/api$$] | v0.32.1 | Apache-2.0
@@ -75,7 +75,6 @@ This page lists the third-party dependencies used to build {n}.
7575
| link:https://cel.dev/expr[$$cel.dev/expr$$] | v0.18.0 | Apache-2.0
7676
| link:https://github.com/Masterminds/goutils[$$github.com/Masterminds/goutils$$] | v1.1.1 | Apache-2.0
7777
| link:https://github.com/Masterminds/semver[$$github.com/Masterminds/semver/v3$$] | v3.3.0 | MIT
78-
| link:https://github.com/Microsoft/go-winio[$$github.com/Microsoft/go-winio$$] | v0.6.1 | MIT
7978
| link:https://github.com/antlr4-go/antlr[$$github.com/antlr4-go/antlr/v4$$] | v4.13.0 | BSD-3-Clause
8079
| link:https://github.com/armon/go-radix[$$github.com/armon/go-radix$$] | v1.0.0 | MIT
8180
| link:https://github.com/armon/go-socks5[$$github.com/armon/go-socks5$$] | v0.0.0-20160902184237-e75332964ef5 | MIT
@@ -84,15 +83,11 @@ This page lists the third-party dependencies used to build {n}.
8483
| link:https://github.com/cenkalti/backoff[$$github.com/cenkalti/backoff/v4$$] | v4.3.0 | MIT
8584
| link:https://github.com/cespare/xxhash[$$github.com/cespare/xxhash/v2$$] | v2.3.0 | MIT
8685
| link:https://github.com/containerd/stargz-snapshotter[$$github.com/containerd/stargz-snapshotter/estargz$$] | v0.14.3 | Apache-2.0
87-
| link:https://github.com/distribution/reference[$$github.com/distribution/reference$$] | v0.6.0 | Apache-2.0
8886
| link:https://github.com/docker/cli[$$github.com/docker/cli$$] | v27.1.1+incompatible | Apache-2.0
8987
| link:https://github.com/docker/distribution[$$github.com/docker/distribution$$] | v2.8.2+incompatible | Apache-2.0
90-
| link:https://github.com/docker/docker[$$github.com/docker/docker$$] | v26.1.5+incompatible | Apache-2.0
9188
| link:https://github.com/docker/docker-credential-helpers[$$github.com/docker/docker-credential-helpers$$] | v0.7.0 | MIT
92-
| link:https://github.com/docker/go-connections[$$github.com/docker/go-connections$$] | v0.4.0 | Apache-2.0
93-
| link:https://github.com/docker/go-units[$$github.com/docker/go-units$$] | v0.5.0 | Apache-2.0
94-
| link:https://github.com/elastic/go-sysinfo[$$github.com/elastic/go-sysinfo$$] | v1.13.1 | Apache-2.0
95-
| link:https://github.com/elastic/go-windows[$$github.com/elastic/go-windows$$] | v1.0.1 | Apache-2.0
89+
| link:https://github.com/elastic/go-sysinfo[$$github.com/elastic/go-sysinfo$$] | v1.15.1 | Apache-2.0
90+
| link:https://github.com/elastic/go-windows[$$github.com/elastic/go-windows$$] | v1.0.2 | Apache-2.0
9691
| link:https://github.com/emicklei/go-restful[$$github.com/emicklei/go-restful/v3$$] | v3.12.1 | MIT
9792
| link:https://github.com/evanphx/json-patch[$$github.com/evanphx/json-patch$$] | v5.6.0+incompatible | BSD-3-Clause
9893
| link:https://github.com/evanphx/json-patch[$$github.com/evanphx/json-patch/v5$$] | v5.9.0 | BSD-3-Clause
@@ -131,7 +126,6 @@ This page lists the third-party dependencies used to build {n}.
131126
| link:https://github.com/hashicorp/hcl[$$github.com/hashicorp/hcl$$] | v1.0.0 | MPL-2.0
132127
| link:https://github.com/huandu/xstrings[$$github.com/huandu/xstrings$$] | v1.5.0 | MIT
133128
| link:https://github.com/inconshreveable/mousetrap[$$github.com/inconshreveable/mousetrap$$] | v1.1.0 | Apache-2.0
134-
| link:https://github.com/joeshaw/multierror[$$github.com/joeshaw/multierror$$] | v0.0.0-20140124173710-69b34d4ec901 | MIT
135129
| link:https://github.com/josharian/intern[$$github.com/josharian/intern$$] | v1.0.0 | MIT
136130
| link:https://github.com/json-iterator/go[$$github.com/json-iterator/go$$] | v1.1.12 | MIT
137131
| link:https://github.com/klauspost/compress[$$github.com/klauspost/compress$$] | v1.17.9 | Apache-2.0
@@ -146,7 +140,6 @@ This page lists the third-party dependencies used to build {n}.
146140
| link:https://github.com/mitchellh/go-homedir[$$github.com/mitchellh/go-homedir$$] | v1.1.0 | MIT
147141
| link:https://github.com/mitchellh/mapstructure[$$github.com/mitchellh/mapstructure$$] | v1.5.0 | MIT
148142
| link:https://github.com/mitchellh/reflectwalk[$$github.com/mitchellh/reflectwalk$$] | v1.0.2 | MIT
149-
| link:https://github.com/moby/docker-image-spec[$$github.com/moby/docker-image-spec$$] | v1.3.1 | Apache-2.0
150143
| link:https://github.com/moby/spdystream[$$github.com/moby/spdystream$$] | v0.5.0 | Apache-2.0
151144
| link:https://github.com/modern-go/concurrent[$$github.com/modern-go/concurrent$$] | v0.0.0-20180306012644-bacd9c7ef1dd | Apache-2.0
152145
| link:https://github.com/modern-go/reflect2[$$github.com/modern-go/reflect2$$] | v1.0.2 | Apache-2.0
@@ -179,7 +172,7 @@ This page lists the third-party dependencies used to build {n}.
179172
| link:https://github.com/tidwall/sjson[$$github.com/tidwall/sjson$$] | v1.2.5 | MIT
180173
| link:https://github.com/vbatts/tar-split[$$github.com/vbatts/tar-split$$] | v0.11.3 | BSD-3-Clause
181174
| link:https://github.com/x448/float16[$$github.com/x448/float16$$] | v0.8.4 | MIT
182-
| link:https://go.elastic.co/fastjson[$$go.elastic.co/fastjson$$] | v1.3.0 | MIT
175+
| link:https://go.elastic.co/fastjson[$$go.elastic.co/fastjson$$] | v1.5.0 | MIT
183176
| link:https://go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp[$$go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp$$] | v0.53.0 | Apache-2.0
184177
| link:https://go.opentelemetry.io/otel[$$go.opentelemetry.io/otel$$] | v1.28.0 | Apache-2.0
185178
| link:https://go.opentelemetry.io/otel/exporters/otlp/otlptrace[$$go.opentelemetry.io/otel/exporters/otlp/otlptrace$$] | v1.28.0 | Apache-2.0
@@ -190,15 +183,15 @@ This page lists the third-party dependencies used to build {n}.
190183
| link:https://go.opentelemetry.io/proto/otlp[$$go.opentelemetry.io/proto/otlp$$] | v1.3.1 | Apache-2.0
191184
| link:https://go.uber.org/goleak[$$go.uber.org/goleak$$] | v1.3.0 | MIT
192185
| link:https://go.uber.org/multierr[$$go.uber.org/multierr$$] | v1.11.0 | MIT
193-
| link:https://golang.org/x/mod[$$golang.org/x/mod$$] | v0.22.0 | BSD-3-Clause
194-
| link:https://golang.org/x/net[$$golang.org/x/net$$] | v0.34.0 | BSD-3-Clause
186+
| link:https://golang.org/x/mod[$$golang.org/x/mod$$] | v0.23.0 | BSD-3-Clause
187+
| link:https://golang.org/x/net[$$golang.org/x/net$$] | v0.35.0 | BSD-3-Clause
195188
| link:https://golang.org/x/oauth2[$$golang.org/x/oauth2$$] | v0.24.0 | BSD-3-Clause
196-
| link:https://golang.org/x/sync[$$golang.org/x/sync$$] | v0.10.0 | BSD-3-Clause
197-
| link:https://golang.org/x/sys[$$golang.org/x/sys$$] | v0.29.0 | BSD-3-Clause
198-
| link:https://golang.org/x/term[$$golang.org/x/term$$] | v0.28.0 | BSD-3-Clause
199-
| link:https://golang.org/x/text[$$golang.org/x/text$$] | v0.21.0 | BSD-3-Clause
189+
| link:https://golang.org/x/sync[$$golang.org/x/sync$$] | v0.11.0 | BSD-3-Clause
190+
| link:https://golang.org/x/sys[$$golang.org/x/sys$$] | v0.30.0 | BSD-3-Clause
191+
| link:https://golang.org/x/term[$$golang.org/x/term$$] | v0.29.0 | BSD-3-Clause
192+
| link:https://golang.org/x/text[$$golang.org/x/text$$] | v0.22.0 | BSD-3-Clause
200193
| link:https://golang.org/x/time[$$golang.org/x/time$$] | v0.7.0 | BSD-3-Clause
201-
| link:https://golang.org/x/tools[$$golang.org/x/tools$$] | v0.29.0 | BSD-3-Clause
194+
| link:https://golang.org/x/tools[$$golang.org/x/tools$$] | v0.30.0 | BSD-3-Clause
202195
| link:https://gomodules.xyz/jsonpatch/v2[$$gomodules.xyz/jsonpatch/v2$$] | v2.4.0 | Apache-2.0
203196
| link:https://google.golang.org/genproto/googleapis/api[$$google.golang.org/genproto/googleapis/api$$] | v0.0.0-20240826202546-f6391c0de4c7 | Apache-2.0
204197
| link:https://google.golang.org/genproto/googleapis/rpc[$$google.golang.org/genproto/googleapis/rpc$$] | v0.0.0-20240826202546-f6391c0de4c7 | Apache-2.0
@@ -210,7 +203,7 @@ This page lists the third-party dependencies used to build {n}.
210203
| link:https://gopkg.in/ini.v1[$$gopkg.in/ini.v1$$] | v1.67.0 | Apache-2.0
211204
| link:https://gopkg.in/tomb.v1[$$gopkg.in/tomb.v1$$] | v1.0.0-20141024135613-dd632973f1e7 | BSD-3-Clause
212205
| link:https://gopkg.in/yaml.v2[$$gopkg.in/yaml.v2$$] | v2.4.0 | Apache-2.0
213-
| link:https://gotest.tools/v3[$$gotest.tools/v3$$] | v3.4.0 | Apache-2.0
206+
| link:https://gotest.tools/v3[$$gotest.tools/v3$$] | v3.0.3 | Apache-2.0
214207
| link:https://gitlab.howett.net/go/plist[$$howett.net/plist$$] | v1.0.1 | BSD-2-Clause
215208
| link:https://github.com/kubernetes/apiextensions-apiserver[$$k8s.io/apiextensions-apiserver$$] | v0.32.0 | Apache-2.0
216209
| link:https://github.com/kubernetes/apiserver[$$k8s.io/apiserver$$] | v0.32.0 | Apache-2.0

‎go.mod‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ require (
2929
github.com/spf13/pflag v1.0.5
3030
github.com/spf13/viper v1.19.0
3131
github.com/stretchr/testify v1.10.0
32-
go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.2
33-
go.elastic.co/apm/module/apmhttp/v2 v2.6.2
34-
go.elastic.co/apm/module/apmzap/v2 v2.6.2
35-
go.elastic.co/apm/v2 v2.6.2
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/apmzap/v2 v2.6.3
35+
go.elastic.co/apm/v2 v2.6.3
3636
go.uber.org/automaxprocs v1.6.0
3737
go.uber.org/zap v1.27.0
38-
golang.org/x/crypto v0.32.0
38+
golang.org/x/crypto v0.33.0
3939
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa
4040
gopkg.in/yaml.v3 v3.0.1
4141
k8s.io/api v0.32.1
@@ -58,13 +58,11 @@ require (
5858
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5959
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6060
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
61-
github.com/distribution/reference v0.6.0 // indirect
6261
github.com/docker/cli v27.1.1+incompatible // indirect
6362
github.com/docker/distribution v2.8.2+incompatible // indirect
64-
github.com/docker/docker v26.1.5+incompatible // indirect
6563
github.com/docker/docker-credential-helpers v0.7.0 // indirect
66-
github.com/elastic/go-sysinfo v1.13.1 // indirect
67-
github.com/elastic/go-windows v1.0.1 // indirect
64+
github.com/elastic/go-sysinfo v1.15.1 // indirect
65+
github.com/elastic/go-windows v1.0.2 // indirect
6866
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
6967
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
7068
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
@@ -99,7 +97,6 @@ require (
9997
github.com/hashicorp/hcl v1.0.0 // indirect
10098
github.com/huandu/xstrings v1.5.0 // indirect
10199
github.com/inconshreveable/mousetrap v1.1.0 // indirect
102-
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
103100
github.com/josharian/intern v1.0.0 // indirect
104101
github.com/json-iterator/go v1.1.12 // indirect
105102
github.com/klauspost/compress v1.17.9 // indirect
@@ -113,7 +110,6 @@ require (
113110
github.com/mitchellh/go-homedir v1.1.0 // indirect
114111
github.com/mitchellh/mapstructure v1.5.0 // indirect
115112
github.com/mitchellh/reflectwalk v1.0.2 // indirect
116-
github.com/moby/docker-image-spec v1.3.1 // indirect
117113
github.com/moby/spdystream v0.5.0 // indirect
118114
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
119115
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -141,7 +137,7 @@ require (
141137
github.com/tidwall/sjson v1.2.5 // indirect
142138
github.com/vbatts/tar-split v0.11.3 // indirect
143139
github.com/x448/float16 v0.8.4 // indirect
144-
go.elastic.co/fastjson v1.3.0 // indirect
140+
go.elastic.co/fastjson v1.5.0 // indirect
145141
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
146142
go.opentelemetry.io/otel v1.28.0 // indirect
147143
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
@@ -151,15 +147,15 @@ require (
151147
go.opentelemetry.io/otel/trace v1.28.0 // indirect
152148
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
153149
go.uber.org/multierr v1.11.0 // indirect
154-
golang.org/x/mod v0.22.0 // indirect
155-
golang.org/x/net v0.34.0 // indirect
150+
golang.org/x/mod v0.23.0 // indirect
151+
golang.org/x/net v0.35.0 // indirect
156152
golang.org/x/oauth2 v0.24.0 // indirect
157-
golang.org/x/sync v0.10.0 // indirect
158-
golang.org/x/sys v0.29.0 // indirect
159-
golang.org/x/term v0.28.0 // indirect
160-
golang.org/x/text v0.21.0 // indirect
153+
golang.org/x/sync v0.11.0 // indirect
154+
golang.org/x/sys v0.30.0 // indirect
155+
golang.org/x/term v0.29.0 // indirect
156+
golang.org/x/text v0.22.0 // indirect
161157
golang.org/x/time v0.7.0 // indirect
162-
golang.org/x/tools v0.29.0 // indirect
158+
golang.org/x/tools v0.30.0 // indirect
163159
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
164160
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
165161
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect

0 commit comments

Comments
 (0)