[8.x] Revert "feat: bump beats to latest 8.x commit (#14147)" (#14309)

This reverts commit 7f85cd6.

Unblock #14292 to fix #14280. Reverting beats instead of
bumping beats to avoid #14297.

Makefile

@@ -176,7 +176,7 @@ docs/spec: go.mod
 # Beats synchronisation.
 ##############################################################################
 
-BEATS_VERSION?=8.x
+BEATS_VERSION?=main
 BEATS_MODULE:=github.com/elastic/beats/v7
 
 .PHONY: update-beats

NOTICE.txt

@@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/beats/v7
-Version: v7.0.0-alpha2.0.20240927142811-d130d84e0c8c
+Version: v7.0.0-alpha2.0.20240823193033-af33fad4d50b
 Licence type (autodetected): Elastic
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20240927142811-d130d84e0c8c/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20240823193033-af33fad4d50b/LICENSE.txt:
 
 Source code in this repository is variously licensed under the Apache License
 Version 2.0, an Apache compatible license, or the Elastic License. Outside of
@@ -2379,12 +2379,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 --------------------------------------------------------------------------------
-Dependency : github.com/gofrs/uuid/v5
-Version: v5.3.0
+Dependency : github.com/gofrs/uuid
+Version: v4.4.0+incompatible
 Licence type (autodetected): MIT
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/gofrs/uuid/[email protected]/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/gofrs/uuid@v4.4.0+incompatible/LICENSE:
 
 Copyright (C) 2013-2018 by Maxim Bublis <[email protected]>
 
@@ -10597,6 +10597,36 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+--------------------------------------------------------------------------------
+Dependency : github.com/gofrs/uuid/v5
+Version: v5.2.0
+Licence type (autodetected): MIT
+--------------------------------------------------------------------------------
+
+Contents of probable licence file $GOMODCACHE/github.com/gofrs/uuid/[email protected]/LICENSE:
+
+Copyright (C) 2013-2018 by Maxim Bublis <[email protected]>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
 --------------------------------------------------------------------------------
 Dependency : github.com/gogo/googleapis
 Version: v1.4.1

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/dustin/go-humanize v1.0.1
 	github.com/elastic/apm-aggregation v1.1.0
 	github.com/elastic/apm-data v1.13.1
-	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240927142811-d130d84e0c8c
+	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240823193033-af33fad4d50b
 	github.com/elastic/elastic-agent-client/v7 v7.16.0
 	github.com/elastic/elastic-agent-libs v0.12.0
 	github.com/elastic/elastic-agent-system-metrics v0.11.3
@@ -19,7 +19,7 @@ require (
 	github.com/elastic/go-ucfg v0.8.8
 	github.com/go-sourcemap/sourcemap v2.1.4+incompatible
 	github.com/gofrs/flock v0.12.1
-	github.com/gofrs/uuid/v5 v5.3.0
+	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/gogo/protobuf v1.3.2
 	github.com/google/go-cmp v0.6.0
 	github.com/gorilla/mux v1.8.1
@@ -98,6 +98,7 @@ require (
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/gofrs/uuid/v5 v5.2.0 // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect
 	github.com/golang/glog v1.2.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect

go.sum

@@ -133,10 +133,10 @@ github.com/elastic/apm-aggregation v1.1.0 h1:eTHGd5w99JoRFJ763MJP6nUX4hkkeSil3KW
 github.com/elastic/apm-aggregation v1.1.0/go.mod h1:YBQ77Jt7vOy2/7w4q5SsEifhc0V02dJxRcyyeC6HsvQ=
 github.com/elastic/apm-data v1.13.1 h1:vQUWqi9H6QC4FCZ05kILkE+2BeKWw6iT+NXXyadWJm8=
 github.com/elastic/apm-data v1.13.1/go.mod h1:m2FSH7alN07VmtmN10KmgxAa8tgXlJDe/rC0g4FnZUI=
-github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240927142811-d130d84e0c8c h1:lGnbSjxi+rTsyN8qlJR/9FAmlk6oS0RIaqrzYDMHaOQ=
-github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240927142811-d130d84e0c8c/go.mod h1:tBsm3eI27+LJqaABPmGLgr/6RcQ50lHsQxbsfDGlHHQ=
-github.com/elastic/elastic-agent-autodiscover v0.8.2 h1:Fs2FhR33AMBPfm5/jz4drVzaEZaqOIHlDBvGtkUZdIk=
-github.com/elastic/elastic-agent-autodiscover v0.8.2/go.mod h1:VZnU53EVaFTxR8Xf6YsLN8FHD5DKQzHSPlKax9/4w+o=
+github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240823193033-af33fad4d50b h1:i3WdOw//Vg76Vseqxgn47GPTVqUSucAdE42jkih1ViM=
+github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240823193033-af33fad4d50b/go.mod h1:m8d3EBr2z7YvWfxRgoE7SsUNbMTpyWXi67fG7B7vn7w=
+github.com/elastic/elastic-agent-autodiscover v0.8.1 h1:u6TWqh7wfevu6S4GUq4SIxYBRo4b/P5RZmx/rSvT10A=
+github.com/elastic/elastic-agent-autodiscover v0.8.1/go.mod h1:0gzGsaDCAqBfUZjuCqqWsSI60eaZ778A5tQZV72rPV0=
 github.com/elastic/elastic-agent-client/v7 v7.16.0 h1:yKGq2+CxAuW8Kh0EoNl202tqAyQKfBcPRawVKs2Jve0=
 github.com/elastic/elastic-agent-client/v7 v7.16.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI=
 github.com/elastic/elastic-agent-libs v0.12.0 h1:xfVVCYIaI6XEPVpJNq7HQav7O/VxLj+YbQK/poWb7wA=
@@ -200,8 +200,10 @@ github.com/go-sourcemap/sourcemap v2.1.4+incompatible h1:a+iTbH5auLKxaNwQFg0B+TC
 github.com/go-sourcemap/sourcemap v2.1.4+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E=
 github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0=
-github.com/gofrs/uuid/v5 v5.3.0 h1:m0mUMr+oVYUdxpMLgSYCZiXe7PuVPnI94+OMeVBNedk=
-github.com/gofrs/uuid/v5 v5.3.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
+github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
+github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+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/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0=
 github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=

internal/beatcmd/beat.go

@@ -31,7 +31,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gofrs/uuid/v5"
+	"github.com/gofrs/uuid"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
 
@@ -123,7 +123,6 @@ func NewBeat(args BeatParams) (*Beat, error) {
 			Keystore:   keystore,
 			Config:     &beat.BeatConfig{Output: cfg.Output},
 			BeatConfig: cfg.APMServer,
-			Registry:   reload.NewRegistry(),
 		},
 		Config:    cfg,
 		newRunner: args.NewRunner,
@@ -153,7 +152,7 @@ func (b *Beat) init() error {
 	logp.Info("Beat ID: %v", b.Info.ID)
 
 	// Initialize central config manager.
-	manager, err := management.NewManager(b.Config.Management, b.Registry)
+	manager, err := management.NewManager(b.Config.Management, reload.RegisterV2)
 	if err != nil {
 		return err
 	}
@@ -367,7 +366,7 @@ func (b *Beat) Run(ctx context.Context) error {
 	}
 
 	if b.Manager.Enabled() {
-		reloader, err := NewReloader(b.Info, b.Registry, b.newRunner)
+		reloader, err := NewReloader(b.Info, b.newRunner)
 		if err != nil {
 			return err
 		}

internal/beatcmd/beat_test.go

@@ -125,6 +125,10 @@ func TestUnmanagedOutputRequired(t *testing.T) {
 }
 
 func TestRunManager(t *testing.T) {
+	oldRegistry := reload.RegisterV2
+	defer func() { reload.RegisterV2 = oldRegistry }()
+	reload.RegisterV2 = reload.NewRegistry()
+
 	// Register our own mock management implementation.
 	manager := newMockManager()
 	management.SetManagerFactory(func(cfg *config.C, registry *reload.Registry) (management.Manager, error) {
@@ -147,20 +151,20 @@ func TestRunManager(t *testing.T) {
 	expectEvent(t, manager.started, "manager should have been started")
 	expectNoEvent(t, manager.stopped, "manager should not have been stopped")
 
-	err := b.Registry.GetInputList().Reload([]*reload.ConfigWithMeta{{
+	err := reload.RegisterV2.GetInputList().Reload([]*reload.ConfigWithMeta{{
 		Config: config.MustNewConfigFrom(`{
 			"revision": 1,
 			"apm-server.host": "localhost:1234"
 		}`),
 	}})
 	assert.NoError(t, err)
-	err = b.Registry.GetReloadableOutput().Reload(&reload.ConfigWithMeta{
+	err = reload.RegisterV2.GetReloadableOutput().Reload(&reload.ConfigWithMeta{
 		Config: config.MustNewConfigFrom(`{"console.enabled": true}`),
 	})
 	assert.NoError(t, err)
 
 	expectRunnerParams(t, calls)
-	err = b.Registry.GetReloadableAPM().Reload(&reload.ConfigWithMeta{
+	err = reload.RegisterV2.GetReloadableAPM().Reload(&reload.ConfigWithMeta{
 		Config: config.MustNewConfigFrom(`{"elastic.enabled": true, "elastic.environment": "testenv"}`),
 	})
 	assert.NoError(t, err)
@@ -232,6 +236,9 @@ func resetGlobals() {
 			registry.Clear()
 		}
 	}
+
+	// Create a new reload registry, as the Beat.Run method will register with it.
+	reload.RegisterV2 = reload.NewRegistry()
 }
 
 type runnerFunc func(ctx context.Context) error

internal/beatcmd/reloader.go

@@ -58,20 +58,20 @@ type Runner interface {
 
 // NewReloader returns a new Reloader which creates Runners using the provided
 // beat.Info and NewRunnerFunc.
-func NewReloader(info beat.Info, registry *reload.Registry, newRunner NewRunnerFunc) (*Reloader, error) {
+func NewReloader(info beat.Info, newRunner NewRunnerFunc) (*Reloader, error) {
 	r := &Reloader{
 		info:      info,
 		logger:    logp.NewLogger(""),
 		newRunner: newRunner,
 		stopped:   make(chan struct{}),
 	}
-	if err := registry.RegisterList(reload.InputRegName, reloadableListFunc(r.reloadInputs)); err != nil {
+	if err := reload.RegisterV2.RegisterList(reload.InputRegName, reloadableListFunc(r.reloadInputs)); err != nil {
 		return nil, fmt.Errorf("failed to register inputs reloader: %w", err)
 	}
-	if err := registry.Register(reload.OutputRegName, reload.ReloadableFunc(r.reloadOutput)); err != nil {
+	if err := reload.RegisterV2.Register(reload.OutputRegName, reload.ReloadableFunc(r.reloadOutput)); err != nil {
 		return nil, fmt.Errorf("failed to register output reloader: %w", err)
 	}
-	if err := registry.Register(reload.APMRegName, reload.ReloadableFunc(r.reloadAPMTracing)); err != nil {
+	if err := reload.RegisterV2.Register(reload.APMRegName, reload.ReloadableFunc(r.reloadAPMTracing)); err != nil {
 		return nil, fmt.Errorf("failed to register apm tracing reloader: %w", err)
 	}
 	return r, nil

internal/beatcmd/reloader_test.go

@@ -33,6 +33,10 @@ import (
 )
 
 func TestReloader(t *testing.T) {
+	oldRegistry := reload.RegisterV2
+	defer func() { reload.RegisterV2 = oldRegistry }()
+	reload.RegisterV2 = reload.NewRegistry()
+
 	type runner struct {
 		running chan struct{}
 		stopped chan struct{}
@@ -55,9 +59,7 @@ func TestReloader(t *testing.T) {
 		panic("unreachable")
 	}
 
-	registry := reload.NewRegistry()
-
-	reloader, err := NewReloader(beat.Info{}, registry, func(args RunnerParams) (Runner, error) {
+	reloader, err := NewReloader(beat.Info{}, func(args RunnerParams) (Runner, error) {
 		if shouldError, _ := args.Config.Bool("error", -1); shouldError {
 			return nil, errors.New("no runner for you")
 		}
@@ -84,29 +86,29 @@ func TestReloader(t *testing.T) {
 	// No reload until there's input, output, apm tracing configuration.
 	assertNoReload()
 
-	err = registry.GetInputList().Reload([]*reload.ConfigWithMeta{{
+	err = reload.RegisterV2.GetInputList().Reload([]*reload.ConfigWithMeta{{
 		Config: config.MustNewConfigFrom(`{}`),
 	}})
 	assert.EqualError(t, err, "failed to extract input config revision: missing field accessing 'revision'")
 	assertNoReload()
 
-	err = registry.GetInputList().Reload([]*reload.ConfigWithMeta{{
+	err = reload.RegisterV2.GetInputList().Reload([]*reload.ConfigWithMeta{{
 		Config: config.MustNewConfigFrom(`{"revision": 1}`),
 	}})
 	assert.NoError(t, err)
 	assertNoReload()
 
-	err = registry.GetReloadableOutput().Reload(&reload.ConfigWithMeta{
+	err = reload.RegisterV2.GetReloadableOutput().Reload(&reload.ConfigWithMeta{
 		Config: config.MustNewConfigFrom(`{}`),
 	})
 	assert.NoError(t, err)
 	assertNoReload() // an output must be set
 
-	err = registry.GetReloadableAPM().Reload(nil)
+	err = reload.RegisterV2.GetReloadableAPM().Reload(nil)
 	assert.NoError(t, err)
 	assertNoReload()
 
-	err = registry.GetReloadableOutput().Reload(&reload.ConfigWithMeta{
+	err = reload.RegisterV2.GetReloadableOutput().Reload(&reload.ConfigWithMeta{
 		Config: config.MustNewConfigFrom(`{"console.enabled": true}`),
 	})
 	assert.NoError(t, err)
@@ -116,14 +118,14 @@ func TestReloader(t *testing.T) {
 	expectEvent(t, r1.running, "runner should have been started")
 	expectNoEvent(t, r1.stopped, "runner should not have been stopped")
 
-	err = registry.GetInputList().Reload([]*reload.ConfigWithMeta{{
+	err = reload.RegisterV2.GetInputList().Reload([]*reload.ConfigWithMeta{{
 		Config: config.MustNewConfigFrom(`{"revision": 2, "error": true}`),
 	}})
 	assert.EqualError(t, err, "failed to load input config: no runner for you")
 	assertNoReload() // error occurred during reload, nothing changes
 	expectNoEvent(t, r1.stopped, "runner should not have been stopped")
 
-	err = registry.GetInputList().Reload([]*reload.ConfigWithMeta{{
+	err = reload.RegisterV2.GetInputList().Reload([]*reload.ConfigWithMeta{{
 		Config: config.MustNewConfigFrom(`{"revision": 3}`),
 	}})
 	assert.NoError(t, err)
@@ -132,7 +134,7 @@ func TestReloader(t *testing.T) {
 	expectEvent(t, r2.running, "new runner should have been started")
 	expectNoEvent(t, r2.stopped, "new runner should not have been stopped")
 
-	err = registry.GetReloadableAPM().Reload(&reload.ConfigWithMeta{
+	err = reload.RegisterV2.GetReloadableAPM().Reload(&reload.ConfigWithMeta{
 		Config: config.MustNewConfigFrom(`{"elastic.enabled": true, "elastic.api_key": "boo"}`),
 	})
 	assert.NoError(t, err)
@@ -146,11 +148,13 @@ func TestReloader(t *testing.T) {
 }
 
 func TestReloaderNewRunnerParams(t *testing.T) {
-	registry := reload.NewRegistry()
+	oldRegistry := reload.RegisterV2
+	defer func() { reload.RegisterV2 = oldRegistry }()
+	reload.RegisterV2 = reload.NewRegistry()
 
 	calls := make(chan RunnerParams, 1)
 	info := beat.Info{Beat: "not-apm-server", Version: "0.0.1"}
-	reloader, err := NewReloader(info, registry, func(args RunnerParams) (Runner, error) {
+	reloader, err := NewReloader(info, func(args RunnerParams) (Runner, error) {
 		calls <- args
 		return runnerFunc(func(ctx context.Context) error {
 			<-ctx.Done()
@@ -165,18 +169,18 @@ func TestReloaderNewRunnerParams(t *testing.T) {
 	defer func() { assert.NoError(t, g.Wait()) }()
 	defer cancel()
 
-	registry.GetInputList().Reload([]*reload.ConfigWithMeta{{
+	reload.RegisterV2.GetInputList().Reload([]*reload.ConfigWithMeta{{
 		Config: config.MustNewConfigFrom(`{"revision": 1, "input": 123}`),
 	}})
 
 	// reloader will wait until input and output are available.
 	// triggering APM reload before output reload will let the params to contain
 	// the apm tracing config too in this test setup
-	registry.GetReloadableAPM().Reload(&reload.ConfigWithMeta{
+	reload.RegisterV2.GetReloadableAPM().Reload(&reload.ConfigWithMeta{
 		Config: config.MustNewConfigFrom(`{"elastic.environment": "test"}`),
 	})
 
-	registry.GetReloadableOutput().Reload(&reload.ConfigWithMeta{
+	reload.RegisterV2.GetReloadableOutput().Reload(&reload.ConfigWithMeta{
 		Config: config.MustNewConfigFrom(`{"console.enabled": true}`),
 	})
 	args := <-calls

internal/beater/middleware/log_middleware.go

@@ -20,7 +20,7 @@ package middleware
 import (
 	"time"
 
-	"github.com/gofrs/uuid/v5"
+	"github.com/gofrs/uuid"
 
 	"go.elastic.co/apm/v2"
 

systemtest/monitoring_test.go

@@ -141,7 +141,7 @@ func getBeatsMonitoring(t testing.TB, srv *apmservertest.Server, type_ string, o
 		espoll.TermQuery{Field: type_ + ".beat.uuid", Value: srv.BeatUUID},
 	).WithSort("timestamp:desc")
 	if _, err := req.Do(context.Background(), &result, espoll.WithCondition(result.Hits.MinHitsCondition(1))); err != nil {
-		t.Fatal(err)
+		t.Error(err)
 	}
 
 	var doc beatsMonitoringDoc

x-pack/apm-server/main.go

@@ -12,7 +12,7 @@ import (
 	"sync"
 
 	"github.com/dgraph-io/badger/v2"
-	"github.com/gofrs/uuid/v5"
+	"github.com/gofrs/uuid"
 	"golang.org/x/sync/errgroup"
 
 	"github.com/elastic/beats/v7/libbeat/common/reload"

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

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gofrs/uuid/v5"
+	"github.com/gofrs/uuid"
 
 	"github.com/elastic/apm-data/model/modelpb"
 	"github.com/elastic/apm-server/x-pack/apm-server/sampling/eventstorage"