chore: remove deprecations - update to v0.99.0

.changelog/1560.changed.txt

@@ -0,0 +1 @@
+chore: update otelcol core to v0.99.0

otelcolbuilder/cmd/collector_windows.go

@@ -15,15 +15,16 @@ 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"
 	"go.opentelemetry.io/collector/confmap/provider/fileprovider"
 	"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"
@@ -32,6 +33,8 @@ import (
 
 	"go.opentelemetry.io/collector/featuregate"
 	"go.opentelemetry.io/collector/otelcol"
+
+	"github.com/SumoLogic/sumologic-otel-collector/pkg/configprovider/globprovider"
 )
 
 type windowsService struct {
@@ -246,19 +249,18 @@ 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(),
+				globprovider.NewFactory(),
+			},
+			ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()},
 		},
 	}
 }

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()},
 		},
 	}
 }

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) {

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
 	}

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)
 	}

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

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
 	}

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{},