From 2f23ec255f7b1029a810edebb193ef868118eb54 Mon Sep 17 00:00:00 2001 From: Katarzyna Kujawa Date: Wed, 24 Apr 2024 13:09:42 +0200 Subject: [PATCH] chore: remove deprecations - update to v0.99.0 --- .changelog/1560.changed.txt | 1 + otelcolbuilder/cmd/collector_windows.go | 23 ++++++++------- otelcolbuilder/cmd/configprovider.go | 28 +++++++++---------- pkg/configprovider/globprovider/provider.go | 4 +++ pkg/configprovider/opampprovider/provider.go | 6 +++- pkg/exporter/sumologicexporter/exporter.go | 2 +- pkg/exporter/sumologicexporter/sender_test.go | 2 +- pkg/exporter/syslogexporter/exporter.go | 2 +- pkg/extension/sumologicextension/extension.go | 2 +- 9 files changed, 38 insertions(+), 32 deletions(-) create mode 100644 .changelog/1560.changed.txt diff --git a/.changelog/1560.changed.txt b/.changelog/1560.changed.txt new file mode 100644 index 0000000000..9cb3ee85b2 --- /dev/null +++ b/.changelog/1560.changed.txt @@ -0,0 +1 @@ +chore: update otelcol core to v0.99.0 \ No newline at end of file diff --git a/otelcolbuilder/cmd/collector_windows.go b/otelcolbuilder/cmd/collector_windows.go index 1096a8092b..42b517406e 100644 --- a/otelcolbuilder/cmd/collector_windows.go +++ b/otelcolbuilder/cmd/collector_windows.go @@ -15,6 +15,9 @@ import ( "errors" "flag" "fmt" + "os" + "time" + "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/converter/expandconverter" "go.opentelemetry.io/collector/confmap/provider/envprovider" @@ -22,8 +25,6 @@ import ( "go.opentelemetry.io/collector/confmap/provider/httpprovider" "go.opentelemetry.io/collector/confmap/provider/httpsprovider" "go.opentelemetry.io/collector/confmap/provider/yamlprovider" - "os" - "time" "go.uber.org/zap" "go.uber.org/zap/zapcore" @@ -246,19 +247,17 @@ func updateSettingsUsingFlags(set *otelcol.CollectorSettings, flags *flag.FlagSe } func newDefaultConfigProviderSettings(uris []string) otelcol.ConfigProviderSettings { - converterSet := confmap.ConverterSettings{} - providerSet := confmap.ProviderSettings{} return otelcol.ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ URIs: uris, - Providers: makeMapProvidersMap( - fileprovider.NewWithSettings(providerSet), - envprovider.NewWithSettings(providerSet), - yamlprovider.NewWithSettings(providerSet), - httpprovider.NewWithSettings(providerSet), - httpsprovider.NewWithSettings(providerSet), - ), - Converters: []confmap.Converter{expandconverter.New(converterSet)}, + ProviderFactories: []confmap.ProviderFactory{ + fileprovider.NewFactory(), + envprovider.NewFactory(), + yamlprovider.NewFactory(), + httpprovider.NewFactory(), + httpsprovider.NewFactory(), + }, + ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()}, }, } } diff --git a/otelcolbuilder/cmd/configprovider.go b/otelcolbuilder/cmd/configprovider.go index 72a4a7a5ff..0bc8e6ae74 100644 --- a/otelcolbuilder/cmd/configprovider.go +++ b/otelcolbuilder/cmd/configprovider.go @@ -30,9 +30,8 @@ import ( "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/otelcol" - "github.com/SumoLogic/sumologic-otel-collector/pkg/configprovider/opampprovider" - "github.com/SumoLogic/sumologic-otel-collector/pkg/configprovider/globprovider" + "github.com/SumoLogic/sumologic-otel-collector/pkg/configprovider/opampprovider" ) // This file contains modifications to the collector settings which inject a custom config provider @@ -95,19 +94,18 @@ func NewConfigProvider(locations []string) (otelcol.ConfigProvider, error) { // for the logic we're emulating here // we only add the glob provider, everything else should be the same func NewConfigProviderSettings(locations []string) otelcol.ConfigProviderSettings { - settings := confmap.ProviderSettings{} return otelcol.ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ URIs: locations, - Providers: makeMapProvidersMap( - fileprovider.NewWithSettings(settings), - envprovider.NewWithSettings(settings), - yamlprovider.NewWithSettings(settings), - httpprovider.NewWithSettings(settings), - httpsprovider.NewWithSettings(settings), - globprovider.NewWithSettings(settings), - ), - Converters: []confmap.Converter{expandconverter.New(confmap.ConverterSettings{})}, + ProviderFactories: []confmap.ProviderFactory{ + fileprovider.NewFactory(), + envprovider.NewFactory(), + yamlprovider.NewFactory(), + httpprovider.NewFactory(), + httpsprovider.NewFactory(), + globprovider.NewFactory(), + }, + ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()}, }, } } @@ -117,9 +115,9 @@ func NewConfigProviderSettings(locations []string) otelcol.ConfigProviderSetting func NewOpAmpConfigProviderSettings(location string) otelcol.ConfigProviderSettings { return otelcol.ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ - URIs: []string{location}, - Providers: makeMapProvidersMap(opampprovider.NewWithSettings(confmap.ProviderSettings{})), - Converters: []confmap.Converter{expandconverter.New(confmap.ConverterSettings{})}, + URIs: []string{location}, + ProviderFactories: []confmap.ProviderFactory{opampprovider.NewFactory()}, + ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()}, }, } } diff --git a/pkg/configprovider/globprovider/provider.go b/pkg/configprovider/globprovider/provider.go index d61326fb5d..f755a41ced 100644 --- a/pkg/configprovider/globprovider/provider.go +++ b/pkg/configprovider/globprovider/provider.go @@ -38,6 +38,10 @@ func NewWithSettings(_ confmap.ProviderSettings) confmap.Provider { return &provider{} } +func NewFactory() confmap.ProviderFactory { + return confmap.NewProviderFactory(NewWithSettings) +} + func (fmp *provider) Retrieve(ctx context.Context, uri string, _ confmap.WatcherFunc) (*confmap.Retrieved, error) { var rawConf map[string]interface{} if !strings.HasPrefix(uri, schemePrefix) { diff --git a/pkg/configprovider/opampprovider/provider.go b/pkg/configprovider/opampprovider/provider.go index 7b96f816e9..5c80bfcbdd 100644 --- a/pkg/configprovider/opampprovider/provider.go +++ b/pkg/configprovider/opampprovider/provider.go @@ -65,6 +65,10 @@ func NewWithSettings(settings confmap.ProviderSettings) confmap.Provider { return &Provider{GlobProvider: globprovider.NewWithSettings(settings)} } +func NewFactory() confmap.ProviderFactory { + return confmap.NewProviderFactory(NewWithSettings) +} + func (p *Provider) Retrieve(ctx context.Context, configPath string, fn confmap.WatcherFunc) (*confmap.Retrieved, error) { var cfg ConfigFragment configPath = strings.TrimPrefix(configPath, "opamp:") @@ -88,7 +92,7 @@ func (p *Provider) Retrieve(ctx context.Context, configPath string, fn confmap.W if err != nil { return nil, err } - addl, err := fileprovider.NewWithSettings(confmap.ProviderSettings{}).Retrieve(ctx, "file:"+configPath, fn) + addl, err := fileprovider.NewFactory().Create(confmap.ProviderSettings{}).Retrieve(ctx, "file:"+configPath, fn) if err != nil { return nil, err } diff --git a/pkg/exporter/sumologicexporter/exporter.go b/pkg/exporter/sumologicexporter/exporter.go index 8d9e5e60a8..b0435bcc5c 100644 --- a/pkg/exporter/sumologicexporter/exporter.go +++ b/pkg/exporter/sumologicexporter/exporter.go @@ -404,7 +404,7 @@ func (se *sumologicexporter) configure(ctx context.Context) error { return fmt.Errorf("no auth extension and no endpoint specified") } - client, err := httpSettings.ToClientContext(ctx, se.host, component.TelemetrySettings{}) + client, err := httpSettings.ToClient(ctx, se.host, component.TelemetrySettings{}) if err != nil { return fmt.Errorf("failed to create HTTP Client: %w", err) } diff --git a/pkg/exporter/sumologicexporter/sender_test.go b/pkg/exporter/sumologicexporter/sender_test.go index 6cf40e49c4..5b7fd338e3 100644 --- a/pkg/exporter/sumologicexporter/sender_test.go +++ b/pkg/exporter/sumologicexporter/sender_test.go @@ -86,7 +86,7 @@ func prepareSenderTest(t *testing.T, compression configcompression.Type, cb []fu cfg.ClientConfig.Auth = nil httpSettings := cfg.ClientConfig host := componenttest.NewNopHost() - client, err := httpSettings.ToClientContext(context.TODO(), host, component.TelemetrySettings{}) + client, err := httpSettings.ToClient(context.TODO(), host, component.TelemetrySettings{}) require.NoError(t, err) if err != nil { return nil diff --git a/pkg/exporter/syslogexporter/exporter.go b/pkg/exporter/syslogexporter/exporter.go index 10cfc4afb6..53f51dca9c 100644 --- a/pkg/exporter/syslogexporter/exporter.go +++ b/pkg/exporter/syslogexporter/exporter.go @@ -36,7 +36,7 @@ type syslogexporter struct { } func initExporter(cfg *Config, createSettings exporter.CreateSettings) (*syslogexporter, error) { - tlsConfig, err := cfg.TLSSetting.LoadTLSConfig() + tlsConfig, err := cfg.TLSSetting.LoadTLSConfig(context.Background()) if err != nil { return nil, err } diff --git a/pkg/extension/sumologicextension/extension.go b/pkg/extension/sumologicextension/extension.go index 6433dbe67e..c66ec8a847 100644 --- a/pkg/extension/sumologicextension/extension.go +++ b/pkg/extension/sumologicextension/extension.go @@ -303,7 +303,7 @@ func (se *SumologicExtension) getHTTPClient( ClientConfig confighttp.ClientConfig, regInfo api.OpenRegisterResponsePayload, ) (*http.Client, error) { - httpClient, err := ClientConfig.ToClientContext( + httpClient, err := ClientConfig.ToClient( ctx, se.host, component.TelemetrySettings{},