Skip to content

Commit c015652

Browse files
carsonipcarsonip
authored
Revert "feat: bump beats to latest main commit (#14146)" (#14310)
This reverts commit e258527. Unblock #14292 to fix #14280. Reverting beats instead of bumping beats to avoid #14297.
1 parent 784c45d commit c015652

18 files changed

+94
-51
lines changed

‎NOTICE.txt

+35-5
Original file line numberDiff line numberDiff line change
@@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].
573573

574574
--------------------------------------------------------------------------------
575575
Dependency : github.com/elastic/beats/v7
576-
Version: v7.0.0-alpha2.0.20240924123012-ecc521545d94
576+
Version: v7.0.0-alpha2.0.20240823193033-af33fad4d50b
577577
Licence type (autodetected): Elastic
578578
--------------------------------------------------------------------------------
579579

580-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20240924123012-ecc521545d94/LICENSE.txt:
580+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20240823193033-af33fad4d50b/LICENSE.txt:
581581

582582
Source code in this repository is variously licensed under the Apache License
583583
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.
23792379

23802380

23812381
--------------------------------------------------------------------------------
2382-
Dependency : github.com/gofrs/uuid/v5
2383-
Version: v5.3.0
2382+
Dependency : github.com/gofrs/uuid
2383+
Version: v4.4.0+incompatible
23842384
Licence type (autodetected): MIT
23852385
--------------------------------------------------------------------------------
23862386

2387-
Contents of probable licence file $GOMODCACHE/github.com/gofrs/uuid/[email protected]/LICENSE:
2387+
Contents of probable licence file $GOMODCACHE/github.com/gofrs/uuid@v4.4.0+incompatible/LICENSE:
23882388

23892389
Copyright (C) 2013-2018 by Maxim Bublis <[email protected]>
23902390

@@ -10597,6 +10597,36 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
1059710597
SOFTWARE.
1059810598

1059910599

10600+
--------------------------------------------------------------------------------
10601+
Dependency : github.com/gofrs/uuid/v5
10602+
Version: v5.2.0
10603+
Licence type (autodetected): MIT
10604+
--------------------------------------------------------------------------------
10605+
10606+
Contents of probable licence file $GOMODCACHE/github.com/gofrs/uuid/[email protected]/LICENSE:
10607+
10608+
Copyright (C) 2013-2018 by Maxim Bublis <[email protected]>
10609+
10610+
Permission is hereby granted, free of charge, to any person obtaining
10611+
a copy of this software and associated documentation files (the
10612+
"Software"), to deal in the Software without restriction, including
10613+
without limitation the rights to use, copy, modify, merge, publish,
10614+
distribute, sublicense, and/or sell copies of the Software, and to
10615+
permit persons to whom the Software is furnished to do so, subject to
10616+
the following conditions:
10617+
10618+
The above copyright notice and this permission notice shall be
10619+
included in all copies or substantial portions of the Software.
10620+
10621+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
10622+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
10623+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
10624+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
10625+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
10626+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
10627+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
10628+
10629+
1060010630
--------------------------------------------------------------------------------
1060110631
Dependency : github.com/gogo/googleapis
1060210632
Version: v1.4.1

