Merge branch 'main' into feature/use-plain-command

Author: v1v

internal/beater/beater.go

@@ -124,6 +124,12 @@ type RunnerParams struct {
 func NewRunner(args RunnerParams) (*Runner, error) {
 	fips140.CheckFips()
 
+	// the default tracer is leaking and its background
+	// goroutine is spamming requests to this apm server (default endpoint)
+	// If TLS is enabled it causes "http request sent to https endpoint".
+	// Close the default tracer since it's not used.
+	apm.DefaultTracer().Close()
+
 	var unpackedConfig struct {
 		APMServer  *agentconfig.C        `config:"apm-server"`
 		Output     agentconfig.Namespace `config:"output"`

testing/infra/k8s/base/stack/apm-server.yaml

@@ -4,7 +4,7 @@ metadata:
   name: apm-server
 spec:
   # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
-  version: 9.1.0-f894ad4a-SNAPSHOT
+  version: 9.1.0-2a2b7495-SNAPSHOT
   count: 1
   http:
     tls:

testing/infra/k8s/base/stack/elasticsearch.yaml

@@ -4,7 +4,7 @@ metadata:
   name: elasticsearch
 spec:
   # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
-  version: 9.1.0-f894ad4a-SNAPSHOT
+  version: 9.1.0-2a2b7495-SNAPSHOT
   auth:
     fileRealm:
       - secretName: elasticsearch-admin

testing/infra/k8s/base/stack/kibana.yaml

@@ -4,7 +4,7 @@ metadata:
   name: kibana
 spec:
   # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
-  version: 9.1.0-f894ad4a-SNAPSHOT
+  version: 9.1.0-2a2b7495-SNAPSHOT
   count: 1
   elasticsearchRef:
     name: elasticsearch

x-pack/apm-server/sampling/eventstorage/storage_manager.go

@@ -140,8 +140,6 @@ type StorageManager struct {
 	// meterProvider is the OTel meter provider
 	meterProvider  metric.MeterProvider
 	storageMetrics storageMetrics
-
-	metricRegistration metric.Registration
 }
 
 type storageMetrics struct {
@@ -335,11 +333,6 @@ func (sm *StorageManager) Close() error {
 }
 
 func (sm *StorageManager) close() error {
-	if sm.metricRegistration != nil {
-		if err := sm.metricRegistration.Unregister(); err != nil {
-			sm.logger.With(logp.Error(err)).Error("failed to unregister metric")
-		}
-	}
 	return errors.Join(
 		wrapNonNilErr("event db flush error: %w", sm.eventDB.Flush()),
 		wrapNonNilErr("decision db flush error: %w", sm.decisionDB.Flush()),