Skip to content

[9.0] (backport #10259) [OTel] Fix CLI example to use proper syntax #10271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pickypg merged 3 commits into from
Oct 6, 2025
Merged

[9.0] (backport #10259) [OTel] Fix CLI example to use proper syntax #10271

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db19446
[OTel] Fix CLI example to use proper syntax (#10259)
pickypg Oct 2, 2025
89181f5
Merge branch '9.0' into mergify/bp/9.0/pr-10259
pickypg Oct 6, 2025
235b879
Remove tests that would require a breaking change to fix
pickypg Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/pkg/agent/cmd/otel_flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func setupOtelFlags(flags *pflag.FlagSet) {
" single location can be set per flag entry e.g. `--config=file:/path/to/first --config=file:path/to/second`.")

flags.StringArray(otelSetFlagName, []string{}, "Set arbitrary component config property. The component has to be defined in the config file and the flag"+
" has a higher precedence. Array config properties are overridden and maps are joined. Example --set=processors.batch.timeout=2s")
" has a higher precedence. Array config properties are overridden and maps are joined. Example --set \"processors::batch::timeout=2s\"")

goFlags := new(flag.FlagSet)
featuregate.GlobalRegistry().RegisterFlags(goFlags)
Expand Down
27 changes: 26 additions & 1 deletion internal/pkg/agent/cmd/validate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,26 @@ func TestValidateCommand(t *testing.T) {
[]string{filepath.Join("testdata", "otel", "otel.yml")},
false,
},
{
"otel config with set",
[]string{filepath.Join("testdata", "otel", "otel.yml"), "yaml:processors::resource::attributes: [{ key: service.name, action: insert, value: elastic-otel-test1 }]"},
false,
},
{
"otel config with set missing action field",
[]string{filepath.Join("testdata", "otel", "otel.yml"), "yaml:processors::resource::attributes: [{ key: service.name, value: elastic-otel-test2 }]"},
true,
},
{
"otel config with set missing key field",
[]string{filepath.Join("testdata", "otel", "otel.yml"), "yaml:processors::resource::attributes: [{ action: insert, value: elastic-otel-test3 }]"},
true,
},
{
"otel config with set missing key and action fields",
[]string{filepath.Join("testdata", "otel", "otel.yml"), "yaml:processors::resource::attributes: [{ value: elastic-otel-test4 }]"},
true,
},
{
"agent config",
[]string{filepath.Join("testdata", "otel", "elastic-agent.yml")},
Expand All @@ -33,7 +53,12 @@ func TestValidateCommand(t *testing.T) {
for _, tc := range tt {
t.Run(tc.Name, func(t *testing.T) {
err := validateOtelConfig(context.Background(), tc.ConfigPaths)
require.Equal(t, tc.ExpectingErr, err != nil)

if tc.ExpectingErr {
require.Error(t, err)
} else {
require.NoError(t, err)
}
})
}
}