Skip to content

Make converter optional #28536

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
merged 5 commits into from
Aug 22, 2024
Merged

Make converter optional #28536

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
718197b
Make converter optional
mackjmr Aug 19, 2024
17ea3f9
use getBool and add test
mackjmr Aug 19, 2024
ab9502a
fix test
mackjmr Aug 20, 2024
65e908f
fix test
mackjmr Aug 20, 2024
356a2ae
lint
mackjmr Aug 20, 2024
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
8 changes: 6 additions & 2 deletions comp/otelcol/collector/impl/collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -127,7 +129,9 @@ func NewComponent(reqs Requires) (Provides, error) {
}
addFactories(reqs, factories)

err = reqs.ConfigStore.AddConfigs(newConfigProviderSettings(reqs, false), newConfigProviderSettings(reqs, true), factories)
converterEnabled := reqs.Config.Get("otelcollector.converter.enabled").(bool)

err = reqs.ConfigStore.AddConfigs(newConfigProviderSettings(reqs, false), newConfigProviderSettings(reqs, converterEnabled), factories)
if err != nil {
return Provides{}, err
}
Expand All @@ -148,7 +152,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 {
Expand Down
1 change: 1 addition & 0 deletions pkg/config/setup/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,6 +837,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)
Expand Down
Loading