diff --git a/internal/beatcmd/beat_test.go b/internal/beatcmd/beat_test.go index 4f71188a9d..2599647fc2 100644 --- a/internal/beatcmd/beat_test.go +++ b/internal/beatcmd/beat_test.go @@ -183,7 +183,7 @@ func TestRunManager(t *testing.T) { }, }, "instrumentation": map[string]interface{}{ - "enabled": true, + "enabled": false, "environment": "testenv", }, }, m) diff --git a/internal/beatcmd/reloader.go b/internal/beatcmd/reloader.go index fe72f86089..297fa328cc 100644 --- a/internal/beatcmd/reloader.go +++ b/internal/beatcmd/reloader.go @@ -194,8 +194,9 @@ func (r *Reloader) reload(inputConfig, outputConfig, apmTracingConfig *config.C) if err != nil { return fmt.Errorf("APM tracing config for elastic not found") } - // set enabled manually as APMConfig doesn't contain it - c.SetBool("enabled", -1, true) + // set enabled manually as APMConfig doesn't contain it. + // TODO set "enable" to true after the issue https://github.com/elastic/elastic-agent/issues/5211 gets resolved. + c.SetBool("enabled", -1, false) wrappedApmTracingConfig = config.MustNewConfigFrom(map[string]interface{}{ "instrumentation": c, }) diff --git a/internal/beatcmd/reloader_test.go b/internal/beatcmd/reloader_test.go index 0dbd88195f..83a7fb38b6 100644 --- a/internal/beatcmd/reloader_test.go +++ b/internal/beatcmd/reloader_test.go @@ -186,7 +186,7 @@ func TestReloaderNewRunnerParams(t *testing.T) { args := <-calls assert.NotNil(t, args.Logger) assert.Equal(t, info, args.Info) - assert.Equal(t, config.MustNewConfigFrom(`{"revision": 1, "input": 123, "output.console.enabled": true, "instrumentation.enabled":true, "instrumentation.environment":"test"}`), args.Config) + assert.Equal(t, config.MustNewConfigFrom(`{"revision": 1, "input": 123, "output.console.enabled": true, "instrumentation.enabled":false, "instrumentation.environment":"test"}`), args.Config) } func expectNoEvent(t testing.TB, ch <-chan struct{}, message string) {