Skip to content

Use nodetreemodel by default, instead of viper #48694

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
gh-worker-dd-mergequeue-cf854d merged 4 commits into from
Apr 2, 2026
+12 −12
Merged

Use nodetreemodel by default, instead of viper #48694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36078de
Use nodetreemodel by default, instead of viper
dustmop Mar 31, 2026
7440bb3
Merge branch 'main' into dustin.long/ntm-conf-default
dustmop Apr 1, 2026
e879195
Merge branch 'main' into dustin.long/ntm-conf-default
dustmop Apr 1, 2026
52b6be3
Merge branch 'main' into dustin.long/ntm-conf-default
dustmop Apr 2, 2026
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
10 changes: 5 additions & 5 deletions pkg/config/create/new.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
// - "<Agent version>": enable NTM if the Agent has a version equal or higher than the given version. This acts has a
// minimum version for whitch to enable NTM, useful when using the same configuration across
// different agent versions.
// - other: Use viper
// - other: Use nodetreemodel
func NewConfig(name string, configLib string) model.BuildableConfig {
lib, ok := os.LookupEnv("DD_CONF_NODETREEMODEL")
if !ok {
Expand Down Expand Up @@ -58,13 +58,13 @@ func NewConfig(name string, configLib string) model.BuildableConfig {
if res >= 0 {
return nodetreemodel.NewNodeTreeConfig(name, "DD", strings.NewReplacer(".", "_")) // nolint: forbidigo // legit use case
}
} else {
// agentVersion.CompareTo didn't parse the value, it's something else
log.Warnf("unrecognized value for DD_CONF_NODETREEMODEL: %s", lib)
return viperconfig.NewViperConfig(name, "DD", strings.NewReplacer(".", "_")) // nolint: forbidigo // legit use case
}
// agentVersion.CompareTo didn't parse the value, it's something else
log.Warnf("unrecognized value for DD_CONF_NODETREEMODEL: %s", lib)
}
}

// default config implementation
return viperconfig.NewViperConfig(name, "DD", strings.NewReplacer(".", "_")) // nolint: forbidigo // legit use case
return nodetreemodel.NewNodeTreeConfig(name, "DD", strings.NewReplacer(".", "_")) // nolint: forbidigo // legit use case
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector bot Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Fall back to viper when version threshold is unparsable

With this change, any DD_CONF_NODETREEMODEL value that fails CompareTo parsing now falls through to the new default (nodetreemodel). That means a common threshold format like 7.80 (missing patch) will enable NTM even on older agents (for example 7.75.2), which defeats the documented "enable NTM only at or above this version" rollout behavior and can turn on NTM earlier than intended in production configs.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

@dustmop dustmop Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is intentional.

}
14 changes: 7 additions & 7 deletions pkg/config/create/new_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func TestCreateFromParms(t *testing.T) {
os.Unsetenv("DD_CONF_NODETREEMODEL")

m := NewConfig("test", "")
assert.Equal(t, "viper", m.GetLibType())
assert.Equal(t, "nodetreemodel", m.GetLibType())

m = NewConfig("test", "enable")
assert.Equal(t, "nodetreemodel", m.GetLibType())
Expand All @@ -34,7 +34,7 @@ func TestCreateFromParms(t *testing.T) {
assert.Equal(t, "tee", m.GetLibType())

m = NewConfig("test", "something invalid")
assert.Equal(t, "viper", m.GetLibType())
assert.Equal(t, "nodetreemodel", m.GetLibType())

defer func(orig string) {
version.AgentVersion = orig
Expand All @@ -43,7 +43,7 @@ func TestCreateFromParms(t *testing.T) {
version.AgentVersion = "7.75.2"

m = NewConfig("test", "7.75")
assert.Equal(t, "viper", m.GetLibType())
assert.Equal(t, "nodetreemodel", m.GetLibType())

m = NewConfig("test", "7.76.0")
assert.Equal(t, "viper", m.GetLibType())
Expand All @@ -70,7 +70,7 @@ func TestCreateFromEnv(t *testing.T) {
os.Unsetenv("DD_CONF_NODETREEMODEL")

m := NewConfig("test", "")
assert.Equal(t, "viper", m.GetLibType())
assert.Equal(t, "nodetreemodel", m.GetLibType())

t.Setenv("DD_CONF_NODETREEMODEL", "enable")
m = NewConfig("test", "")
Expand All @@ -86,7 +86,7 @@ func TestCreateFromEnv(t *testing.T) {

t.Setenv("DD_CONF_NODETREEMODEL", "something invalid")
m = NewConfig("test", "")
assert.Equal(t, "viper", m.GetLibType())
assert.Equal(t, "nodetreemodel", m.GetLibType())

defer func(orig string) {
version.AgentVersion = orig
Expand All @@ -96,7 +96,7 @@ func TestCreateFromEnv(t *testing.T) {

t.Setenv("DD_CONF_NODETREEMODEL", "7.75")
m = NewConfig("test", "")
assert.Equal(t, "viper", m.GetLibType())
assert.Equal(t, "nodetreemodel", m.GetLibType())

t.Setenv("DD_CONF_NODETREEMODEL", "7.76.0")
m = NewConfig("test", "")
Expand All @@ -108,7 +108,7 @@ func TestCreateFromEnv(t *testing.T) {

t.Setenv("DD_CONF_NODETREEMODEL", "7.80")
m = NewConfig("test", "")
assert.Equal(t, "viper", m.GetLibType())
assert.Equal(t, "nodetreemodel", m.GetLibType())

t.Setenv("DD_CONF_NODETREEMODEL", "6.80.0")
m = NewConfig("test", "")
Expand Down
Loading