@@ -15,18 +15,6 @@ import (
1515 "go.opentelemetry.io/collector/otelcol"
1616)
1717
18- // LoadConfigWithSettings loads a config.Config from the provider settings, and does NOT validate the configuration.
19- //
20- // Deprecated: [v0.104.0] Use LoadConfig instead
21- func LoadConfigWithSettings (factories otelcol.Factories , set otelcol.ConfigProviderSettings ) (* otelcol.Config , error ) {
22- // Read yaml config from file
23- provider , err := otelcol .NewConfigProvider (set )
24- if err != nil {
25- return nil , err
26- }
27- return provider .Get (context .Background (), factories )
28- }
29-
3018// LoadConfig loads a config.Config from file, and does NOT validate the configuration.
3119func LoadConfig (fileName string , factories otelcol.Factories ) (* otelcol.Config , error ) {
3220 provider , err := otelcol .NewConfigProvider (otelcol.ConfigProviderSettings {
@@ -47,17 +35,6 @@ func LoadConfig(fileName string, factories otelcol.Factories) (*otelcol.Config,
4735 return provider .Get (context .Background (), factories )
4836}
4937
50- // LoadConfigAndValidateWithSettings loads a config from the provider settings, and validates the configuration.
51- //
52- // Deprecated: [v0.104.0] Use LoadConfigAndValidate instead
53- func LoadConfigAndValidateWithSettings (factories otelcol.Factories , set otelcol.ConfigProviderSettings ) (* otelcol.Config , error ) {
54- cfg , err := LoadConfigWithSettings (factories , set )
55- if err != nil {
56- return nil , err
57- }
58- return cfg , cfg .Validate ()
59- }
60-
6138// LoadConfigAndValidate loads a config from the file, and validates the configuration.
6239func LoadConfigAndValidate (fileName string , factories otelcol.Factories ) (* otelcol.Config , error ) {
6340 cfg , err := LoadConfig (fileName , factories )
0 commit comments