feat: drop global ephemeralID (#253)

## What does this PR do?

require explicitly passing an ephemeralID to metrics setup and drop
global ephemeralID

## Why is it important?

beats already has a ephemeralID field, avoid the global field and move
to passing the id explicitly

this also allows dropping a call to `logp.Err`

## Checklist

<!-- Mandatory
Add a checklist of things that are required to be reviewed in order to
have the PR approved

List here all the items you have verified BEFORE sending this PR. Please
DO NOT remove any item, striking through those that do not apply. (Just
in case, strikethrough uses two tildes. ~~Scratch this.~~)
-->

- [ ] My code follows the style guidelines of this project
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] I have added an entry in `CHANGELOG.md`

## Author's Checklist

<!-- Recommended
Add a checklist of things that are required to be reviewed in order to
have the PR approved
-->
- [ ]

## Related issues

<!-- Recommended
Link related issues below. Insert the issue link or reference after the
word "Closes" if merging this should automatically close it.

- Closes #123
- Relates #123
- Requires #123
- Superseds #123
-->
-

Author: kruskall

go.mod

@@ -10,7 +10,6 @@ require (
 	github.com/elastic/go-sysinfo v1.14.1
 	github.com/elastic/go-windows v1.0.1
 	github.com/elastic/gosigar v0.14.2
-	github.com/gofrs/uuid/v5 v5.2.0
 	github.com/magefile/mage v1.15.0
 	github.com/shirou/gopsutil/v4 v4.24.7
 	github.com/stretchr/testify v1.9.0

go.sum

@@ -46,8 +46,6 @@ github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/gobuffalo/here v0.6.0 h1:hYrd0a6gDmWxBM4TnrGw8mQg24iSVoIkHEk7FodQcBI=
 github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=
-github.com/gofrs/uuid/v5 v5.2.0 h1:qw1GMx6/y8vhVsx626ImfKMuS5CvJmhIKKtuyvfajMM=
-github.com/gofrs/uuid/v5 v5.2.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=

report/metrics_common.go

@@ -19,28 +19,12 @@ package report
 
 import (
 	"time"
-
-	"github.com/gofrs/uuid/v5"
-
-	"github.com/elastic/elastic-agent-libs/logp"
 )
 
 var (
-	ephemeralID uuid.UUID
-	startTime   time.Time
+	startTime time.Time
 )
 
 func init() {
 	startTime = time.Now()
-
-	var err error
-	ephemeralID, err = uuid.NewV4()
-	if err != nil {
-		logp.Err("Error while generating ephemeral ID for Beat")
-	}
-}
-
-// EphemeralID returns generated EphemeralID
-func EphemeralID() uuid.UUID {
-	return ephemeralID
 }

report/metrics_report_test.go

@@ -32,7 +32,7 @@ import (
 func TestSystemMetricsReport(t *testing.T) {
 	systemMetrics := monitoring.NewRegistry()
 	processMetrics := monitoring.NewRegistry()
-	err := SetupMetrics(logptest.NewTestingLogger(t, ""), "TestSys", "test", systemMetrics, processMetrics)
+	err := SetupMetrics(logptest.NewTestingLogger(t, ""), "TestSys", "test", "", systemMetrics, processMetrics)
 	require.NoError(t, err)
 
 	var gotCPU, gotMem, gotInfo atomic.Bool

report/setup.go

@@ -40,7 +40,7 @@ var (
 const monitoringCgroupsHierarchyOverride = "LIBBEAT_MONITORING_CGROUPS_HIERARCHY_OVERRIDE"
 
 // SetupMetrics creates a basic suite of metrics handlers for monitoring, including build info and system resources
-func SetupMetrics(logger *logp.Logger, name, version string, systemMetrics *monitoring.Registry, processMetrics *monitoring.Registry) error {
+func SetupMetrics(logger *logp.Logger, name, version, ephemeralID string, systemMetrics *monitoring.Registry, processMetrics *monitoring.Registry) error {
 	monitoring.NewFunc(systemMetrics, "cpu", ReportSystemCPUUsage, monitoring.Report)
 
 	name = processName(name)
@@ -60,7 +60,7 @@ func SetupMetrics(logger *logp.Logger, name, version string, systemMetrics *moni
 	monitoring.NewFunc(processMetrics, "memstats", MemStatsReporter(logger, processStats), monitoring.Report)
 	monitoring.NewFunc(processMetrics, "cpu", InstanceCPUReporter(logger, processStats), monitoring.Report)
 	monitoring.NewFunc(processMetrics, "runtime", ReportRuntime, monitoring.Report)
-	monitoring.NewFunc(processMetrics, "info", infoReporter(name, version), monitoring.Report)
+	monitoring.NewFunc(processMetrics, "info", infoReporter(name, version, ephemeralID), monitoring.Report)
 
 	setupPlatformSpecificMetrics(logger, processStats, systemMetrics, processMetrics)
 
@@ -88,7 +88,7 @@ func isWindows() bool {
 	return runtime.GOOS == "windows"
 }
 
-func infoReporter(serviceName, version string) func(_ monitoring.Mode, V monitoring.Visitor) {
+func infoReporter(serviceName, version, ephemeralID string) func(_ monitoring.Mode, V monitoring.Visitor) {
 	return func(_ monitoring.Mode, V monitoring.Visitor) {
 		V.OnRegistryStart()
 		defer V.OnRegistryFinished()
@@ -99,7 +99,7 @@ func infoReporter(serviceName, version string) func(_ monitoring.Mode, V monitor
 			monitoring.ReportInt(V, "ms", uptime)
 		})
 
-		monitoring.ReportString(V, "ephemeral_id", ephemeralID.String())
+		monitoring.ReportString(V, "ephemeral_id", ephemeralID)
 		monitoring.ReportString(V, "name", serviceName)
 		monitoring.ReportString(V, "version", version)
 	}

report/setup_other.go

@@ -28,7 +28,7 @@ import (
 	"github.com/elastic/elastic-agent-libs/monitoring"
 )
 
-func SetupMetrics(logger *logp.Logger, name, version string, systemMetrics *monitoring.Registry, processMetrics *monitoring.Registry) error {
+func SetupMetrics(logger *logp.Logger, name, version, ephemeralID string, systemMetrics *monitoring.Registry, processMetrics *monitoring.Registry) error {
 	logp.Warn("Metrics not implemented for this OS.")
 	return nil
 }