Skip to content

Commit 340afdd

Browse files
[updatecli] Update to elastic/beats@2dbb60663c8e (#14865)
* chore: Update to elastic/beats@2dbb60663c8e Made with ❤️️ by updatecli * Update test as bug is fixed --------- Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Co-authored-by: Carson Ip <[email protected]>
1 parent 5b0a27f commit 340afdd

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

NOTICE.txt

Lines changed: 2 additions & 2 deletions
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.20241206144113-b1cc7c5d755e
576+
Version: v7.0.0-alpha2.0.20241209145558-2dbb60663c8e
577577
Licence type (autodetected): Elastic
578578
--------------------------------------------------------------------------------
579579

580-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20241206144113-b1cc7c5d755e/LICENSE.txt:
580+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20241209145558-2dbb60663c8e/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

go.mod

Lines changed: 1 addition & 1 deletion
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.14.2
11-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241206144113-b1cc7c5d755e
11+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241209145558-2dbb60663c8e
1212
github.com/elastic/elastic-agent-client/v7 v7.17.0
1313
github.com/elastic/elastic-agent-libs v0.17.4
1414
github.com/elastic/elastic-agent-system-metrics v0.11.4

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ github.com/elastic/apm-aggregation v1.1.0 h1:eTHGd5w99JoRFJ763MJP6nUX4hkkeSil3KW
134134
github.com/elastic/apm-aggregation v1.1.0/go.mod h1:YBQ77Jt7vOy2/7w4q5SsEifhc0V02dJxRcyyeC6HsvQ=
135135
github.com/elastic/apm-data v1.14.2 h1:xRWGMcDyTAF6e8Tn7sAIrxS23rjTTD8xvU1j8Z6ik3Y=
136136
github.com/elastic/apm-data v1.14.2/go.mod h1:22zDuMPEHyEbfDrTVkgdwjoYph7gIhVelGFhBVtezeA=
137-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241206144113-b1cc7c5d755e h1:jpO/383ZWi6dfJxAmAWJYK8ODBWNrQvzCYGiHTtzaZ4=
138-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241206144113-b1cc7c5d755e/go.mod h1:vMP+1waPKY3pwwp6rDNkej84k91VuejgpsfZ4dYNNjE=
137+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241209145558-2dbb60663c8e h1:jgmZtR3XjYGQj8UE1j4jPdB5cdInlJ5exeXd5uIKdHU=
138+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241209145558-2dbb60663c8e/go.mod h1:FyVoWNdi9A85gOud6qreNDz0P8dUKNZhklLeLIw1STg=
139139
github.com/elastic/elastic-agent-autodiscover v0.9.0 h1:+iWIKh0u3e8I+CJa3FfWe9h0JojNasPgYIA47gpuuns=
140140
github.com/elastic/elastic-agent-autodiscover v0.9.0/go.mod h1:5iUxLHhVdaGSWYTveSwfJEY4RqPXTG13LPiFoxcpFd4=
141141
github.com/elastic/elastic-agent-client/v7 v7.17.0 h1:TPLrEHF4kJ3RkmQzZPffrniY4WeW4vriHZbOAzM1hFo=

internal/beatcmd/beat_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -332,10 +332,7 @@ func TestRunManager_Reloader(t *testing.T) {
332332
require.NoError(t, err)
333333

334334
assert.Eventually(t, func() bool {
335-
// TODO(carsonip): There's a bug in EA manager causing an extra reload even if apm tracing config did not change
336-
// see https://github.com/elastic/apm-server/issues/14580.
337-
//return runCount.Load() == 2 && stopCount.Load() == 2
338-
return runCount.Load() == 3 && stopCount.Load() == 3
335+
return runCount.Load() == 2 && stopCount.Load() == 2
339336
}, 2*time.Second, 50*time.Millisecond)
340337
}
341338

0 commit comments

Comments
 (0)