diff --git a/NOTICE.txt b/NOTICE.txt index e3182c20ba1..4810badbd07 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.14. -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20241206144113-b1cc7c5d755e +Version: v7.0.0-alpha2.0.20241209145558-2dbb60663c8e Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20241206144113-b1cc7c5d755e/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20241209145558-2dbb60663c8e/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 diff --git a/go.mod b/go.mod index b981660fc86..2a924a48072 100644 --- a/go.mod +++ b/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.14.2 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241206144113-b1cc7c5d755e + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241209145558-2dbb60663c8e github.com/elastic/elastic-agent-client/v7 v7.17.0 github.com/elastic/elastic-agent-libs v0.17.4 github.com/elastic/elastic-agent-system-metrics v0.11.4 diff --git a/go.sum b/go.sum index b1429c6e4cd..54b34d4e0f0 100644 --- a/go.sum +++ b/go.sum @@ -134,8 +134,8 @@ 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.14.2 h1:xRWGMcDyTAF6e8Tn7sAIrxS23rjTTD8xvU1j8Z6ik3Y= github.com/elastic/apm-data v1.14.2/go.mod h1:22zDuMPEHyEbfDrTVkgdwjoYph7gIhVelGFhBVtezeA= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241206144113-b1cc7c5d755e h1:jpO/383ZWi6dfJxAmAWJYK8ODBWNrQvzCYGiHTtzaZ4= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241206144113-b1cc7c5d755e/go.mod h1:vMP+1waPKY3pwwp6rDNkej84k91VuejgpsfZ4dYNNjE= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241209145558-2dbb60663c8e h1:jgmZtR3XjYGQj8UE1j4jPdB5cdInlJ5exeXd5uIKdHU= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241209145558-2dbb60663c8e/go.mod h1:FyVoWNdi9A85gOud6qreNDz0P8dUKNZhklLeLIw1STg= github.com/elastic/elastic-agent-autodiscover v0.9.0 h1:+iWIKh0u3e8I+CJa3FfWe9h0JojNasPgYIA47gpuuns= github.com/elastic/elastic-agent-autodiscover v0.9.0/go.mod h1:5iUxLHhVdaGSWYTveSwfJEY4RqPXTG13LPiFoxcpFd4= github.com/elastic/elastic-agent-client/v7 v7.17.0 h1:TPLrEHF4kJ3RkmQzZPffrniY4WeW4vriHZbOAzM1hFo= diff --git a/internal/beatcmd/beat_test.go b/internal/beatcmd/beat_test.go index c105beee999..fca8509aa1f 100644 --- a/internal/beatcmd/beat_test.go +++ b/internal/beatcmd/beat_test.go @@ -332,10 +332,7 @@ func TestRunManager_Reloader(t *testing.T) { require.NoError(t, err) assert.Eventually(t, func() bool { - // TODO(carsonip): There's a bug in EA manager causing an extra reload even if apm tracing config did not change - // see https://github.com/elastic/apm-server/issues/14580. - //return runCount.Load() == 2 && stopCount.Load() == 2 - return runCount.Load() == 3 && stopCount.Load() == 3 + return runCount.Load() == 2 && stopCount.Load() == 2 }, 2*time.Second, 50*time.Millisecond) }