Skip to content

Refactor config sources into provider wrapper and support all service providers #2893

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 6 commits into from
Apr 3, 2023
Merged

Refactor config sources into provider wrapper and support all service providers #2893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2e83d17
refactor config source and its provider
rmfitzpatrick Mar 29, 2023
bb134a6
forward wrapped providers to config source resolver
rmfitzpatrick Mar 31, 2023
8c35dc4
support raw confmap.Provider retrieved values
rmfitzpatrick Mar 31, 2023
0e28950
remove unnecessary previous value merging
rmfitzpatrick Mar 31, 2023
226e0c0
update configsource.Provider for clarity
rmfitzpatrick Apr 3, 2023
fea3d88
exercise both env provider types in vault test
rmfitzpatrick Apr 3, 2023
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
28 changes: 8 additions & 20 deletions cmd/otelcol/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ import (

"github.com/signalfx/splunk-otel-collector/internal/components"
"github.com/signalfx/splunk-otel-collector/internal/configconverter"
"github.com/signalfx/splunk-otel-collector/internal/configprovider"
"github.com/signalfx/splunk-otel-collector/internal/configsources"
"github.com/signalfx/splunk-otel-collector/internal/confmapprovider/configsource"
"github.com/signalfx/splunk-otel-collector/internal/confmapprovider/discovery"
"github.com/signalfx/splunk-otel-collector/internal/settings"
"github.com/signalfx/splunk-otel-collector/internal/version"
Expand Down Expand Up @@ -72,31 +71,20 @@ func main() {
log.Fatalf("failed to create discovery provider: %v", err)
}

hooks := []configprovider.Hook{configServer, dryRun}
hooks := []configsource.Hook{configServer, dryRun}
envProvider := envprovider.New()
fileProvider := fileprovider.New()
configSourceProvider := configsource.New(zap.NewNop(), hooks)
serviceConfigProvider, err := otelcol.NewConfigProvider(
otelcol.ConfigProviderSettings{
ResolverSettings: confmap.ResolverSettings{
URIs: collectorSettings.ResolverURIs(),
Providers: map[string]confmap.Provider{
discovery.PropertyScheme(): configprovider.NewConfigSourceConfigMapProvider(
discovery.PropertyProvider(), zap.NewNop(), info, hooks, configsources.Get()...,
),
discovery.ConfigDScheme(): configprovider.NewConfigSourceConfigMapProvider(
discovery.ConfigDProvider(),
zap.NewNop(), // The service logger is not available yet, setting it to Nop.
info, hooks, configsources.Get()...,
),
discovery.DiscoveryModeScheme(): configprovider.NewConfigSourceConfigMapProvider(
discovery.DiscoveryModeProvider(), zap.NewNop(), info, hooks, configsources.Get()...,
),
envProvider.Scheme(): configprovider.NewConfigSourceConfigMapProvider(
envProvider, zap.NewNop(), info, hooks, configsources.Get()...,
),
fileProvider.Scheme(): configprovider.NewConfigSourceConfigMapProvider(
fileProvider, zap.NewNop(), info, hooks, configsources.Get()...,
),
discovery.PropertyScheme(): configSourceProvider.Wrap(discovery.PropertyProvider()),
discovery.ConfigDScheme(): configSourceProvider.Wrap(discovery.ConfigDProvider()),
discovery.DiscoveryModeScheme(): configSourceProvider.Wrap(discovery.DiscoveryModeProvider()),
envProvider.Scheme(): configSourceProvider.Wrap(envProvider),
fileProvider.Scheme(): configSourceProvider.Wrap(fileProvider),
}, Converters: confMapConverters,
},
})
Expand Down
4 changes: 2 additions & 2 deletions internal/configconverter/config_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"go.opentelemetry.io/collector/confmap"
"gopkg.in/yaml.v2"

"github.com/signalfx/splunk-otel-collector/internal/configprovider"
"github.com/signalfx/splunk-otel-collector/internal/confmapprovider/configsource"
)

const (
Expand All @@ -51,7 +51,7 @@ const (
)

var _ confmap.Converter = (*ConfigServer)(nil)
var _ configprovider.Hook = (*ConfigServer)(nil)
var _ configsource.Hook = (*ConfigServer)(nil)

type ConfigServer struct {
// Use get/set methods instead of direct usage
Expand Down
4 changes: 2 additions & 2 deletions internal/configconverter/dry_run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
"go.opentelemetry.io/collector/confmap"
"gopkg.in/yaml.v2"

"github.com/signalfx/splunk-otel-collector/internal/configprovider"
"github.com/signalfx/splunk-otel-collector/internal/confmapprovider/configsource"
)

var _ confmap.Converter = (*DryRun)(nil)
var _ configprovider.Hook = (*DryRun)(nil)
var _ configsource.Hook = (*DryRun)(nil)

type DryRun struct {
*sync.Mutex
Expand Down
49 changes: 0 additions & 49 deletions internal/configprovider/builder.go
View file
Open in desktop

This file was deleted.

138 changes: 0 additions & 138 deletions internal/configprovider/builder_test.go
View file
Open in desktop

This file was deleted.

51 changes: 0 additions & 51 deletions internal/configprovider/component.go
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions internal/configprovider/config.go
View file
Open in desktop

This file was deleted.

Loading