From e6d88e696988deb6e9af15dec66fd98199cb49c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Jul 2025 00:35:50 +0000 Subject: [PATCH 1/4] build(deps): bump github.com/elastic/elastic-agent-system-metrics Bumps [github.com/elastic/elastic-agent-system-metrics](https://github.com/elastic/elastic-agent-system-metrics) from 0.11.16 to 0.11.18. - [Release notes](https://github.com/elastic/elastic-agent-system-metrics/releases) - [Commits](https://github.com/elastic/elastic-agent-system-metrics/compare/v0.11.16...v0.11.18) --- updated-dependencies: - dependency-name: github.com/elastic/elastic-agent-system-metrics dependency-version: 0.11.18 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 22b82040d2..6bb5b4bfd2 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/docker/go-units v0.5.0 github.com/elastic/elastic-agent-client/v7 v7.17.2 github.com/elastic/elastic-agent-libs v0.21.0 - github.com/elastic/elastic-agent-system-metrics v0.11.16 + github.com/elastic/elastic-agent-system-metrics v0.11.18 github.com/elastic/go-elasticsearch/v8 v8.18.1 github.com/elastic/go-ucfg v0.8.8 github.com/fxamacker/cbor/v2 v2.8.0 diff --git a/go.sum b/go.sum index e2a1f9fda8..db00653c2e 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,8 @@ github.com/elastic/elastic-agent-client/v7 v7.17.2 h1:Cl2TeABqWZgW40t5fchGWT/sRk github.com/elastic/elastic-agent-client/v7 v7.17.2/go.mod h1:5irRFqp6HLqtu1S+OeY0jg8x7K6PLL+DW+PwVk1vJnk= github.com/elastic/elastic-agent-libs v0.21.0 h1:lt2Xc87Si0mea0BgRKZGZA30j8LEx57k7GAyiKmZP/8= github.com/elastic/elastic-agent-libs v0.21.0/go.mod h1:xSeIP3NtOIT4N2pPS4EyURmS1Q8mK0lWZ8Wd1Du6q3w= -github.com/elastic/elastic-agent-system-metrics v0.11.16 h1:cLjuO8pE5cUwPGWUHmy1VOERmJVDaep8gY+U4YRQ5vs= -github.com/elastic/elastic-agent-system-metrics v0.11.16/go.mod h1:qiZC5p1hd8te4XVnhh7FkXdcYhxFnl5i9GJpROtf6zo= +github.com/elastic/elastic-agent-system-metrics v0.11.18 h1:MuFLvHc3kQN/59+3KmRWhOUoXkL5PDzxEbdYbARGexA= +github.com/elastic/elastic-agent-system-metrics v0.11.18/go.mod h1:qiZC5p1hd8te4XVnhh7FkXdcYhxFnl5i9GJpROtf6zo= github.com/elastic/elastic-transport-go/v8 v8.7.0 h1:OgTneVuXP2uip4BA658Xi6Hfw+PeIOod2rY3GVMGoVE= github.com/elastic/elastic-transport-go/v8 v8.7.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= github.com/elastic/go-elasticsearch/v8 v8.18.1 h1:lPsN2Wk6+QqBeD4ckmOax7G/Y8tAZgroDYG8j6/5Ce0= From 1f80f19275d7db17213f77bc7a3ca7491ff04076 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 4 Jul 2025 00:36:41 +0000 Subject: [PATCH 2/4] Post dependabot file modifications --- NOTICE-fips.txt | 4 ++-- NOTICE.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NOTICE-fips.txt b/NOTICE-fips.txt index bbc8d06303..95ad28ca5b 100644 --- a/NOTICE-fips.txt +++ b/NOTICE-fips.txt @@ -872,11 +872,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-system-metrics -Version: v0.11.16 +Version: v0.11.18 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.11.16/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.11.18/LICENSE.txt: Apache License Version 2.0, January 2004 diff --git a/NOTICE.txt b/NOTICE.txt index 94e9c624eb..f39fef5d2a 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -872,11 +872,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-system-metrics -Version: v0.11.16 +Version: v0.11.18 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.11.16/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.11.18/LICENSE.txt: Apache License Version 2.0, January 2004 From 50ad6d03cd9b80c12af8705781a1e42a314b4d56 Mon Sep 17 00:00:00 2001 From: michel-laterman Date: Mon, 7 Jul 2025 09:52:04 -0600 Subject: [PATCH 3/4] Fix metrics setup --- internal/pkg/api/metrics.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/pkg/api/metrics.go b/internal/pkg/api/metrics.go index 7e4c6f096d..e456b97e09 100644 --- a/internal/pkg/api/metrics.go +++ b/internal/pkg/api/metrics.go @@ -55,11 +55,6 @@ var ( // metrics must be explicitly exposed with a call to InitMetrics // FIXME we have global metrics but an internal and external API; this may lead to some confusion. func init() { - err := report.SetupMetrics(logger.NewZapStub("instance-metrics"), build.ServiceName, version.DefaultVersion) - if err != nil { - zerolog.Ctx(context.TODO()).Error().Err(err).Msg("unable to initialize metrics") // TODO is used because this may logged during the package load - } - registry = newMetricsRegistry("http_server") cntHTTPNew = newCounter(registry, "tcp_open") cntHTTPClose = newCounter(registry, "tcp_close") @@ -78,6 +73,11 @@ func init() { cntFileDeliv.Register(routesRegistry.newRegistry("deliverFile")) cntGetPGP.Register(routesRegistry.newRegistry("getPGPKey")) cntAuditUnenroll.Register(routesRegistry.newRegistry("auditUnenroll")) + + err := report.SetupMetrics(logger.NewZapStub("instance-metrics"), build.ServiceName, version.DefaultVersion, registry.registry, registry.registry) + if err != nil { + zerolog.Ctx(context.TODO()).Error().Err(err).Msg("unable to initialize metrics") // TODO is used because this may logged during the package load + } } // metricsRegistry wraps libbeat and prometheus registries From a6c14714414cbfeed209c2f1ba1937ffc0250e33 Mon Sep 17 00:00:00 2001 From: michel-laterman Date: Tue, 8 Jul 2025 09:17:45 -0600 Subject: [PATCH 4/4] Use unique registry for system metrics --- internal/pkg/api/metrics.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/pkg/api/metrics.go b/internal/pkg/api/metrics.go index e456b97e09..5e02adfe24 100644 --- a/internal/pkg/api/metrics.go +++ b/internal/pkg/api/metrics.go @@ -74,7 +74,7 @@ func init() { cntGetPGP.Register(routesRegistry.newRegistry("getPGPKey")) cntAuditUnenroll.Register(routesRegistry.newRegistry("auditUnenroll")) - err := report.SetupMetrics(logger.NewZapStub("instance-metrics"), build.ServiceName, version.DefaultVersion, registry.registry, registry.registry) + err := report.SetupMetrics(logger.NewZapStub("instance-metrics"), build.ServiceName, version.DefaultVersion, monitoring.NewRegistry(), registry.registry) if err != nil { zerolog.Ctx(context.TODO()).Error().Err(err).Msg("unable to initialize metrics") // TODO is used because this may logged during the package load }