‎go.mod

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/dustin/go-humanize v1.0.1
99
github.com/elastic/apm-aggregation v1.1.0
1010
github.com/elastic/apm-data v1.13.1
11-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240924123012-ecc521545d94
11+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240823193033-af33fad4d50b
1212
github.com/elastic/elastic-agent-client/v7 v7.16.0
1313
github.com/elastic/elastic-agent-libs v0.12.0
1414
github.com/elastic/elastic-agent-system-metrics v0.11.3
@@ -19,7 +19,7 @@ require (
1919
github.com/elastic/go-ucfg v0.8.8
2020
github.com/go-sourcemap/sourcemap v2.1.4+incompatible
2121
github.com/gofrs/flock v0.12.1
22-
github.com/gofrs/uuid/v5 v5.3.0
22+
github.com/gofrs/uuid v4.4.0+incompatible
2323
github.com/gogo/protobuf v1.3.2
2424
github.com/google/go-cmp v0.6.0
2525
github.com/gorilla/mux v1.8.1
@@ -98,6 +98,7 @@ require (
9898
github.com/go-logr/logr v1.4.2 // indirect
9999
github.com/go-logr/stdr v1.2.2 // indirect
100100
github.com/go-ole/go-ole v1.2.6 // indirect
101+
github.com/gofrs/uuid/v5 v5.2.0 // indirect
101102
github.com/gogo/googleapis v1.4.1 // indirect
102103
github.com/golang/glog v1.2.2 // indirect
103104
github.com/golang/protobuf v1.5.4 // indirect

‎go.sum

+8-6
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,10 @@ github.com/elastic/apm-aggregation v1.1.0 h1:eTHGd5w99JoRFJ763MJP6nUX4hkkeSil3KW
133133
github.com/elastic/apm-aggregation v1.1.0/go.mod h1:YBQ77Jt7vOy2/7w4q5SsEifhc0V02dJxRcyyeC6HsvQ=
134134
github.com/elastic/apm-data v1.13.1 h1:vQUWqi9H6QC4FCZ05kILkE+2BeKWw6iT+NXXyadWJm8=
135135
github.com/elastic/apm-data v1.13.1/go.mod h1:m2FSH7alN07VmtmN10KmgxAa8tgXlJDe/rC0g4FnZUI=
136-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240924123012-ecc521545d94 h1:nXkblLNf1SnW8QIUHsIJgHEFxiP4QhPqBTyC6lDks6A=
137-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240924123012-ecc521545d94/go.mod h1:HTRccLDjsAVZ12slH942u9UyEzRs35K9v+gyZS3KBA8=
138-
github.com/elastic/elastic-agent-autodiscover v0.8.2 h1:Fs2FhR33AMBPfm5/jz4drVzaEZaqOIHlDBvGtkUZdIk=
139-
github.com/elastic/elastic-agent-autodiscover v0.8.2/go.mod h1:VZnU53EVaFTxR8Xf6YsLN8FHD5DKQzHSPlKax9/4w+o=
136+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240823193033-af33fad4d50b h1:i3WdOw//Vg76Vseqxgn47GPTVqUSucAdE42jkih1ViM=
137+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240823193033-af33fad4d50b/go.mod h1:m8d3EBr2z7YvWfxRgoE7SsUNbMTpyWXi67fG7B7vn7w=
138+
github.com/elastic/elastic-agent-autodiscover v0.8.1 h1:u6TWqh7wfevu6S4GUq4SIxYBRo4b/P5RZmx/rSvT10A=
139+
github.com/elastic/elastic-agent-autodiscover v0.8.1/go.mod h1:0gzGsaDCAqBfUZjuCqqWsSI60eaZ778A5tQZV72rPV0=
140140
github.com/elastic/elastic-agent-client/v7 v7.16.0 h1:yKGq2+CxAuW8Kh0EoNl202tqAyQKfBcPRawVKs2Jve0=
141141
github.com/elastic/elastic-agent-client/v7 v7.16.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI=
142142
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
200200
github.com/go-sourcemap/sourcemap v2.1.4+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
201201
github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E=
202202
github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0=
203-
github.com/gofrs/uuid/v5 v5.3.0 h1:m0mUMr+oVYUdxpMLgSYCZiXe7PuVPnI94+OMeVBNedk=
204-
github.com/gofrs/uuid/v5 v5.3.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
203+
github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
204+
github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
205+
github.com/gofrs/uuid/v5 v5.2.0 h1:qw1GMx6/y8vhVsx626ImfKMuS5CvJmhIKKtuyvfajMM=
206+
github.com/gofrs/uuid/v5 v5.2.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
205207
github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0=
206208
github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4=
207209
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=

‎internal/beatcmd/beat.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"strings"
3232
"time"
3333

34-
"github.com/gofrs/uuid/v5"
34+
"github.com/gofrs/uuid"
3535
"go.uber.org/zap"
3636
"golang.org/x/sync/errgroup"
3737

@@ -123,7 +123,6 @@ func NewBeat(args BeatParams) (*Beat, error) {
123123
Keystore: keystore,
124124
Config: &beat.BeatConfig{Output: cfg.Output},
125125
BeatConfig: cfg.APMServer,
126-
Registry: reload.NewRegistry(),
127126
},
128127
Config: cfg,
129128
newRunner: args.NewRunner,
@@ -153,7 +152,7 @@ func (b *Beat) init() error {
153152
logp.Info("Beat ID: %v", b.Info.ID)
154153

155154
// Initialize central config manager.
156-
manager, err := management.NewManager(b.Config.Management, b.Registry)
155+
manager, err := management.NewManager(b.Config.Management, reload.RegisterV2)
157156
if err != nil {
158157
return err
159158
}
@@ -367,7 +366,7 @@ func (b *Beat) Run(ctx context.Context) error {
367366
}
368367

369368
if b.Manager.Enabled() {
370-
reloader, err := NewReloader(b.Info, b.Registry, b.newRunner)
369+
reloader, err := NewReloader(b.Info, b.newRunner)
371370
if err != nil {
372371
return err
373372
}

‎internal/beatcmd/beat_test.go

+10-3
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,10 @@ func TestUnmanagedOutputRequired(t *testing.T) {
125125
}
126126

127127
func TestRunManager(t *testing.T) {
128+
oldRegistry := reload.RegisterV2
129+
defer func() { reload.RegisterV2 = oldRegistry }()
130+
reload.RegisterV2 = reload.NewRegistry()
131+
128132
// Register our own mock management implementation.
129133
manager := newMockManager()
130134
management.SetManagerFactory(func(cfg *config.C, registry *reload.Registry) (management.Manager, error) {
@@ -147,20 +151,20 @@ func TestRunManager(t *testing.T) {
147151
expectEvent(t, manager.started, "manager should have been started")
148152
expectNoEvent(t, manager.stopped, "manager should not have been stopped")
149153

150-
err := b.Registry.GetInputList().Reload([]*reload.ConfigWithMeta{{
154+
err := reload.RegisterV2.GetInputList().Reload([]*reload.ConfigWithMeta{{
151155
Config: config.MustNewConfigFrom(`{
152156
"revision": 1,
153157
"apm-server.host": "localhost:1234"
154158
}`),
155159
}})
156160
assert.NoError(t, err)
157-
err = b.Registry.GetReloadableOutput().Reload(&reload.ConfigWithMeta{
161+
err = reload.RegisterV2.GetReloadableOutput().Reload(&reload.ConfigWithMeta{
158162
Config: config.MustNewConfigFrom(`{"console.enabled": true}`),
159163
})
160164
assert.NoError(t, err)
161165

162166
expectRunnerParams(t, calls)
163-
err = b.Registry.GetReloadableAPM().Reload(&reload.ConfigWithMeta{
167+
err = reload.RegisterV2.GetReloadableAPM().Reload(&reload.ConfigWithMeta{
164168
Config: config.MustNewConfigFrom(`{"elastic.enabled": true, "elastic.environment": "testenv"}`),
165169
})
166170
assert.NoError(t, err)
@@ -232,6 +236,9 @@ func resetGlobals() {
232236
registry.Clear()
233237
}
234238
}
239+
240+
// Create a new reload registry, as the Beat.Run method will register with it.
241+
reload.RegisterV2 = reload.NewRegistry()
235242
}
236243

237244
type runnerFunc func(ctx context.Context) error

‎internal/beatcmd/reloader.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,20 @@ type Runner interface {
5858

5959
// NewReloader returns a new Reloader which creates Runners using the provided
6060
// beat.Info and NewRunnerFunc.
61-
func NewReloader(info beat.Info, registry *reload.Registry, newRunner NewRunnerFunc) (*Reloader, error) {
61+
func NewReloader(info beat.Info, newRunner NewRunnerFunc) (*Reloader, error) {
6262
r := &Reloader{
6363
info: info,
6464
logger: logp.NewLogger(""),
6565
newRunner: newRunner,
6666
stopped: make(chan struct{}),
6767
}
68-
if err := registry.RegisterList(reload.InputRegName, reloadableListFunc(r.reloadInputs)); err != nil {
68+
if err := reload.RegisterV2.RegisterList(reload.InputRegName, reloadableListFunc(r.reloadInputs)); err != nil {
6969
return nil, fmt.Errorf("failed to register inputs reloader: %w", err)
7070
}
71-
if err := registry.Register(reload.OutputRegName, reload.ReloadableFunc(r.reloadOutput)); err != nil {
71+
if err := reload.RegisterV2.Register(reload.OutputRegName, reload.ReloadableFunc(r.reloadOutput)); err != nil {
7272
return nil, fmt.Errorf("failed to register output reloader: %w", err)
7373
}
74-
if err := registry.Register(reload.APMRegName, reload.ReloadableFunc(r.reloadAPMTracing)); err != nil {
74+
if err := reload.RegisterV2.Register(reload.APMRegName, reload.ReloadableFunc(r.reloadAPMTracing)); err != nil {
7575
return nil, fmt.Errorf("failed to register apm tracing reloader: %w", err)
7676
}
7777
return r, nil

‎internal/beatcmd/reloader_test.go

+20-16
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ import (
3333
)
3434

3535
func TestReloader(t *testing.T) {
36+
oldRegistry := reload.RegisterV2
37+
defer func() { reload.RegisterV2 = oldRegistry }()
38+
reload.RegisterV2 = reload.NewRegistry()
39+
3640
type runner struct {
3741
running chan struct{}
3842
stopped chan struct{}
@@ -55,9 +59,7 @@ func TestReloader(t *testing.T) {
5559
panic("unreachable")
5660
}
5761

58-
registry := reload.NewRegistry()
59-
60-
reloader, err := NewReloader(beat.Info{}, registry, func(args RunnerParams) (Runner, error) {
62+
reloader, err := NewReloader(beat.Info{}, func(args RunnerParams) (Runner, error) {
6163
if shouldError, _ := args.Config.Bool("error", -1); shouldError {
6264
return nil, errors.New("no runner for you")
6365
}
@@ -84,29 +86,29 @@ func TestReloader(t *testing.T) {
8486
// No reload until there's input, output, apm tracing configuration.
8587
assertNoReload()
8688

87-
err = registry.GetInputList().Reload([]*reload.ConfigWithMeta{{
89+
err = reload.RegisterV2.GetInputList().Reload([]*reload.ConfigWithMeta{{
8890
Config: config.MustNewConfigFrom(`{}`),
8991
}})
9092
assert.EqualError(t, err, "failed to extract input config revision: missing field accessing 'revision'")
9193
assertNoReload()
9294

93-
err = registry.GetInputList().Reload([]*reload.ConfigWithMeta{{
95+
err = reload.RegisterV2.GetInputList().Reload([]*reload.ConfigWithMeta{{
9496
Config: config.MustNewConfigFrom(`{"revision": 1}`),
9597
}})
9698
assert.NoError(t, err)
9799
assertNoReload()
98100

99-
err = registry.GetReloadableOutput().Reload(&reload.ConfigWithMeta{
101+
err = reload.RegisterV2.GetReloadableOutput().Reload(&reload.ConfigWithMeta{
100102
Config: config.MustNewConfigFrom(`{}`),
101103
})
102104
assert.NoError(t, err)
103105
assertNoReload() // an output must be set
104106

105-
err = registry.GetReloadableAPM().Reload(nil)
107+
err = reload.RegisterV2.GetReloadableAPM().Reload(nil)
106108
assert.NoError(t, err)
107109
assertNoReload()
108110

109-
err = registry.GetReloadableOutput().Reload(&reload.ConfigWithMeta{
111+
err = reload.RegisterV2.GetReloadableOutput().Reload(&reload.ConfigWithMeta{
110112
Config: config.MustNewConfigFrom(`{"console.enabled": true}`),
111113
})
112114
assert.NoError(t, err)
@@ -116,14 +118,14 @@ func TestReloader(t *testing.T) {
116118
expectEvent(t, r1.running, "runner should have been started")
117119
expectNoEvent(t, r1.stopped, "runner should not have been stopped")
118120

119-
err = registry.GetInputList().Reload([]*reload.ConfigWithMeta{{
121+
err = reload.RegisterV2.GetInputList().Reload([]*reload.ConfigWithMeta{{
120122
Config: config.MustNewConfigFrom(`{"revision": 2, "error": true}`),
121123
}})
122124
assert.EqualError(t, err, "failed to load input config: no runner for you")
123125
assertNoReload() // error occurred during reload, nothing changes
124126
expectNoEvent(t, r1.stopped, "runner should not have been stopped")
125127

126-
err = registry.GetInputList().Reload([]*reload.ConfigWithMeta{{
128+
err = reload.RegisterV2.GetInputList().Reload([]*reload.ConfigWithMeta{{
127129
Config: config.MustNewConfigFrom(`{"revision": 3}`),
128130
}})
129131
assert.NoError(t, err)
@@ -132,7 +134,7 @@ func TestReloader(t *testing.T) {
132134
expectEvent(t, r2.running, "new runner should have been started")
133135
expectNoEvent(t, r2.stopped, "new runner should not have been stopped")
134136

135-
err = registry.GetReloadableAPM().Reload(&reload.ConfigWithMeta{
137+
err = reload.RegisterV2.GetReloadableAPM().Reload(&reload.ConfigWithMeta{
136138
Config: config.MustNewConfigFrom(`{"elastic.enabled": true, "elastic.api_key": "boo"}`),
137139
})
138140
assert.NoError(t, err)
@@ -146,11 +148,13 @@ func TestReloader(t *testing.T) {
146148
}
147149

148150
func TestReloaderNewRunnerParams(t *testing.T) {
149-
registry := reload.NewRegistry()
151+
oldRegistry := reload.RegisterV2
152+
defer func() { reload.RegisterV2 = oldRegistry }()
153+
reload.RegisterV2 = reload.NewRegistry()
150154

151155
calls := make(chan RunnerParams, 1)
152156
info := beat.Info{Beat: "not-apm-server", Version: "0.0.1"}
153-
reloader, err := NewReloader(info, registry, func(args RunnerParams) (Runner, error) {
157+
reloader, err := NewReloader(info, func(args RunnerParams) (Runner, error) {
154158
calls <- args
155159
return runnerFunc(func(ctx context.Context) error {
156160
<-ctx.Done()
@@ -165,18 +169,18 @@ func TestReloaderNewRunnerParams(t *testing.T) {
165169
defer func() { assert.NoError(t, g.Wait()) }()
166170
defer cancel()
167171

168-
registry.GetInputList().Reload([]*reload.ConfigWithMeta{{
172+
reload.RegisterV2.GetInputList().Reload([]*reload.ConfigWithMeta{{
169173
Config: config.MustNewConfigFrom(`{"revision": 1, "input": 123}`),
170174
}})
171175

172176
// reloader will wait until input and output are available.
173177
// triggering APM reload before output reload will let the params to contain
174178
// the apm tracing config too in this test setup
175-
registry.GetReloadableAPM().Reload(&reload.ConfigWithMeta{
179+
reload.RegisterV2.GetReloadableAPM().Reload(&reload.ConfigWithMeta{
176180
Config: config.MustNewConfigFrom(`{"elastic.environment": "test"}`),
177181
})
178182

179-
registry.GetReloadableOutput().Reload(&reload.ConfigWithMeta{
183+
reload.RegisterV2.GetReloadableOutput().Reload(&reload.ConfigWithMeta{
180184
Config: config.MustNewConfigFrom(`{"console.enabled": true}`),
181185
})
182186
args := <-calls

‎internal/beater/middleware/log_middleware.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package middleware
2020
import (
2121
"time"
2222

23-
"github.com/gofrs/uuid/v5"
23+
"github.com/gofrs/uuid"
2424

2525
"go.elastic.co/apm/v2"
2626

‎systemtest/monitoring_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func getBeatsMonitoring(t testing.TB, srv *apmservertest.Server, type_ string, o
141141
espoll.TermQuery{Field: type_ + ".beat.uuid", Value: srv.BeatUUID},
142142
).WithSort("timestamp:desc")
143143
if _, err := req.Do(context.Background(), &result, espoll.WithCondition(result.Hits.MinHitsCondition(1))); err != nil {
144-
t.Fatal(err)
144+
t.Error(err)
145145
}
146146

147147
var doc beatsMonitoringDoc

‎x-pack/apm-server/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"sync"
1313

1414
"github.com/dgraph-io/badger/v2"
15-
"github.com/gofrs/uuid/v5"
15+
"github.com/gofrs/uuid"
1616
"golang.org/x/sync/errgroup"
1717

1818
"github.com/elastic/beats/v7/libbeat/common/reload"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"testing"
99
"time"
1010

11-
"github.com/gofrs/uuid/v5"
11+
"github.com/gofrs/uuid"
1212

1313
"github.com/elastic/apm-data/model/modelpb"
1414
"github.com/elastic/apm-server/x-pack/apm-server/sampling/eventstorage"

‎x-pack/apm-server/sampling/eventstorage/storage_bench_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111
"time"
1212

13-
"github.com/gofrs/uuid/v5"
13+
"github.com/gofrs/uuid"
1414
"github.com/stretchr/testify/assert"
1515

1616
"github.com/elastic/apm-data/model/modelpb"

0 commit comments

Comments
 (0)