Make converter optional (#28536)

Author: mackjmr

comp/otelcol/collector/impl/collector.go

@@ -21,6 +21,7 @@ import (
 	"go.opentelemetry.io/collector/confmap/provider/yamlprovider"
 	"go.opentelemetry.io/collector/otelcol"
 
+	"github.com/DataDog/datadog-agent/comp/core/config"
 	log "github.com/DataDog/datadog-agent/comp/core/log/def"
 	"github.com/DataDog/datadog-agent/comp/core/tagger"
 	compdef "github.com/DataDog/datadog-agent/comp/def"
@@ -59,6 +60,7 @@ type Requires struct {
 	Log                 log.Component
 	Provider            confmap.Converter
 	ConfigStore         configstore.Component
+	Config              config.Component
 	CollectorContrib    collectorcontrib.Component
 	Serializer          serializer.MetricSerializer
 	TraceAgent          traceagent.Component
@@ -127,7 +129,8 @@ func NewComponent(reqs Requires) (Provides, error) {
 	}
 	addFactories(reqs, factories)
 
-	err = reqs.ConfigStore.AddConfigs(newConfigProviderSettings(reqs, false), newConfigProviderSettings(reqs, true), factories)
+	converterEnabled := reqs.Config.GetBool("otelcollector.converter.enabled")
+	err = reqs.ConfigStore.AddConfigs(newConfigProviderSettings(reqs, false), newConfigProviderSettings(reqs, converterEnabled), factories)
 	if err != nil {
 		return Provides{}, err
 	}
@@ -148,7 +151,7 @@ func NewComponent(reqs Requires) (Provides, error) {
 		Factories: func() (otelcol.Factories, error) {
 			return factories, nil
 		},
-		ConfigProviderSettings: newConfigProviderSettings(reqs, true),
+		ConfigProviderSettings: newConfigProviderSettings(reqs, converterEnabled),
 	}
 	col, err := otelcol.NewCollector(set)
 	if err != nil {

comp/otelcol/collector/impl/collector_test.go

@@ -17,6 +17,7 @@ import (
 	collectorcontribimpl "github.com/DataDog/datadog-agent/comp/otelcol/collector-contrib/impl"
 	configstore "github.com/DataDog/datadog-agent/comp/otelcol/configstore/impl"
 	converter "github.com/DataDog/datadog-agent/comp/otelcol/converter/impl"
+	"github.com/DataDog/datadog-agent/pkg/config/setup"
 	"github.com/stretchr/testify/assert"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
 	"gopkg.in/yaml.v3"
@@ -46,8 +47,11 @@ func TestGetConfDump(t *testing.T) {
 	provider, err := converter.NewConverter()
 	assert.NoError(t, err)
 
+	conf := setup.Datadog()
+
 	reqs := Requires{
 		CollectorContrib: collectorcontribimpl.NewComponent(),
+		Config:           conf,
 		URIs:             uriFromFile("simple-dd/config.yaml"),
 		ConfigStore:      configstore,
 		Lc:               &lifecycle{},
@@ -112,3 +116,81 @@ func TestGetConfDump(t *testing.T) {
 		assert.Equal(t, expectedStringMap, actualStringMap)
 	})
 }
+
+func TestGetConfDumpConverterDisabled(t *testing.T) {
+	configstore, err := configstore.NewConfigStore()
+	assert.NoError(t, err)
+
+	provider, err := converter.NewConverter()
+	assert.NoError(t, err)
+
+	conf := setup.Datadog()
+	conf.SetWithoutSource("otelcollector.converter.enabled", false)
+
+	reqs := Requires{
+		CollectorContrib: collectorcontribimpl.NewComponent(),
+		Config:           conf,
+		URIs:             uriFromFile("simple-dd/config.yaml"),
+		ConfigStore:      configstore,
+		Lc:               &lifecycle{},
+		Provider:         provider,
+	}
+	_, err = NewComponent(reqs)
+	assert.NoError(t, err)
+
+	t.Run("provided-string", func(t *testing.T) {
+		actualString, _ := configstore.GetProvidedConfAsString()
+		actualStringMap, err := yamlBytesToMap([]byte(actualString))
+		assert.NoError(t, err)
+
+		expectedBytes, err := os.ReadFile(filepath.Join("testdata", "simple-dd", "config-provided-result.yaml"))
+		assert.NoError(t, err)
+		expectedMap, err := yamlBytesToMap(expectedBytes)
+		assert.NoError(t, err)
+
+		assert.Equal(t, expectedMap, actualStringMap)
+	})
+
+	t.Run("provided-confmap", func(t *testing.T) {
+		actualConfmap, _ := configstore.GetProvidedConf()
+		// marshal to yaml and then to map to drop the types for comparison
+		bytesConf, err := yaml.Marshal(actualConfmap.ToStringMap())
+		assert.NoError(t, err)
+		actualStringMap, err := yamlBytesToMap(bytesConf)
+		assert.NoError(t, err)
+
+		expectedMap, err := confmaptest.LoadConf("testdata/simple-dd/config-provided-result.yaml")
+		expectedStringMap := expectedMap.ToStringMap()
+		assert.NoError(t, err)
+
+		assert.Equal(t, expectedStringMap, actualStringMap)
+	})
+
+	t.Run("enhanced-string", func(t *testing.T) {
+		actualString, _ := configstore.GetEnhancedConfAsString()
+		actualStringMap, err := yamlBytesToMap([]byte(actualString))
+		assert.NoError(t, err)
+
+		expectedBytes, err := os.ReadFile(filepath.Join("testdata", "simple-dd", "config-provided-result.yaml"))
+		assert.NoError(t, err)
+		expectedMap, err := yamlBytesToMap(expectedBytes)
+		assert.NoError(t, err)
+
+		assert.Equal(t, expectedMap, actualStringMap)
+	})
+
+	t.Run("enhance-confmap", func(t *testing.T) {
+		actualConfmap, _ := configstore.GetEnhancedConf()
+		// marshal to yaml and then to map to drop the types for comparison
+		bytesConf, err := yaml.Marshal(actualConfmap.ToStringMap())
+		assert.NoError(t, err)
+		actualStringMap, err := yamlBytesToMap(bytesConf)
+		assert.NoError(t, err)
+
+		expectedMap, err := confmaptest.LoadConf("testdata/simple-dd/config-provided-result.yaml")
+		expectedStringMap := expectedMap.ToStringMap()
+		assert.NoError(t, err)
+
+		assert.Equal(t, expectedStringMap, actualStringMap)
+	})
+}

pkg/config/setup/config.go

@@ -855,6 +855,7 @@ func InitConfig(config pkgconfigmodel.Config) {
 	config.BindEnvAndSetDefault("otelcollector.extension_url", "https://localhost:7777")
 	config.BindEnvAndSetDefault("otelcollector.extension_timeout", 0)         // in seconds, 0 for default value
 	config.BindEnvAndSetDefault("otelcollector.submit_dummy_metadata", false) // dev flag - to be removed
+	config.BindEnvAndSetDefault("otelcollector.converter.enabled", true)
 
 	// inventories
 	config.BindEnvAndSetDefault("inventories_enabled", true)