From b6684c89ef84a7c0487b89df9fb00c5227d8e7ca Mon Sep 17 00:00:00 2001 From: Andrii Klymenko Date: Mon, 1 Sep 2025 22:10:46 +0300 Subject: [PATCH 1/3] Check if ua.inputs is not specified --- .../agenthealth/handler/useragent/useragent_test.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/extension/agenthealth/handler/useragent/useragent_test.go b/extension/agenthealth/handler/useragent/useragent_test.go index 05de1dbbf1..48683ecc5d 100644 --- a/extension/agenthealth/handler/useragent/useragent_test.go +++ b/extension/agenthealth/handler/useragent/useragent_test.go @@ -128,6 +128,9 @@ func TestEmf(t *testing.T) { }, } ua := newUserAgent() + if len(ua.inputs) == 0 { + ua.isRoot = false + } ua.SetComponents(otelCfg, &telegraf.Config{}) assert.Len(t, ua.inputs, 2) assert.Len(t, ua.processors, 0) @@ -154,6 +157,9 @@ func TestMissingEmfExporterConfig(t *testing.T) { }, } ua := newUserAgent() + if len(ua.inputs) == 0 { + ua.isRoot = false + } ua.SetComponents(otelCfg, &telegraf.Config{}) assert.Len(t, ua.inputs, 2) assert.Len(t, ua.processors, 0) @@ -198,6 +204,9 @@ func TestJmx(t *testing.T) { }, } ua := newUserAgent() + if len(ua.inputs) == 0 { + ua.isRoot = false + } ua.SetComponents(otelCfg, &telegraf.Config{}) assert.Len(t, ua.inputs, 5) assert.Len(t, ua.processors, 0) From 9c567c02cb4193b8496a6414b5a2c7bb667a11c2 Mon Sep 17 00:00:00 2001 From: Andrii Klymenko Date: Mon, 1 Sep 2025 22:16:31 +0300 Subject: [PATCH 2/3] Check if ua.inputs is empty --- extension/agenthealth/handler/useragent/useragent.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extension/agenthealth/handler/useragent/useragent.go b/extension/agenthealth/handler/useragent/useragent.go index 152a3b6e6d..38660f630a 100644 --- a/extension/agenthealth/handler/useragent/useragent.go +++ b/extension/agenthealth/handler/useragent/useragent.go @@ -127,6 +127,8 @@ func (ua *userAgent) SetComponents(otelCfg *otelcol.Config, telegrafCfg *telegra if !ua.isRoot { ua.inputs.Add(flagRunAsUser) + } else if len(ua.inputs) == 0 { + ua.inputs.Add(flagRunAsUser) } ua.inputsStr.Store(componentsStr(typeInputs, ua.inputs)) From bdc11b4ddc7a93696f8055dc462ee7df4ebba3a3 Mon Sep 17 00:00:00 2001 From: Andrii Klymenko Date: Mon, 1 Sep 2025 22:42:49 +0300 Subject: [PATCH 3/3] Better formatting --- extension/agenthealth/handler/useragent/useragent_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/agenthealth/handler/useragent/useragent_test.go b/extension/agenthealth/handler/useragent/useragent_test.go index 48683ecc5d..d6efb43b13 100644 --- a/extension/agenthealth/handler/useragent/useragent_test.go +++ b/extension/agenthealth/handler/useragent/useragent_test.go @@ -129,7 +129,7 @@ func TestEmf(t *testing.T) { } ua := newUserAgent() if len(ua.inputs) == 0 { - ua.isRoot = false + ua.isRoot = false } ua.SetComponents(otelCfg, &telegraf.Config{}) assert.Len(t, ua.inputs, 2)