Skip to content

[otelcoltest] remove deprecated functions #10512

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 2 commits into from
Jul 2, 2024
Merged

[otelcoltest] remove deprecated functions #10512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8b9858
remove deprecated functions
TylerHelmuth Jul 2, 2024
44940c0
changelog
TylerHelmuth Jul 2, 2024
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
25 changes: 25 additions & 0 deletions .chloggen/remove-deprecated-methods.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: breaking

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: otelcoltest

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Remove deprecated methods `LoadConfigWithSettings` and `LoadConfigAndValidateWithSettings`

# One or more tracking issues or pull requests related to the change
issues: [10512]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [api]
23 changes: 0 additions & 23 deletions otelcol/otelcoltest/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,6 @@ import (
"go.opentelemetry.io/collector/otelcol"
)

// LoadConfigWithSettings loads a config.Config from the provider settings, and does NOT validate the configuration.
//
// Deprecated: [v0.104.0] Use LoadConfig instead
func LoadConfigWithSettings(factories otelcol.Factories, set otelcol.ConfigProviderSettings) (*otelcol.Config, error) {
// Read yaml config from file
provider, err := otelcol.NewConfigProvider(set)
if err != nil {
return nil, err
}
return provider.Get(context.Background(), factories)
}

// LoadConfig loads a config.Config from file, and does NOT validate the configuration.
func LoadConfig(fileName string, factories otelcol.Factories) (*otelcol.Config, error) {
provider, err := otelcol.NewConfigProvider(otelcol.ConfigProviderSettings{
Expand All @@ -47,17 +35,6 @@ func LoadConfig(fileName string, factories otelcol.Factories) (*otelcol.Config,
return provider.Get(context.Background(), factories)
}

// LoadConfigAndValidateWithSettings loads a config from the provider settings, and validates the configuration.
//
// Deprecated: [v0.104.0] Use LoadConfigAndValidate instead
func LoadConfigAndValidateWithSettings(factories otelcol.Factories, set otelcol.ConfigProviderSettings) (*otelcol.Config, error) {
cfg, err := LoadConfigWithSettings(factories, set)
if err != nil {
return nil, err
}
return cfg, cfg.Validate()
}

// LoadConfigAndValidate loads a config from the file, and validates the configuration.
func LoadConfigAndValidate(fileName string, factories otelcol.Factories) (*otelcol.Config, error) {
cfg, err := LoadConfig(fileName, factories)
Expand Down
Loading