From 36078defc1e627fa6f790fe155088667634238a4 Mon Sep 17 00:00:00 2001 From: Dustin Long Date: Tue, 31 Mar 2026 13:04:36 -0400 Subject: [PATCH] Use nodetreemodel by default, instead of viper Reapplying #48242 after the e2e tests have been fixed --- pkg/config/create/new.go | 10 +++++----- pkg/config/create/new_test.go | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/config/create/new.go b/pkg/config/create/new.go index de210aee0108..cdcde8d4ce93 100644 --- a/pkg/config/create/new.go +++ b/pkg/config/create/new.go @@ -29,7 +29,7 @@ import ( // - "": 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 { @@ -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 } diff --git a/pkg/config/create/new_test.go b/pkg/config/create/new_test.go index 19b14a5f50be..bf8e6fcd762f 100644 --- a/pkg/config/create/new_test.go +++ b/pkg/config/create/new_test.go @@ -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()) @@ -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 @@ -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()) @@ -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", "") @@ -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 @@ -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", "") @@ -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", "")