From c8a54e287d2d335249776b0e6902bc19cfd2d285 Mon Sep 17 00:00:00 2001 From: Mauri de Souza Meneguzzo Date: Thu, 16 Jan 2025 16:20:12 -0300 Subject: [PATCH] [processor/logdedup] fix config validation not working The Config struct has a Validate method but it is only used in tests. Ensure we validate the configuration when creating the processor. --- .../logdedupprocessor-config-validate.yaml | 27 +++++++++++++++++++ processor/logdedupprocessor/factory.go | 4 +++ processor/logdedupprocessor/processor_test.go | 21 +++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 .chloggen/logdedupprocessor-config-validate.yaml diff --git a/.chloggen/logdedupprocessor-config-validate.yaml b/.chloggen/logdedupprocessor-config-validate.yaml new file mode 100644 index 000000000000..dcd01f95ff2d --- /dev/null +++ b/.chloggen/logdedupprocessor-config-validate.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: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: logdedupprocessor + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix config validation not working when creating a processor. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [37278] + +# (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: + +# 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: [user] diff --git a/processor/logdedupprocessor/factory.go b/processor/logdedupprocessor/factory.go index 0931e06cc176..c2c0f5e7f66b 100644 --- a/processor/logdedupprocessor/factory.go +++ b/processor/logdedupprocessor/factory.go @@ -32,6 +32,10 @@ func createLogsProcessor(_ context.Context, settings processor.Settings, cfg com return nil, fmt.Errorf("invalid config type: %+v", cfg) } + if err := processorCfg.Validate(); err != nil { + return nil, err + } + processor, err := newProcessor(processorCfg, consumer, settings) if err != nil { return nil, fmt.Errorf("error creating processor: %w", err) diff --git a/processor/logdedupprocessor/processor_test.go b/processor/logdedupprocessor/processor_test.go index 72aa5919aad7..69e953caf537 100644 --- a/processor/logdedupprocessor/processor_test.go +++ b/processor/logdedupprocessor/processor_test.go @@ -308,3 +308,24 @@ func TestProcessorConsumeMultipleConditions(t *testing.T) { err = p.Shutdown(context.Background()) require.NoError(t, err) } + +func TestProcessorConfigValidate(t *testing.T) { + t.Parallel() + invalidCfg := &Config{ + LogCountAttribute: defaultLogCountAttribute, + Interval: -1, + Timezone: "", + } + + _, err := createLogsProcessor(context.Background(), processortest.NewNopSettings(), invalidCfg, consumertest.NewNop()) + require.Error(t, err) + + validCfg := &Config{ + LogCountAttribute: defaultLogCountAttribute, + Interval: defaultInterval, + Timezone: defaultTimezone, + } + + _, err = createLogsProcessor(context.Background(), processortest.NewNopSettings(), validCfg, consumertest.NewNop()) + require.NoError(t, err) +}