Fixing conflicts

Author: ycombinator

internal/pkg/api/metrics.go

@@ -10,23 +10,23 @@ import (
 	"fmt"
 	"sync"
 
+	"github.com/elastic/elastic-agent-system-metrics/report"
+	"github.com/elastic/fleet-server/v7/version"
+	"github.com/rs/zerolog"
+
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"github.com/rs/zerolog"
 	apmprometheus "go.elastic.co/apm/module/apmprometheus/v2"
 	"go.elastic.co/apm/v2"
 
 	"github.com/elastic/elastic-agent-libs/api"
 	cfglib "github.com/elastic/elastic-agent-libs/config"
 	"github.com/elastic/elastic-agent-libs/monitoring"
-	"github.com/elastic/elastic-agent-system-metrics/report"
-
 	"github.com/elastic/fleet-server/v7/internal/pkg/build"
 	"github.com/elastic/fleet-server/v7/internal/pkg/config"
 	"github.com/elastic/fleet-server/v7/internal/pkg/dl"
 	"github.com/elastic/fleet-server/v7/internal/pkg/limit"
 	"github.com/elastic/fleet-server/v7/internal/pkg/logger"
-	"github.com/elastic/fleet-server/v7/version"
 )
 
 var (
@@ -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,11 +73,9 @@ func init() {
 	cntFileDeliv.Register(routesRegistry.newRegistry("deliverFile"))
 	cntGetPGP.Register(routesRegistry.newRegistry("getPGPKey"))
 	cntAuditUnenroll.Register(routesRegistry.newRegistry("auditUnenroll"))
-<<<<<<< HEAD
-=======
 
 	err := report.SetupMetricsOptions(report.MetricOptions{
-		Logger:         zap.NewStub("instance-metrics"),
+		Logger:         logger.NewZapStub("instance-metrics"),
 		Name:           build.ServiceName,
 		Version:        version.DefaultVersion,
 		SystemMetrics:  monitoring.NewRegistry(),
@@ -91,7 +84,7 @@ func init() {
 	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
 	}
->>>>>>> 898abd5 (build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.11.18 to 0.12.0 (#5273))
+
 }
 
 // metricsRegistry wraps libbeat and prometheus registries