Skip to content
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.

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

[connector/routing] Change default value of 'match_once' to true. #36884

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
Next Next commit
[connector/routing] Change default value of 'match_once' to true.
  • Loading branch information
djaglowski committed Dec 18, 2024
commit f8b91a3bf23c35bb177704812b331433d1e1b9e1
27 changes: 27 additions & 0 deletions .chloggen/routing-deprecation-step2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# 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. filelogreceiver)
component: routingconnector

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Change default value of `match_once` parameter to `true`.

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [29882]

# (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: This field was deprecated in v0.116.0 and will be removed in v0.120.0.

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# 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: []
3 changes: 3 additions & 0 deletions connector/routingconnector/config_test.go
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@ func TestLoadConfig(t *testing.T) {
configPath: filepath.Join("testdata", "config", "traces.yaml"),
id: component.NewIDWithName(metadata.Type, ""),
expected: &Config{
MatchOnce: true,
DefaultPipelines: []pipeline.ID{
pipeline.NewIDWithName(pipeline.SignalTraces, "otlp-all"),
},
@@ -52,6 +53,7 @@ func TestLoadConfig(t *testing.T) {
configPath: filepath.Join("testdata", "config", "metrics.yaml"),
id: component.NewIDWithName(metadata.Type, ""),
expected: &Config{
MatchOnce: true,
DefaultPipelines: []pipeline.ID{
pipeline.NewIDWithName(pipeline.SignalMetrics, "otlp-all"),
},
@@ -77,6 +79,7 @@ func TestLoadConfig(t *testing.T) {
configPath: filepath.Join("testdata", "config", "logs.yaml"),
id: component.NewIDWithName(metadata.Type, ""),
expected: &Config{
MatchOnce: true,
DefaultPipelines: []pipeline.ID{
pipeline.NewIDWithName(pipeline.SignalLogs, "otlp-all"),
},
1 change: 1 addition & 0 deletions connector/routingconnector/factory.go
Original file line number Diff line number Diff line change
@@ -31,6 +31,7 @@ func NewFactory() connector.Factory {
func createDefaultConfig() component.Config {
return &Config{
ErrorMode: ottl.PropagateError,
MatchOnce: true,
}
}

3 changes: 1 addition & 2 deletions connector/routingconnector/logs.go
Original file line number Diff line number Diff line change
@@ -35,9 +35,8 @@ func newLogsConnector(
) (*logsConnector, error) {
cfg := config.(*Config)

// TODO update log from warning to error in v0.116.0
if !cfg.MatchOnce {
set.Logger.Warn("The 'match_once' field has been deprecated. Set to 'true' to suppress this warning.")
set.Logger.Error("The 'match_once' field has been deprecated and will be removed in v0.120.0. Remove usage of the parameter to suppress this warning.")
}

lr, ok := logs.(connector.LogsRouterAndConsumer)
3 changes: 1 addition & 2 deletions connector/routingconnector/metrics.go
Original file line number Diff line number Diff line change
@@ -36,9 +36,8 @@ func newMetricsConnector(
) (*metricsConnector, error) {
cfg := config.(*Config)

// TODO update log from warning to error in v0.116.0
if !cfg.MatchOnce {
set.Logger.Warn("The 'match_once' field has been deprecated. Set to 'true' to suppress this warning.")
set.Logger.Error("The 'match_once' field has been deprecated and will be removed in v0.120.0. Remove usage of the parameter to suppress this warning.")
}

mr, ok := metrics.(connector.MetricsRouterAndConsumer)
3 changes: 1 addition & 2 deletions connector/routingconnector/traces.go
Original file line number Diff line number Diff line change
@@ -35,9 +35,8 @@ func newTracesConnector(
) (*tracesConnector, error) {
cfg := config.(*Config)

// TODO update log from warning to error in v0.116.0
if !cfg.MatchOnce {
set.Logger.Warn("The 'match_once' field has been deprecated. Set to 'true' to suppress this warning.")
set.Logger.Error("The 'match_once' field has been deprecated and will be removed in v0.120.0. Remove usage of the parameter to suppress this warning.")
}

tr, ok := traces.(connector.TracesRouterAndConsumer)
Loading