Skip to content

feat: bump beats and replace global loggers #16717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
+373 −336
Open

feat: bump beats and replace global loggers #16717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fa191dc
feat: bump beats and replace global loggers
kruskall Apr 24, 2025
64c24eb
Update go.mod
kruskall Apr 24, 2025
502f8ca
lint: update logger to use correct methods
kruskall Apr 24, 2025
6fbab18
lint: fix linter issues
kruskall Apr 24, 2025
4f75175
lint: bump elastic-agent-libs to 0.19.3
kruskall Apr 24, 2025
3d50d2b
Merge branch 'main' into feat/remove-global-logger
kruskall Apr 28, 2025
dffaa41
fix: resolve a few goroutine leaks in tests
kruskall Apr 28, 2025
c3b01a9
Merge remote-tracking branch 'upstream/main' into feat/remove-global-…
kruskall Apr 30, 2025
ac2e26e
lint: fix compile errors
kruskall Apr 30, 2025
2f1dd22
lint: log debug before starting body caching goroutine
kruskall Apr 30, 2025
ee9ad1b
Merge branch 'main' into feat/remove-global-logger
kruskall Apr 30, 2025
bf2a8ff
test: resolve TestInvalidation goroutine leak
kruskall Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions NOTICE-fips.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,11 +455,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.18.

--------------------------------------------------------------------------------
Dependency : github.com/elastic/beats/v7
Version: v7.0.0-alpha2.0.20250325090137-0c4e2d0af92c
Version: v7.0.0-alpha2.0.20250424141521-26cce27fe81e
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250325090137-0c4e2d0af92c/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250424141521-26cce27fe81e/LICENSE.txt:

Source code in this repository is variously licensed under the Apache License
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
Expand Down Expand Up @@ -7584,11 +7584,11 @@ SOFTWARE.

--------------------------------------------------------------------------------
Dependency : github.com/ebitengine/purego
Version: v0.8.1
Version: v0.8.2
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

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

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -11683,11 +11683,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : github.com/pierrec/lz4/v4
Version: v4.1.21
Version: v4.1.22
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/pierrec/lz4/v4@v4.1.21/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/pierrec/lz4/v4@v4.1.22/LICENSE:

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

--------------------------------------------------------------------------------
Dependency : github.com/prometheus/common
Version: v0.60.1
Version: v0.62.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.60.1/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.62.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -12680,11 +12680,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : github.com/shirou/gopsutil/v4
Version: v4.24.10
Version: v4.25.1
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/shirou/gopsutil/v4@v4.24.10/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/shirou/gopsutil/v4@v4.25.1/LICENSE:

gopsutil is distributed under BSD license reproduced below.

Expand Down Expand Up @@ -12789,11 +12789,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : github.com/tklauser/numcpus
Version: v0.6.1
Version: v0.8.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/tklauser/numcpus@v0.6.1/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/tklauser/numcpus@v0.8.0/LICENSE:


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

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/collector/consumer
Version: v1.22.0
Version: v1.28.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

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


Apache License
Expand Down Expand Up @@ -13876,11 +13876,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/cons

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/collector/semconv
Version: v0.119.0
Version: v0.121.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

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


Apache License
Expand Down
32 changes: 16 additions & 16 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,11 +455,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.18.

--------------------------------------------------------------------------------
Dependency : github.com/elastic/beats/v7
Version: v7.0.0-alpha2.0.20250325090137-0c4e2d0af92c
Version: v7.0.0-alpha2.0.20250424141521-26cce27fe81e
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250325090137-0c4e2d0af92c/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250424141521-26cce27fe81e/LICENSE.txt:

Source code in this repository is variously licensed under the Apache License
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
Expand Down Expand Up @@ -7584,11 +7584,11 @@ SOFTWARE.

--------------------------------------------------------------------------------
Dependency : github.com/ebitengine/purego
Version: v0.8.1
Version: v0.8.2
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

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

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -13180,11 +13180,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : github.com/pierrec/lz4/v4
Version: v4.1.21
Version: v4.1.22
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/pierrec/lz4/v4@v4.1.21/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/pierrec/lz4/v4@v4.1.22/LICENSE:

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

--------------------------------------------------------------------------------
Dependency : github.com/prometheus/common
Version: v0.60.1
Version: v0.62.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.60.1/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.62.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -14177,11 +14177,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : github.com/shirou/gopsutil/v4
Version: v4.24.10
Version: v4.25.1
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/shirou/gopsutil/v4@v4.24.10/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/shirou/gopsutil/v4@v4.25.1/LICENSE:

gopsutil is distributed under BSD license reproduced below.

Expand Down Expand Up @@ -14286,11 +14286,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : github.com/tklauser/numcpus
Version: v0.6.1
Version: v0.8.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/tklauser/numcpus@v0.6.1/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/tklauser/numcpus@v0.8.0/LICENSE:


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

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/collector/consumer
Version: v1.22.0
Version: v1.28.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

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


Apache License
Expand Down Expand Up @@ -15928,11 +15928,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/cons

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/collector/semconv
Version: v0.119.0
Version: v0.121.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

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


Apache License
Expand Down
16 changes: 8 additions & 8 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/dustin/go-humanize v1.0.1
github.com/elastic/apm-aggregation v1.3.0
github.com/elastic/apm-data v1.18.0
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250325090137-0c4e2d0af92c
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250424141521-26cce27fe81e
github.com/elastic/elastic-agent-client/v7 v7.17.2
github.com/elastic/elastic-agent-libs v0.19.3
github.com/elastic/elastic-agent-system-metrics v0.11.11
Expand Down Expand Up @@ -94,7 +94,7 @@ require (
github.com/eapache/go-resiliency v1.7.0 // indirect
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
github.com/eapache/queue v1.1.0 // indirect
github.com/ebitengine/purego v0.8.1 // indirect
github.com/ebitengine/purego v0.8.2 // indirect
github.com/elastic/apm-perf v0.0.0-20250207152505-1dbeb202ff22 // indirect
github.com/elastic/apm-tools v0.0.0-20250124173757-336011228dbe // indirect
github.com/elastic/go-elasticsearch/v8 v8.17.1 // indirect
Expand Down Expand Up @@ -181,22 +181,22 @@ require (
github.com/oklog/run v1.1.0 // indirect
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/pierrec/lz4/v4 v4.1.21 // indirect
github.com/pierrec/lz4/v4 v4.1.22 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
github.com/prometheus/client_golang v1.20.5 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.60.1 // indirect
github.com/prometheus/common v0.62.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rogpeppe/go-internal v1.13.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sagikazarmark/locafero v0.6.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/shirou/gopsutil/v4 v4.24.10 // indirect
github.com/shirou/gopsutil/v4 v4.25.1 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/skeema/knownhosts v1.3.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
Expand All @@ -212,7 +212,7 @@ require (
github.com/tidwall/pretty v1.2.1 // indirect
github.com/tidwall/sjson v1.2.5 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/tklauser/numcpus v0.8.0 // indirect
github.com/ulikunitz/xz v0.5.12 // indirect
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
Expand All @@ -227,8 +227,8 @@ require (
go.elastic.co/ecszap v1.0.3 // indirect
go.elastic.co/go-licence-detector v0.7.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/consumer v1.22.0 // indirect
go.opentelemetry.io/collector/semconv v0.119.0 // indirect
go.opentelemetry.io/collector/consumer v1.28.0 // indirect
go.opentelemetry.io/collector/semconv v0.121.0 // indirect
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.37.0 // indirect
Expand Down
Loading
Loading