Skip to content

Commit 4168ca4

Browse files
lahsivjarlahsivjar
authored
Merge branch 'main' into main
2 parents 0dcf62c + 1ea24d2 commit 4168ca4

File tree

3 files changed

+30
-30
lines changed

3 files changed

+30
-30
lines changed

‎NOTICE.txt

+12-12
Original file line numberDiff line numberDiff line change
@@ -455,11 +455,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].
455455

456456
--------------------------------------------------------------------------------
457457
Dependency : github.com/elastic/beats/v7
458-
Version: v7.0.0-alpha2.0.20250202231532-0e76511316f5
458+
Version: v7.0.0-alpha2.0.20250204065012-71900c4d89fa
459459
Licence type (autodetected): Elastic
460460
--------------------------------------------------------------------------------
461461

462-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250202231532-0e76511316f5/LICENSE.txt:
462+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250204065012-71900c4d89fa/LICENSE.txt:
463463

464464
Source code in this repository is variously licensed under the Apache License
465465
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
@@ -4415,11 +4415,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
44154415

44164416
--------------------------------------------------------------------------------
44174417
Dependency : go.opentelemetry.io/collector/pdata
4418-
Version: v1.24.0
4418+
Version: v1.25.0
44194419
Licence type (autodetected): Apache-2.0
44204420
--------------------------------------------------------------------------------
44214421

4422-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.24.0/LICENSE:
4422+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.25.0/LICENSE:
44234423

44244424

44254425
Apache License
@@ -5383,11 +5383,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
53835383

53845384
--------------------------------------------------------------------------------
53855385
Dependency : golang.org/x/sync
5386-
Version: v0.10.0
5386+
Version: v0.11.0
53875387
Licence type (autodetected): BSD-3-Clause
53885388
--------------------------------------------------------------------------------
53895389

5390-
Contents of probable licence file $GOMODCACHE/golang.org/x/sync@v0.10.0/LICENSE:
5390+
Contents of probable licence file $GOMODCACHE/golang.org/x/sync@v0.11.0/LICENSE:
53915391

53925392
Copyright 2009 The Go Authors.
53935393

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

54215421
--------------------------------------------------------------------------------
54225422
Dependency : golang.org/x/term
5423-
Version: v0.28.0
5423+
Version: v0.29.0
54245424
Licence type (autodetected): BSD-3-Clause
54255425
--------------------------------------------------------------------------------
54265426

5427-
Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.28.0/LICENSE:
5427+
Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.29.0/LICENSE:
54285428

54295429
Copyright 2009 The Go Authors.
54305430

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

54585458
--------------------------------------------------------------------------------
54595459
Dependency : golang.org/x/time
5460-
Version: v0.9.0
5460+
Version: v0.10.0
54615461
Licence type (autodetected): BSD-3-Clause
54625462
--------------------------------------------------------------------------------
54635463

5464-
Contents of probable licence file $GOMODCACHE/golang.org/x/time@v0.9.0/LICENSE:
5464+
Contents of probable licence file $GOMODCACHE/golang.org/x/time@v0.10.0/LICENSE:
54655465

54665466
Copyright 2009 The Go Authors.
54675467

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

1704717047
--------------------------------------------------------------------------------
1704817048
Dependency : golang.org/x/sys
17049-
Version: v0.29.0
17049+
Version: v0.30.0
1705017050
Licence type (autodetected): BSD-3-Clause
1705117051
--------------------------------------------------------------------------------
1705217052

17053-
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.29.0/LICENSE:
17053+
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.30.0/LICENSE:
1705417054

1705517055
Copyright 2009 The Go Authors.
1705617056

