Skip to content

Commit 46e4380

Browse files
authored
[otelcoltest] remove deprecated functions (#10512)
1 parent 2a547be commit 46e4380

File tree

2 files changed

+25
-23
lines changed

2 files changed

+25
-23
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: otelcoltest
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Remove deprecated methods `LoadConfigWithSettings` and `LoadConfigAndValidateWithSettings`
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [10512]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: [api]

otelcol/otelcoltest/config.go

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -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.
3119
func 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.
6239
func LoadConfigAndValidate(fileName string, factories otelcol.Factories) (*otelcol.Config, error) {
6340
cfg, err := LoadConfig(fileName, factories)

0 commit comments

Comments
 (0)