diff --git a/.chloggen/routing-deprecation-step2.yaml b/.chloggen/routing-deprecation-step2.yaml new file mode 100644 index 000000000000..3337d44788ab --- /dev/null +++ b/.chloggen/routing-deprecation-step2.yaml @@ -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: [] diff --git a/connector/routingconnector/config_test.go b/connector/routingconnector/config_test.go index 7356804005d8..4e001ed6bd7f 100644 --- a/connector/routingconnector/config_test.go +++ b/connector/routingconnector/config_test.go @@ -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"), }, diff --git a/connector/routingconnector/factory.go b/connector/routingconnector/factory.go index ad4bc4a23fb4..aaa569cb72b9 100644 --- a/connector/routingconnector/factory.go +++ b/connector/routingconnector/factory.go @@ -31,6 +31,7 @@ func NewFactory() connector.Factory { func createDefaultConfig() component.Config { return &Config{ ErrorMode: ottl.PropagateError, + MatchOnce: true, } } diff --git a/connector/routingconnector/logs.go b/connector/routingconnector/logs.go index d488ae79fc65..1c8d1923247a 100644 --- a/connector/routingconnector/logs.go +++ b/connector/routingconnector/logs.go @@ -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) diff --git a/connector/routingconnector/metrics.go b/connector/routingconnector/metrics.go index dfb45c953352..51f08f5ff2d4 100644 --- a/connector/routingconnector/metrics.go +++ b/connector/routingconnector/metrics.go @@ -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) diff --git a/connector/routingconnector/traces.go b/connector/routingconnector/traces.go index aadac9615264..a8824a16a491 100644 --- a/connector/routingconnector/traces.go +++ b/connector/routingconnector/traces.go @@ -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)