‎go.mod

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/dustin/go-humanize v1.0.1
1010
github.com/elastic/apm-aggregation v1.2.0
1111
github.com/elastic/apm-data v1.16.0
12-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250202231532-0e76511316f5
12+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250204065012-71900c4d89fa
1313
github.com/elastic/elastic-agent-client/v7 v7.17.0
1414
github.com/elastic/elastic-agent-libs v0.18.4
1515
github.com/elastic/elastic-agent-system-metrics v0.11.7
@@ -39,17 +39,17 @@ require (
3939
go.elastic.co/apm/module/apmotel/v2 v2.6.3
4040
go.elastic.co/apm/v2 v2.6.3
4141
go.elastic.co/fastjson v1.4.0
42-
go.opentelemetry.io/collector/pdata v1.24.0
42+
go.opentelemetry.io/collector/pdata v1.25.0
4343
go.opentelemetry.io/otel v1.34.0
4444
go.opentelemetry.io/otel/metric v1.34.0
4545
go.opentelemetry.io/otel/sdk/metric v1.34.0
4646
go.uber.org/automaxprocs v1.6.0
4747
go.uber.org/zap v1.27.0
4848
go.uber.org/zap/exp v0.3.0
4949
golang.org/x/net v0.34.0
50-
golang.org/x/sync v0.10.0
51-
golang.org/x/term v0.28.0
52-
golang.org/x/time v0.9.0
50+
golang.org/x/sync v0.11.0
51+
golang.org/x/term v0.29.0
52+
golang.org/x/time v0.10.0
5353
google.golang.org/grpc v1.70.0
5454
google.golang.org/protobuf v1.36.4
5555
gopkg.in/yaml.v3 v3.0.1
@@ -148,7 +148,7 @@ require (
148148
go.uber.org/multierr v1.11.0 // indirect
149149
golang.org/x/crypto v0.32.0 // indirect
150150
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
151-
golang.org/x/sys v0.29.0 // indirect
151+
golang.org/x/sys v0.30.0 // indirect
152152
golang.org/x/text v0.21.0 // indirect
153153
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
154154
gopkg.in/yaml.v2 v2.4.0 // indirect

‎go.sum

+12-12
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ github.com/elastic/apm-aggregation v1.2.0 h1:UndqG3ccBTjyxTqHujBVjcbVLb9qG1clxRc
119119
github.com/elastic/apm-aggregation v1.2.0/go.mod h1:YllYwPYVV27pbuPfjRtQAKo6eSSrh13PZr38RKYd810=
120120
github.com/elastic/apm-data v1.16.0 h1:LkJFoNkadIyqXNo3EMm98J38j9HWDMWUe6F74GaXtJ4=
121121
github.com/elastic/apm-data v1.16.0/go.mod h1:ST2P1yshhN2U3IbBYyn+Ni3VOFTifavNzMfh7E9zLHY=
122-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250202231532-0e76511316f5 h1:Oe0lzGZyfJ206hFRbJ/crIWUSYBpjt0XUK2o4EXMV14=
123-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250202231532-0e76511316f5/go.mod h1:84zbls1RDKu/SHmRykLUkpaF0ZVme7P+TCDV6mZ7sKw=
122+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250204065012-71900c4d89fa h1:F4n2bcRHaJM7eWHyYpuR0RIBTdT7tWdRbbI1d9XWHV0=
123+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250204065012-71900c4d89fa/go.mod h1:A3OQ9JLS2gNVO2MayjAqFDhqwCj3NN1GnVjramGhj+s=
124124
github.com/elastic/elastic-agent-autodiscover v0.9.0 h1:+iWIKh0u3e8I+CJa3FfWe9h0JojNasPgYIA47gpuuns=
125125
github.com/elastic/elastic-agent-autodiscover v0.9.0/go.mod h1:5iUxLHhVdaGSWYTveSwfJEY4RqPXTG13LPiFoxcpFd4=
126126
github.com/elastic/elastic-agent-client/v7 v7.17.0 h1:TPLrEHF4kJ3RkmQzZPffrniY4WeW4vriHZbOAzM1hFo=
@@ -422,8 +422,8 @@ go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJyS
422422
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
423423
go.opentelemetry.io/collector/consumer v1.22.0 h1:QmfnNizyNZFt0uK3GG/EoT5h6PvZJ0dgVTc5hFEc1l0=
424424
go.opentelemetry.io/collector/consumer v1.22.0/go.mod h1:tiz2khNceFAPokxxfzAuFfIpShBasMT2AL2Sbc7+m0I=
425-
go.opentelemetry.io/collector/pdata v1.24.0 h1:D6j92eAzmAbQgivNBUnt8r9juOl8ugb+ihYynoFZIEg=
426-
go.opentelemetry.io/collector/pdata v1.24.0/go.mod h1:cf3/W9E/uIvPS4MR26SnMFJhraUCattzzM6qusuONuc=
425+
go.opentelemetry.io/collector/pdata v1.25.0 h1:AmgBklQfbfy0lT8qsoJtRuYMZ7ZV3VZvkvhjSDentrg=
426+
go.opentelemetry.io/collector/pdata v1.25.0/go.mod h1:Zs7D4RXOGS7E2faGc/jfWdbmhoiHBxA7QbpuJOioxq8=
427427
go.opentelemetry.io/collector/semconv v0.116.0 h1:63xCZomsKJAWmKGWD3lnORiE3WKW6AO4LjnzcHzGx3Y=
428428
go.opentelemetry.io/collector/semconv v0.116.0/go.mod h1:N6XE8Q0JKgBN2fAhkUQtqK9LT7rEGR6+Wu/Rtbal1iI=
429429
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 h1:UP6IpuHFkUgOQL9FFQFrZ+5LiwhhYRbi7VZSIx6Nj5s=
@@ -505,8 +505,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
505505
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
506506
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
507507
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
508-
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
509-
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
508+
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
509+
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
510510
golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
511511
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
512512
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -528,16 +528,16 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
528528
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
529529
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
530530
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
531-
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
532-
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
531+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
532+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
533533
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
534534
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
535535
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
536536
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
537537
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
538538
golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
539-
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
540-
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
539+
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
540+
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
541541
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
542542
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
543543
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -547,8 +547,8 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
547547
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
548548
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
549549
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
550-
golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
551-
golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
550+
golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
551+
golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
552552
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
553553
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
554554
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=

0 commit comments

Comments
 (0)