Skip to content

Commit 042491d

Browse files
kruskallkruskall
authored
feat: bump beats and replace global loggers (#16717)
* feat: bump beats and replace global loggers bump beats fix compile errors propagare logger and remove global loggers use logptest in tests * Update go.mod * lint: update logger to use correct methods * lint: fix linter issues * lint: bump elastic-agent-libs to 0.19.3 * fix: resolve a few goroutine leaks in tests * lint: fix compile errors * lint: log debug before starting body caching goroutine * test: resolve TestInvalidation goroutine leak * feat: bump beats
1 parent bac9fec commit 042491d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+375
-403
lines changed

‎NOTICE-fips.txt

Lines changed: 16 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -455,11 +455,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.18.
455455

456456
--------------------------------------------------------------------------------
457457
Dependency : github.com/elastic/beats/v7
458-
Version: v7.0.0-alpha2.0.20250325090137-0c4e2d0af92c
458+
Version: v7.0.0-alpha2.0.20250502132831-ef4bf7d20f61
459459
Licence type (autodetected): Elastic
460460
--------------------------------------------------------------------------------
461461

462-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250325090137-0c4e2d0af92c/LICENSE.txt:
462+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250502132831-ef4bf7d20f61/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
@@ -7584,11 +7584,11 @@ SOFTWARE.
75847584

75857585
--------------------------------------------------------------------------------
75867586
Dependency : github.com/ebitengine/purego
7587-
Version: v0.8.1
7587+
Version: v0.8.2
75887588
Licence type (autodetected): Apache-2.0
75897589
--------------------------------------------------------------------------------
75907590

7591-
Contents of probable licence file $GOMODCACHE/github.com/ebitengine/purego@v0.8.1/LICENSE:
7591+
Contents of probable licence file $GOMODCACHE/github.com/ebitengine/purego@v0.8.2/LICENSE:
75927592

75937593
Apache License
75947594
Version 2.0, January 2004
@@ -10631,37 +10631,6 @@ Contents of probable licence file $GOMODCACHE/github.com/inconshreveable/mousetr
1063110631
limitations under the License.
1063210632

1063310633

10634-
--------------------------------------------------------------------------------
10635-
Dependency : github.com/joeshaw/multierror
10636-
Version: v0.0.0-20140124173710-69b34d4ec901
10637-
Licence type (autodetected): MIT
10638-
--------------------------------------------------------------------------------
10639-
10640-
Contents of probable licence file $GOMODCACHE/github.com/joeshaw/multierror@v0.0.0-20140124173710-69b34d4ec901/LICENSE:
10641-
10642-
The MIT License (MIT)
10643-
10644-
Copyright (c) 2014 Joe Shaw
10645-
10646-
Permission is hereby granted, free of charge, to any person obtaining a copy
10647-
of this software and associated documentation files (the "Software"), to deal
10648-
in the Software without restriction, including without limitation the rights
10649-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10650-
copies of the Software, and to permit persons to whom the Software is
10651-
furnished to do so, subject to the following conditions:
10652-
10653-
The above copyright notice and this permission notice shall be included in
10654-
all copies or substantial portions of the Software.
10655-
10656-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
10657-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
10658-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
10659-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
10660-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
10661-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
10662-
THE SOFTWARE.
10663-
10664-
1066510634
--------------------------------------------------------------------------------
1066610635
Dependency : github.com/json-iterator/go
1066710636
Version: v1.1.12
@@ -11683,11 +11652,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1168311652

1168411653
--------------------------------------------------------------------------------
1168511654
Dependency : github.com/pierrec/lz4/v4
11686-
Version: v4.1.21
11655+
Version: v4.1.22
1168711656
Licence type (autodetected): BSD-3-Clause
1168811657
--------------------------------------------------------------------------------
1168911658

11690-
Contents of probable licence file $GOMODCACHE/github.com/pierrec/lz4/v4@v4.1.21/LICENSE:
11659+
Contents of probable licence file $GOMODCACHE/github.com/pierrec/lz4/v4@v4.1.22/LICENSE:
1169111660

1169211661
Copyright (c) 2015, Pierre Curto
1169311662
All rights reserved.
@@ -12182,11 +12151,11 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_model
1218212151

1218312152
--------------------------------------------------------------------------------
1218412153
Dependency : github.com/prometheus/common
12185-
Version: v0.60.1
12154+
Version: v0.62.0
1218612155
Licence type (autodetected): Apache-2.0
1218712156
--------------------------------------------------------------------------------
1218812157

12189-
Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.60.1/LICENSE:
12158+
Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.62.0/LICENSE:
1219012159

1219112160
Apache License
1219212161
Version 2.0, January 2004
@@ -12680,11 +12649,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1268012649

1268112650
--------------------------------------------------------------------------------
1268212651
Dependency : github.com/shirou/gopsutil/v4
12683-
Version: v4.24.10
12652+
Version: v4.25.1
1268412653
Licence type (autodetected): BSD-3-Clause
1268512654
--------------------------------------------------------------------------------
1268612655

12687-
Contents of probable licence file $GOMODCACHE/github.com/shirou/gopsutil/v4@v4.24.10/LICENSE:
12656+
Contents of probable licence file $GOMODCACHE/github.com/shirou/gopsutil/v4@v4.25.1/LICENSE:
1268812657

1268912658
gopsutil is distributed under BSD license reproduced below.
1269012659

@@ -12789,11 +12758,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1278912758

1279012759
--------------------------------------------------------------------------------
1279112760
Dependency : github.com/tklauser/numcpus
12792-
Version: v0.6.1
12761+
Version: v0.8.0
1279312762
Licence type (autodetected): Apache-2.0
1279412763
--------------------------------------------------------------------------------
1279512764

12796-
Contents of probable licence file $GOMODCACHE/github.com/tklauser/numcpus@v0.6.1/LICENSE:
12765+
Contents of probable licence file $GOMODCACHE/github.com/tklauser/numcpus@v0.8.0/LICENSE:
1279712766

1279812767

1279912768
Apache License
@@ -13664,11 +13633,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/auto/sdk@v1.1.
1366413633

1366513634
--------------------------------------------------------------------------------
1366613635
Dependency : go.opentelemetry.io/collector/consumer
13667-
Version: v1.22.0
13636+
Version: v1.28.0
1366813637
Licence type (autodetected): Apache-2.0
1366913638
--------------------------------------------------------------------------------
1367013639

13671-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v1.22.0/LICENSE:
13640+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v1.28.0/LICENSE:
1367213641

1367313642

1367413643
Apache License
@@ -13876,11 +13845,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/cons
1387613845

1387713846
--------------------------------------------------------------------------------
1387813847
Dependency : go.opentelemetry.io/collector/semconv
13879-
Version: v0.119.0
13848+
Version: v0.121.0
1388013849
Licence type (autodetected): Apache-2.0
1388113850
--------------------------------------------------------------------------------
1388213851

13883-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.119.0/LICENSE:
13852+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.121.0/LICENSE:
1388413853

1388513854

1388613855
Apache License

‎NOTICE.txt

Lines changed: 16 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -455,11 +455,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.18.
455455

456456
--------------------------------------------------------------------------------
457457
Dependency : github.com/elastic/beats/v7
458-
Version: v7.0.0-alpha2.0.20250325090137-0c4e2d0af92c
458+
Version: v7.0.0-alpha2.0.20250502132831-ef4bf7d20f61
459459
Licence type (autodetected): Elastic
460460
--------------------------------------------------------------------------------
461461

462-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250325090137-0c4e2d0af92c/LICENSE.txt:
462+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250502132831-ef4bf7d20f61/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
@@ -7584,11 +7584,11 @@ SOFTWARE.
75847584

75857585
--------------------------------------------------------------------------------
75867586
Dependency : github.com/ebitengine/purego
7587-
Version: v0.8.1
7587+
Version: v0.8.2
75887588
Licence type (autodetected): Apache-2.0
75897589
--------------------------------------------------------------------------------
75907590

7591-
Contents of probable licence file $GOMODCACHE/github.com/ebitengine/purego@v0.8.1/LICENSE:
7591+
Contents of probable licence file $GOMODCACHE/github.com/ebitengine/purego@v0.8.2/LICENSE:
75927592

75937593
Apache License
75947594
Version 2.0, January 2004
@@ -12128,37 +12128,6 @@ Contents of probable licence file $GOMODCACHE/github.com/jcmturner/rpc/v2@v2.0.3
1212812128
limitations under the License.
1212912129

1213012130

12131-
--------------------------------------------------------------------------------
12132-
Dependency : github.com/joeshaw/multierror
12133-
Version: v0.0.0-20140124173710-69b34d4ec901
12134-
Licence type (autodetected): MIT
12135-
--------------------------------------------------------------------------------
12136-
12137-
Contents of probable licence file $GOMODCACHE/github.com/joeshaw/multierror@v0.0.0-20140124173710-69b34d4ec901/LICENSE:
12138-
12139-
The MIT License (MIT)
12140-
12141-
Copyright (c) 2014 Joe Shaw
12142-
12143-
Permission is hereby granted, free of charge, to any person obtaining a copy
12144-
of this software and associated documentation files (the "Software"), to deal
12145-
in the Software without restriction, including without limitation the rights
12146-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12147-
copies of the Software, and to permit persons to whom the Software is
12148-
furnished to do so, subject to the following conditions:
12149-
12150-
The above copyright notice and this permission notice shall be included in
12151-
all copies or substantial portions of the Software.
12152-
12153-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
12154-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
12155-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
12156-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
12157-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
12158-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
12159-
THE SOFTWARE.
12160-
12161-
1216212131
--------------------------------------------------------------------------------
1216312132
Dependency : github.com/json-iterator/go
1216412133
Version: v1.1.12
@@ -13180,11 +13149,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1318013149

1318113150
--------------------------------------------------------------------------------
1318213151
Dependency : github.com/pierrec/lz4/v4
13183-
Version: v4.1.21
13152+
Version: v4.1.22
1318413153
Licence type (autodetected): BSD-3-Clause
1318513154
--------------------------------------------------------------------------------
1318613155

13187-
Contents of probable licence file $GOMODCACHE/github.com/pierrec/lz4/v4@v4.1.21/LICENSE:
13156+
Contents of probable licence file $GOMODCACHE/github.com/pierrec/lz4/v4@v4.1.22/LICENSE:
1318813157

1318913158
Copyright (c) 2015, Pierre Curto
1319013159
All rights reserved.
@@ -13679,11 +13648,11 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_model
1367913648

1368013649
--------------------------------------------------------------------------------
1368113650
Dependency : github.com/prometheus/common
13682-
Version: v0.60.1
13651+
Version: v0.62.0
1368313652
Licence type (autodetected): Apache-2.0
1368413653
--------------------------------------------------------------------------------
1368513654

13686-
Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.60.1/LICENSE:
13655+
Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.62.0/LICENSE:
1368713656

1368813657
Apache License
1368913658
Version 2.0, January 2004
@@ -14177,11 +14146,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1417714146

1417814147
--------------------------------------------------------------------------------
1417914148
Dependency : github.com/shirou/gopsutil/v4
14180-
Version: v4.24.10
14149+
Version: v4.25.1
1418114150
Licence type (autodetected): BSD-3-Clause
1418214151
--------------------------------------------------------------------------------
1418314152

14184-
Contents of probable licence file $GOMODCACHE/github.com/shirou/gopsutil/v4@v4.24.10/LICENSE:
14153+
Contents of probable licence file $GOMODCACHE/github.com/shirou/gopsutil/v4@v4.25.1/LICENSE:
1418514154

1418614155
gopsutil is distributed under BSD license reproduced below.
1418714156

@@ -14286,11 +14255,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1428614255

1428714256
--------------------------------------------------------------------------------
1428814257
Dependency : github.com/tklauser/numcpus
14289-
Version: v0.6.1
14258+
Version: v0.8.0
1429014259
Licence type (autodetected): Apache-2.0
1429114260
--------------------------------------------------------------------------------
1429214261

14293-
Contents of probable licence file $GOMODCACHE/github.com/tklauser/numcpus@v0.6.1/LICENSE:
14262+
Contents of probable licence file $GOMODCACHE/github.com/tklauser/numcpus@v0.8.0/LICENSE:
1429414263

1429514264

1429614265
Apache License
@@ -15716,11 +15685,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/auto/sdk@v1.1.
1571615685

1571715686
--------------------------------------------------------------------------------
1571815687
Dependency : go.opentelemetry.io/collector/consumer
15719-
Version: v1.22.0
15688+
Version: v1.28.0
1572015689
Licence type (autodetected): Apache-2.0
1572115690
--------------------------------------------------------------------------------
1572215691

15723-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v1.22.0/LICENSE:
15692+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v1.28.0/LICENSE:
1572415693

1572515694

1572615695
Apache License
@@ -15928,11 +15897,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/cons
1592815897

1592915898
--------------------------------------------------------------------------------
1593015899
Dependency : go.opentelemetry.io/collector/semconv
15931-
Version: v0.119.0
15900+
Version: v0.121.0
1593215901
Licence type (autodetected): Apache-2.0
1593315902
--------------------------------------------------------------------------------
1593415903

15935-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.119.0/LICENSE:
15904+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.121.0/LICENSE:
1593615905

1593715906

1593815907
Apache License

‎go.mod

Lines changed: 8 additions & 9 deletions
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.3.0
1111
github.com/elastic/apm-data v1.18.0
12-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250325090137-0c4e2d0af92c
12+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250502132831-ef4bf7d20f61
1313
github.com/elastic/elastic-agent-client/v7 v7.17.2
1414
github.com/elastic/elastic-agent-libs v0.19.3
1515
github.com/elastic/elastic-agent-system-metrics v0.11.11
@@ -94,7 +94,7 @@ require (
9494
github.com/eapache/go-resiliency v1.7.0 // indirect
9595
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
9696
github.com/eapache/queue v1.1.0 // indirect
97-
github.com/ebitengine/purego v0.8.1 // indirect
97+
github.com/ebitengine/purego v0.8.2 // indirect
9898
github.com/elastic/apm-perf v0.0.0-20250207152505-1dbeb202ff22 // indirect
9999
github.com/elastic/apm-tools v0.0.0-20250124173757-336011228dbe // indirect
100100
github.com/elastic/go-elasticsearch/v8 v8.17.1 // indirect
@@ -150,7 +150,6 @@ require (
150150
github.com/jcmturner/goidentity/v6 v6.0.1 // indirect
151151
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
152152
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
153-
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
154153
github.com/josephspurrier/goversioninfo v1.4.1 // indirect
155154
github.com/json-iterator/go v1.1.12 // indirect
156155
github.com/kamstrup/intmap v0.5.1 // indirect
@@ -181,22 +180,22 @@ require (
181180
github.com/oklog/run v1.1.0 // indirect
182181
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
183182
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
184-
github.com/pierrec/lz4/v4 v4.1.21 // indirect
183+
github.com/pierrec/lz4/v4 v4.1.22 // indirect
185184
github.com/pjbgf/sha1cd v0.3.0 // indirect
186185
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
187186
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
188187
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
189188
github.com/prometheus/client_golang v1.20.5 // indirect
190189
github.com/prometheus/client_model v0.6.1 // indirect
191-
github.com/prometheus/common v0.60.1 // indirect
190+
github.com/prometheus/common v0.62.0 // indirect
192191
github.com/prometheus/procfs v0.15.1 // indirect
193192
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
194193
github.com/rogpeppe/go-internal v1.13.1 // indirect
195194
github.com/russross/blackfriday/v2 v2.1.0 // indirect
196195
github.com/sagikazarmark/locafero v0.6.0 // indirect
197196
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
198197
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
199-
github.com/shirou/gopsutil/v4 v4.24.10 // indirect
198+
github.com/shirou/gopsutil/v4 v4.25.1 // indirect
200199
github.com/shopspring/decimal v1.4.0 // indirect
201200
github.com/skeema/knownhosts v1.3.0 // indirect
202201
github.com/sourcegraph/conc v0.3.0 // indirect
@@ -212,7 +211,7 @@ require (
212211
github.com/tidwall/pretty v1.2.1 // indirect
213212
github.com/tidwall/sjson v1.2.5 // indirect
214213
github.com/tklauser/go-sysconf v0.3.12 // indirect
215-
github.com/tklauser/numcpus v0.6.1 // indirect
214+
github.com/tklauser/numcpus v0.8.0 // indirect
216215
github.com/ulikunitz/xz v0.5.12 // indirect
217216
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
218217
github.com/xanzy/ssh-agent v0.3.3 // indirect
@@ -227,8 +226,8 @@ require (
227226
go.elastic.co/ecszap v1.0.3 // indirect
228227
go.elastic.co/go-licence-detector v0.7.0 // indirect
229228
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
230-
go.opentelemetry.io/collector/consumer v1.22.0 // indirect
231-
go.opentelemetry.io/collector/semconv v0.119.0 // indirect
229+
go.opentelemetry.io/collector/consumer v1.28.0 // indirect
230+
go.opentelemetry.io/collector/semconv v0.121.0 // indirect
232231
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
233232
go.uber.org/multierr v1.11.0 // indirect
234233
golang.org/x/crypto v0.37.0 // indirect

0 commit comments

Comments
 (0)