Skip to content

[fix] Replace deprecated SetupMetrics with SetupMetricsOptions #10468

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 6 commits into
base: main
Choose a base branch
from
+26 −2
Open

[fix] Replace deprecated SetupMetrics with SetupMetricsOptions #10468

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0d2a8d6
fix: replace deprecated function
hayotbisonai Oct 10, 2025
c54f8a3
Merge branch 'main' into fix/replace-deprecated-setmetrics
hayotbisonai Oct 10, 2025
bc970b6
Fix typos (#10469)
pierrehilbert Oct 10, 2025
21e8f7e
[edot][diagnostics] remove otel diagnostics from manager (#10415)
VihasMakwana Oct 10, 2025
8ac85ce
Fix troubleshooting message URL for versions after 9.x (#10218)
straistaru Oct 10, 2025
0417727
Merge branch 'main' into fix/replace-deprecated-setmetrics
hayotbisonai Oct 10, 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
28 changes: 26 additions & 2 deletions internal/pkg/agent/cmd/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
"strings"
"syscall"
"time"

Check failure on line 19 in internal/pkg/agent/cmd/run.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

File is not properly formatted (goimports)
"github.com/elastic/elastic-agent/internal/pkg/agent/application/enroll"
fleetgateway "github.com/elastic/elastic-agent/internal/pkg/agent/application/gateway/fleet"
"github.com/gofrs/uuid/v5"

"go.elastic.co/apm/v2"
apmtransport "go.elastic.co/apm/v2/transport"
Expand Down Expand Up @@ -719,8 +720,21 @@
tracer *apm.Tracer,
coord *coordinator.Coordinator,
) (*reload.ServerReloader, error) {
if err := report.SetupMetrics(logger, agentName, version.GetDefaultVersion()); err != nil { //nolint:staticcheck // ignore deprecation
return nil, err

ephemeralID, err := generateEphemeralID()
if err != nil {
return nil, fmt.Errorf("failed to generate ephemeral ID: %w", err)
}

if err := report.SetupMetricsOptions(report.MetricOptions{
Name: agentName,
Version: version.GetDefaultVersion(),
Logger: logger,
EphemeralID: ephemeralID,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's try leaving out this field? We've done it in other places, e.g. https://github.com/elastic/beats/blob/fe58b38aafa2410ee59c1feeec64fbf5a180f09e/x-pack/libbeat/cmd/instance/receiver.go#L53-L59 or https://github.com/elastic/fleet-server/blob/589cd522193e485b8a3c3958a2b3032569b81a4e/internal/pkg/api/metrics.go#L77-L83

SystemMetrics: monitoringLib.Default.GetOrCreateRegistry("system"),
ProcessMetrics: monitoringLib.Default.GetOrCreateRegistry("beat"),
}); err != nil {
return nil, fmt.Errorf("failed to setup metrics: %w", err)
}

s, err := monitoring.NewServer(logger, monitoringLib.GetNamespace, tracer, coord, cfg)
Expand Down Expand Up @@ -793,3 +807,13 @@

return nil
}

// generateEphemeralID generates a random UUID
func generateEphemeralID() (string, error) {
uid, err := uuid.NewV4()
if err != nil {
return "", fmt.Errorf("error while generating UUID for agent: %w", err)
}

return uid.String(), nil
}
Loading