diff --git a/pkg/stanza/adapter/benchmark_test.go b/pkg/stanza/adapter/benchmark_test.go index 00654920083e..947537136cfb 100644 --- a/pkg/stanza/adapter/benchmark_test.go +++ b/pkg/stanza/adapter/benchmark_test.go @@ -163,7 +163,7 @@ type BenchOpConfig struct { } // Build will build a noop operator. -func (c BenchOpConfig) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c BenchOpConfig) Build(set component.TelemetrySettings) (operator.Operator, error) { inputOperator, err := c.InputConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/adapter/factory.go b/pkg/stanza/adapter/factory.go index d2ad3b631f19..2f9409763fa9 100644 --- a/pkg/stanza/adapter/factory.go +++ b/pkg/stanza/adapter/factory.go @@ -57,7 +57,7 @@ func createLogsReceiver(logReceiverType LogReceiverType) rcvr.CreateLogsFunc { pipe, err := pipeline.Config{ Operators: operators, DefaultOutput: emitter, - }.Build(¶ms.TelemetrySettings) + }.Build(params.TelemetrySettings) if err != nil { return nil, err } diff --git a/pkg/stanza/adapter/integration_test.go b/pkg/stanza/adapter/integration_test.go index ba850b7ddabb..f16c8cd08621 100644 --- a/pkg/stanza/adapter/integration_test.go +++ b/pkg/stanza/adapter/integration_test.go @@ -33,7 +33,7 @@ func createNoopReceiver(nextConsumer consumer.Logs) (*receiver, error) { Builder: noop.NewConfig(), }, }, - }.Build(&set) + }.Build(set) if err != nil { return nil, err } diff --git a/pkg/stanza/adapter/mocks_test.go b/pkg/stanza/adapter/mocks_test.go index 5f8ce72204d9..4e785b913d3c 100644 --- a/pkg/stanza/adapter/mocks_test.go +++ b/pkg/stanza/adapter/mocks_test.go @@ -40,7 +40,7 @@ func NewUnstartableConfig() operator.Config { } // Build will build an unstartable operator -func (c *UnstartableConfig) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c *UnstartableConfig) Build(set component.TelemetrySettings) (operator.Operator, error) { o, _ := c.OutputConfig.Build(set) return &UnstartableOperator{OutputOperator: o}, nil } diff --git a/pkg/stanza/adapter/receiver_test.go b/pkg/stanza/adapter/receiver_test.go index 7966367df9d8..f43d88d507be 100644 --- a/pkg/stanza/adapter/receiver_test.go +++ b/pkg/stanza/adapter/receiver_test.go @@ -143,7 +143,7 @@ func BenchmarkReadLine(b *testing.B) { pipe, err := pipeline.Config{ Operators: operatorCfgs, DefaultOutput: emitter, - }.Build(&set) + }.Build(set) require.NoError(b, err) // Populate the file that will be consumed @@ -210,7 +210,7 @@ func BenchmarkParseAndMap(b *testing.B) { pipe, err := pipeline.Config{ Operators: operatorCfgs, DefaultOutput: emitter, - }.Build(&set) + }.Build(set) require.NoError(b, err) // Populate the file that will be consumed diff --git a/pkg/stanza/fileconsumer/benchmark_test.go b/pkg/stanza/fileconsumer/benchmark_test.go index eb851ac71ef4..efa410b77920 100644 --- a/pkg/stanza/fileconsumer/benchmark_test.go +++ b/pkg/stanza/fileconsumer/benchmark_test.go @@ -193,7 +193,7 @@ func BenchmarkFileInput(b *testing.B) { return nil } set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set, callback) + op, err := cfg.Build(set, callback) require.NoError(b, err) b.ResetTimer() diff --git a/pkg/stanza/fileconsumer/config.go b/pkg/stanza/fileconsumer/config.go index 48ee70eb013d..06783cb55b9e 100644 --- a/pkg/stanza/fileconsumer/config.go +++ b/pkg/stanza/fileconsumer/config.go @@ -89,11 +89,11 @@ type HeaderConfig struct { } // Deprecated [v0.97.0] Use Build and WithSplitFunc option instead -func (c Config) BuildWithSplitFunc(set *component.TelemetrySettings, emit emit.Callback, splitFunc bufio.SplitFunc) (*Manager, error) { +func (c Config) BuildWithSplitFunc(set component.TelemetrySettings, emit emit.Callback, splitFunc bufio.SplitFunc) (*Manager, error) { return c.Build(set, emit, WithSplitFunc(splitFunc)) } -func (c Config) Build(set *component.TelemetrySettings, emit emit.Callback, opts ...Option) (*Manager, error) { +func (c Config) Build(set component.TelemetrySettings, emit emit.Callback, opts ...Option) (*Manager, error) { if err := c.validate(); err != nil { return nil, err } diff --git a/pkg/stanza/fileconsumer/config_test.go b/pkg/stanza/fileconsumer/config_test.go index ed273c938a26..35654ddfbf0b 100644 --- a/pkg/stanza/fileconsumer/config_test.go +++ b/pkg/stanza/fileconsumer/config_test.go @@ -630,7 +630,7 @@ func TestBuild(t *testing.T) { tc.modifyBaseConfig(cfg) set := componenttest.NewNopTelemetrySettings() - input, err := cfg.Build(&set, emittest.Nop) + input, err := cfg.Build(set, emittest.Nop) tc.errorRequirement(t, err) if err != nil { return @@ -710,7 +710,7 @@ func TestBuildWithSplitFunc(t *testing.T) { } set := componenttest.NewNopTelemetrySettings() - input, err := cfg.BuildWithSplitFunc(&set, emittest.Nop, splitNone) + input, err := cfg.BuildWithSplitFunc(set, emittest.Nop, splitNone) tc.errorRequirement(t, err) if err != nil { return @@ -798,7 +798,7 @@ func TestBuildWithHeader(t *testing.T) { tc.modifyBaseConfig(cfg) set := componenttest.NewNopTelemetrySettings() - input, err := cfg.Build(&set, emittest.Nop) + input, err := cfg.Build(set, emittest.Nop) tc.errorRequirement(t, err) if err != nil { return @@ -851,6 +851,6 @@ func newMockOperatorConfig(cfg *Config) *mockOperatorConfig { // This function is impelmented for compatibility with operatortest // but is not meant to be used directly -func (h *mockOperatorConfig) Build(_ *component.TelemetrySettings) (operator.Operator, error) { +func (h *mockOperatorConfig) Build(_ component.TelemetrySettings) (operator.Operator, error) { panic("not impelemented") } diff --git a/pkg/stanza/fileconsumer/internal/header/config.go b/pkg/stanza/fileconsumer/internal/header/config.go index ffa12448cdf6..f2102f680ccf 100644 --- a/pkg/stanza/fileconsumer/internal/header/config.go +++ b/pkg/stanza/fileconsumer/internal/header/config.go @@ -40,7 +40,7 @@ func NewConfig(matchRegex string, metadataOperators []operator.Config, enc encod p, err := pipeline.Config{ Operators: metadataOperators, DefaultOutput: newPipelineOutput(nopLogger), - }.Build(&component.TelemetrySettings{Logger: nopLogger.Desugar()}) + }.Build(component.TelemetrySettings{Logger: nopLogger.Desugar()}) if err != nil { return nil, fmt.Errorf("failed to build pipelines: %w", err) diff --git a/pkg/stanza/fileconsumer/internal/header/reader.go b/pkg/stanza/fileconsumer/internal/header/reader.go index e2adb6cc7d3d..667f3cd342a7 100644 --- a/pkg/stanza/fileconsumer/internal/header/reader.go +++ b/pkg/stanza/fileconsumer/internal/header/reader.go @@ -32,7 +32,7 @@ func NewReader(logger *zap.SugaredLogger, cfg Config) (*Reader, error) { r.pipeline, err = pipeline.Config{ Operators: cfg.metadataOperators, DefaultOutput: r.output, - }.Build(&component.TelemetrySettings{Logger: logger.Desugar()}) + }.Build(component.TelemetrySettings{Logger: logger.Desugar()}) if err != nil { return nil, fmt.Errorf("failed to build pipeline: %w", err) } diff --git a/pkg/stanza/fileconsumer/util_test.go b/pkg/stanza/fileconsumer/util_test.go index 6271f3cd705a..19d465a6e43b 100644 --- a/pkg/stanza/fileconsumer/util_test.go +++ b/pkg/stanza/fileconsumer/util_test.go @@ -19,7 +19,7 @@ func testManager(t *testing.T, cfg *Config, opts ...Option) (*Manager, *emittest func testManagerWithSink(t *testing.T, cfg *Config, sink *emittest.Sink, opts ...Option) *Manager { set := componenttest.NewNopTelemetrySettings() - input, err := cfg.Build(&set, sink.Callback, opts...) + input, err := cfg.Build(set, sink.Callback, opts...) require.NoError(t, err) t.Cleanup(func() { input.tracker.ClosePreviousFiles() }) return input diff --git a/pkg/stanza/operator/config.go b/pkg/stanza/operator/config.go index 9de10de73569..f1f9781aeb55 100644 --- a/pkg/stanza/operator/config.go +++ b/pkg/stanza/operator/config.go @@ -25,7 +25,7 @@ func NewConfig(b Builder) Config { type Builder interface { ID() string Type() string - Build(*component.TelemetrySettings) (Operator, error) + Build(component.TelemetrySettings) (Operator, error) SetID(string) } diff --git a/pkg/stanza/operator/config_test.go b/pkg/stanza/operator/config_test.go index c6ce37096ce1..14375683a424 100644 --- a/pkg/stanza/operator/config_test.go +++ b/pkg/stanza/operator/config_test.go @@ -18,7 +18,7 @@ type FakeBuilder struct { Array []string `json:"array" yaml:"array"` } -func (f *FakeBuilder) Build(_ *component.TelemetrySettings) (Operator, error) { +func (f *FakeBuilder) Build(_ component.TelemetrySettings) (Operator, error) { return nil, nil } func (f *FakeBuilder) ID() string { return "operator" } diff --git a/pkg/stanza/operator/helper/helper_test.go b/pkg/stanza/operator/helper/helper_test.go index e63ea7e86c09..d052e6a67139 100644 --- a/pkg/stanza/operator/helper/helper_test.go +++ b/pkg/stanza/operator/helper/helper_test.go @@ -35,6 +35,6 @@ func newHelpersConfig() *helpersConfig { // This function is impelmented for compatibility with operatortest // but is not meant to be used directly -func (h *helpersConfig) Build(_ *component.TelemetrySettings) (operator.Operator, error) { +func (h *helpersConfig) Build(_ component.TelemetrySettings) (operator.Operator, error) { panic("not impelemented") } diff --git a/pkg/stanza/operator/helper/input.go b/pkg/stanza/operator/helper/input.go index b87ac699cf77..c39b34e2fa82 100644 --- a/pkg/stanza/operator/helper/input.go +++ b/pkg/stanza/operator/helper/input.go @@ -29,7 +29,7 @@ type InputConfig struct { } // Build will build a base producer. -func (c InputConfig) Build(set *component.TelemetrySettings) (InputOperator, error) { +func (c InputConfig) Build(set component.TelemetrySettings) (InputOperator, error) { writerOperator, err := c.WriterConfig.Build(set) if err != nil { return InputOperator{}, errors.WithDetails(err, "operator_id", c.ID()) diff --git a/pkg/stanza/operator/helper/input_test.go b/pkg/stanza/operator/helper/input_test.go index 603980d026db..4641837cbfd5 100644 --- a/pkg/stanza/operator/helper/input_test.go +++ b/pkg/stanza/operator/helper/input_test.go @@ -22,7 +22,7 @@ func TestInputConfigMissingBase(t *testing.T) { } set := componenttest.NewNopTelemetrySettings() - _, err := config.Build(&set) + _, err := config.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "missing required `type` field.") } @@ -38,7 +38,7 @@ func TestInputConfigMissingOutput(t *testing.T) { } set := componenttest.NewNopTelemetrySettings() - _, err := config.Build(&set) + _, err := config.Build(set) require.NoError(t, err) } @@ -54,7 +54,7 @@ func TestInputConfigValid(t *testing.T) { } set := componenttest.NewNopTelemetrySettings() - _, err := config.Build(&set) + _, err := config.Build(set) require.NoError(t, err) } diff --git a/pkg/stanza/operator/helper/operator.go b/pkg/stanza/operator/helper/operator.go index 3c8917e9b2ed..a8ec65192b7e 100644 --- a/pkg/stanza/operator/helper/operator.go +++ b/pkg/stanza/operator/helper/operator.go @@ -44,7 +44,7 @@ func (c BasicConfig) Type() string { } // Build will build a basic operator. -func (c BasicConfig) Build(set *component.TelemetrySettings) (BasicOperator, error) { +func (c BasicConfig) Build(set component.TelemetrySettings) (BasicOperator, error) { if c.OperatorType == "" { return BasicOperator{}, errors.NewError( "missing required `type` field.", diff --git a/pkg/stanza/operator/helper/operator_test.go b/pkg/stanza/operator/helper/operator_test.go index af85d534fd52..1990401fa186 100644 --- a/pkg/stanza/operator/helper/operator_test.go +++ b/pkg/stanza/operator/helper/operator_test.go @@ -35,7 +35,7 @@ func TestBasicConfigBuildWithoutID(t *testing.T) { } set := componenttest.NewNopTelemetrySettings() - _, err := config.Build(&set) + _, err := config.Build(set) require.NoError(t, err) } @@ -45,7 +45,7 @@ func TestBasicConfigBuildWithoutType(t *testing.T) { } set := componenttest.NewNopTelemetrySettings() - _, err := config.Build(&set) + _, err := config.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "missing required `type` field.") } @@ -58,7 +58,7 @@ func TestBasicConfigBuildMissingLogger(t *testing.T) { set := componenttest.NewNopTelemetrySettings() set.Logger = nil - _, err := config.Build(&set) + _, err := config.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "operator build context is missing a logger.") } @@ -70,7 +70,7 @@ func TestBasicConfigBuildValid(t *testing.T) { } set := componenttest.NewNopTelemetrySettings() - operator, err := config.Build(&set) + operator, err := config.Build(set) require.NoError(t, err) require.Equal(t, "test-id", operator.OperatorID) require.Equal(t, "test-type", operator.OperatorType) diff --git a/pkg/stanza/operator/helper/output.go b/pkg/stanza/operator/helper/output.go index 70ea1c89c7e5..de777a5fe5c4 100644 --- a/pkg/stanza/operator/helper/output.go +++ b/pkg/stanza/operator/helper/output.go @@ -23,7 +23,7 @@ type OutputConfig struct { } // Build will build an output operator. -func (c OutputConfig) Build(set *component.TelemetrySettings) (OutputOperator, error) { +func (c OutputConfig) Build(set component.TelemetrySettings) (OutputOperator, error) { basicOperator, err := c.BasicConfig.Build(set) if err != nil { return OutputOperator{}, err diff --git a/pkg/stanza/operator/helper/output_test.go b/pkg/stanza/operator/helper/output_test.go index 810345c51b21..51bd476df6c8 100644 --- a/pkg/stanza/operator/helper/output_test.go +++ b/pkg/stanza/operator/helper/output_test.go @@ -16,7 +16,7 @@ import ( func TestOutputConfigMissingBase(t *testing.T) { config := OutputConfig{} set := componenttest.NewNopTelemetrySettings() - _, err := config.Build(&set) + _, err := config.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "missing required `type` field.") } @@ -29,7 +29,7 @@ func TestOutputConfigBuildValid(t *testing.T) { }, } set := componenttest.NewNopTelemetrySettings() - _, err := config.Build(&set) + _, err := config.Build(set) require.NoError(t, err) } diff --git a/pkg/stanza/operator/helper/parser.go b/pkg/stanza/operator/helper/parser.go index 7bdec11f5e5b..84ba71035b8e 100644 --- a/pkg/stanza/operator/helper/parser.go +++ b/pkg/stanza/operator/helper/parser.go @@ -35,7 +35,7 @@ type ParserConfig struct { } // Build will build a parser operator. -func (c ParserConfig) Build(set *component.TelemetrySettings) (ParserOperator, error) { +func (c ParserConfig) Build(set component.TelemetrySettings) (ParserOperator, error) { transformerOperator, err := c.TransformerConfig.Build(set) if err != nil { return ParserOperator{}, err diff --git a/pkg/stanza/operator/helper/parser_test.go b/pkg/stanza/operator/helper/parser_test.go index 13cb4595ebc9..b80c0cfbd5b0 100644 --- a/pkg/stanza/operator/helper/parser_test.go +++ b/pkg/stanza/operator/helper/parser_test.go @@ -23,7 +23,7 @@ import ( func TestParserConfigMissingBase(t *testing.T) { config := ParserConfig{} set := componenttest.NewNopTelemetrySettings() - _, err := config.Build(&set) + _, err := config.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "missing required `type` field.") } @@ -38,7 +38,7 @@ func TestParserConfigInvalidTimeParser(t *testing.T) { } set := componenttest.NewNopTelemetrySettings() - _, err := cfg.Build(&set) + _, err := cfg.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "missing required configuration parameter `layout`") } @@ -51,7 +51,7 @@ func TestParserConfigBodyCollision(t *testing.T) { cfg.BodyField = &b set := componenttest.NewNopTelemetrySettings() - _, err := cfg.Build(&set) + _, err := cfg.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "`parse_to: body` not allowed when `body` is configured") } @@ -92,7 +92,7 @@ func TestParserConfigBuildValid(t *testing.T) { } set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) require.NotNil(t, op.TimeParser) @@ -633,7 +633,7 @@ func TestParserFields(t *testing.T) { tc.cfgMod(&cfg) set := componenttest.NewNopTelemetrySettings() - parser, err := cfg.Build(&set) + parser, err := cfg.Build(set) require.NoError(t, err) e := tc.input() diff --git a/pkg/stanza/operator/helper/severity_builder.go b/pkg/stanza/operator/helper/severity_builder.go index 0b8f76ac4d5f..9c488a2d4bca 100644 --- a/pkg/stanza/operator/helper/severity_builder.go +++ b/pkg/stanza/operator/helper/severity_builder.go @@ -118,7 +118,7 @@ type SeverityConfig struct { } // Build builds a SeverityParser from a SeverityConfig -func (c *SeverityConfig) Build(_ *component.TelemetrySettings) (SeverityParser, error) { +func (c *SeverityConfig) Build(_ component.TelemetrySettings) (SeverityParser, error) { operatorMapping := getBuiltinMapping(c.Preset) for severity, unknown := range c.Mapping { diff --git a/pkg/stanza/operator/helper/severity_test.go b/pkg/stanza/operator/helper/severity_test.go index dc28b2194cfa..42521e3d87f8 100644 --- a/pkg/stanza/operator/helper/severity_test.go +++ b/pkg/stanza/operator/helper/severity_test.go @@ -513,7 +513,7 @@ func (tc severityTestCase) run(parseFrom entry.Field) func(*testing.T) { } set := componenttest.NewNopTelemetrySettings() - severityParser, err := cfg.Build(&set) + severityParser, err := cfg.Build(set) if tc.buildErr { require.Error(t, err, "expected error when configuring operator") return @@ -566,7 +566,7 @@ func TestBuildCustomMapping(t *testing.T) { } set := componenttest.NewNopTelemetrySettings() - severityParser, err := cfg.Build(&set) + severityParser, err := cfg.Build(set) require.NoError(t, err) for k, v := range expected { diff --git a/pkg/stanza/operator/helper/transformer.go b/pkg/stanza/operator/helper/transformer.go index 9f16dc3261bc..cb609ab9ab16 100644 --- a/pkg/stanza/operator/helper/transformer.go +++ b/pkg/stanza/operator/helper/transformer.go @@ -31,7 +31,7 @@ type TransformerConfig struct { } // Build will build a transformer operator. -func (c TransformerConfig) Build(set *component.TelemetrySettings) (TransformerOperator, error) { +func (c TransformerConfig) Build(set component.TelemetrySettings) (TransformerOperator, error) { writerOperator, err := c.WriterConfig.Build(set) if err != nil { return TransformerOperator{}, errors.WithDetails(err, "operator_id", c.ID()) diff --git a/pkg/stanza/operator/helper/transformer_test.go b/pkg/stanza/operator/helper/transformer_test.go index d52f99225f3d..818617c2b833 100644 --- a/pkg/stanza/operator/helper/transformer_test.go +++ b/pkg/stanza/operator/helper/transformer_test.go @@ -24,7 +24,7 @@ func TestTransformerConfigMissingBase(t *testing.T) { cfg := NewTransformerConfig("test", "") cfg.OutputIDs = []string{"test-output"} set := componenttest.NewNopTelemetrySettings() - _, err := cfg.Build(&set) + _, err := cfg.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "missing required `type` field.") } @@ -32,7 +32,7 @@ func TestTransformerConfigMissingBase(t *testing.T) { func TestTransformerConfigMissingOutput(t *testing.T) { cfg := NewTransformerConfig("test", "test") set := componenttest.NewNopTelemetrySettings() - _, err := cfg.Build(&set) + _, err := cfg.Build(set) require.NoError(t, err) } @@ -40,14 +40,14 @@ func TestTransformerConfigValid(t *testing.T) { cfg := NewTransformerConfig("test", "test") cfg.OutputIDs = []string{"test-output"} set := componenttest.NewNopTelemetrySettings() - _, err := cfg.Build(&set) + _, err := cfg.Build(set) require.NoError(t, err) } func TestTransformerOnErrorDefault(t *testing.T) { cfg := NewTransformerConfig("test-id", "test-type") set := componenttest.NewNopTelemetrySettings() - transformer, err := cfg.Build(&set) + transformer, err := cfg.Build(set) require.NoError(t, err) require.Equal(t, SendOnError, transformer.OnError) } @@ -56,7 +56,7 @@ func TestTransformerOnErrorInvalid(t *testing.T) { cfg := NewTransformerConfig("test", "test") cfg.OnError = "invalid" set := componenttest.NewNopTelemetrySettings() - _, err := cfg.Build(&set) + _, err := cfg.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "operator config has an invalid `on_error` field.") } @@ -64,7 +64,7 @@ func TestTransformerOnErrorInvalid(t *testing.T) { func TestTransformerOperatorCanProcess(t *testing.T) { cfg := NewTransformerConfig("test", "test") set := componenttest.NewNopTelemetrySettings() - transformer, err := cfg.Build(&set) + transformer, err := cfg.Build(set) require.NoError(t, err) require.True(t, transformer.CanProcess()) } @@ -325,7 +325,7 @@ func TestTransformerIf(t *testing.T) { cfg.IfExpr = tc.ifExpr set := componenttest.NewNopTelemetrySettings() - transformer, err := cfg.Build(&set) + transformer, err := cfg.Build(set) require.NoError(t, err) fake := testutil.NewFakeOutput(t) @@ -351,7 +351,7 @@ func TestTransformerIf(t *testing.T) { cfg := NewTransformerConfig("test", "test") cfg.IfExpr = "'nonbool'" set := componenttest.NewNopTelemetrySettings() - _, err := cfg.Build(&set) + _, err := cfg.Build(set) require.Error(t, err) }) } diff --git a/pkg/stanza/operator/helper/writer.go b/pkg/stanza/operator/helper/writer.go index 33f0d2ba3bf9..89666ae88c91 100644 --- a/pkg/stanza/operator/helper/writer.go +++ b/pkg/stanza/operator/helper/writer.go @@ -27,7 +27,7 @@ type WriterConfig struct { } // Build will build a writer operator from the config. -func (c WriterConfig) Build(set *component.TelemetrySettings) (WriterOperator, error) { +func (c WriterConfig) Build(set component.TelemetrySettings) (WriterOperator, error) { basicOperator, err := c.BasicConfig.Build(set) if err != nil { return WriterOperator{}, err diff --git a/pkg/stanza/operator/helper/writer_test.go b/pkg/stanza/operator/helper/writer_test.go index d05db5aa0b7d..271f01e1032d 100644 --- a/pkg/stanza/operator/helper/writer_test.go +++ b/pkg/stanza/operator/helper/writer_test.go @@ -25,7 +25,7 @@ func TestWriterConfigMissingOutput(t *testing.T) { }, } set := componenttest.NewNopTelemetrySettings() - _, err := config.Build(&set) + _, err := config.Build(set) require.NoError(t, err) } @@ -37,7 +37,7 @@ func TestWriterConfigValidBuild(t *testing.T) { }, } set := componenttest.NewNopTelemetrySettings() - _, err := config.Build(&set) + _, err := config.Build(set) require.NoError(t, err) } diff --git a/pkg/stanza/operator/input/file/config.go b/pkg/stanza/operator/input/file/config.go index 8fbd05aef509..6c07b777f5a0 100644 --- a/pkg/stanza/operator/input/file/config.go +++ b/pkg/stanza/operator/input/file/config.go @@ -38,7 +38,7 @@ type Config struct { } // Build will build a file input operator from the supplied configuration -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { inputOperator, err := c.InputConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/input/file/config_test.go b/pkg/stanza/operator/input/file/config_test.go index 430bfd1b562e..bb2e346afdc1 100644 --- a/pkg/stanza/operator/input/file/config_test.go +++ b/pkg/stanza/operator/input/file/config_test.go @@ -539,7 +539,7 @@ func TestBuild(t *testing.T) { tc.modifyBaseConfig(cfg) set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) tc.errorRequirement(t, err) if err != nil { return diff --git a/pkg/stanza/operator/input/file/util_test.go b/pkg/stanza/operator/input/file/util_test.go index 797c667706e4..a74aea301b0f 100644 --- a/pkg/stanza/operator/input/file/util_test.go +++ b/pkg/stanza/operator/input/file/util_test.go @@ -36,7 +36,7 @@ func newTestFileOperator(t *testing.T, cfgMod func(*Config)) (*Input, chan *entr cfgMod(cfg) } set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) err = op.SetOutputs([]operator.Operator{fakeOutput}) diff --git a/pkg/stanza/operator/input/generate/config.go b/pkg/stanza/operator/input/generate/config.go index 18576631c9eb..2497dc78c3c7 100644 --- a/pkg/stanza/operator/input/generate/config.go +++ b/pkg/stanza/operator/input/generate/config.go @@ -33,7 +33,7 @@ type Config struct { } // Build will build a generate input operator. -func (c *Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c *Config) Build(set component.TelemetrySettings) (operator.Operator, error) { inputOperator, err := c.InputConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/input/generate/input_test.go b/pkg/stanza/operator/input/generate/input_test.go index 9b2056bdd15a..7a3156562b6b 100644 --- a/pkg/stanza/operator/input/generate/input_test.go +++ b/pkg/stanza/operator/input/generate/input_test.go @@ -23,7 +23,7 @@ func TestInputGenerate(t *testing.T) { } set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) fake := testutil.NewFakeOutput(t) diff --git a/pkg/stanza/operator/input/journald/config_linux.go b/pkg/stanza/operator/input/journald/config_linux.go index 183bd8616c45..b8d62175f62e 100644 --- a/pkg/stanza/operator/input/journald/config_linux.go +++ b/pkg/stanza/operator/input/journald/config_linux.go @@ -26,7 +26,7 @@ func init() { } // Build will build a journald input operator from the supplied configuration -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { inputOperator, err := c.InputConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/input/journald/config_nonlinux.go b/pkg/stanza/operator/input/journald/config_nonlinux.go index 7232f91611fd..d0bd996bf0ba 100644 --- a/pkg/stanza/operator/input/journald/config_nonlinux.go +++ b/pkg/stanza/operator/input/journald/config_nonlinux.go @@ -13,6 +13,6 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" ) -func (c Config) Build(_ *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(_ component.TelemetrySettings) (operator.Operator, error) { return nil, errors.New("journald input operator is only supported on linux") } diff --git a/pkg/stanza/operator/input/journald/input_test.go b/pkg/stanza/operator/input/journald/input_test.go index 5d68585e69c3..86c7319a9381 100644 --- a/pkg/stanza/operator/input/journald/input_test.go +++ b/pkg/stanza/operator/input/journald/input_test.go @@ -57,7 +57,7 @@ func TestInputJournald(t *testing.T) { cfg.OutputIDs = []string{"output"} set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) mockOutput := testutil.NewMockOperator("output") @@ -236,7 +236,7 @@ func TestInputJournaldError(t *testing.T) { cfg.OutputIDs = []string{"output"} set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) mockOutput := testutil.NewMockOperator("output") diff --git a/pkg/stanza/operator/input/namedpipe/config_linux.go b/pkg/stanza/operator/input/namedpipe/config_linux.go index 33e9d865e1e2..bcea8dec679b 100644 --- a/pkg/stanza/operator/input/namedpipe/config_linux.go +++ b/pkg/stanza/operator/input/namedpipe/config_linux.go @@ -19,7 +19,7 @@ func init() { } // Build will build a namedpipe input operator. -func (c *Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c *Config) Build(set component.TelemetrySettings) (operator.Operator, error) { inputOperator, err := c.InputConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/input/namedpipe/input_nonlinux.go b/pkg/stanza/operator/input/namedpipe/input_nonlinux.go index a2f6562e9428..b0e29e80b444 100644 --- a/pkg/stanza/operator/input/namedpipe/input_nonlinux.go +++ b/pkg/stanza/operator/input/namedpipe/input_nonlinux.go @@ -13,6 +13,6 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" ) -func (c *Config) Build(_ *component.TelemetrySettings) (operator.Operator, error) { +func (c *Config) Build(_ component.TelemetrySettings) (operator.Operator, error) { return nil, errors.New("namedpipe input operator is only supported on linux") } diff --git a/pkg/stanza/operator/input/namedpipe/input_test.go b/pkg/stanza/operator/input/namedpipe/input_test.go index 676f1f314d2f..de97d08ebacc 100644 --- a/pkg/stanza/operator/input/namedpipe/input_test.go +++ b/pkg/stanza/operator/input/namedpipe/input_test.go @@ -42,7 +42,7 @@ func TestCreatePipe(t *testing.T) { conf.Permissions = 0666 set := componenttest.NewNopTelemetrySettings() - op, err := conf.Build(&set) + op, err := conf.Build(set) require.NoError(t, err) require.NoError(t, op.Start(testutil.NewUnscopedMockPersister())) @@ -71,7 +71,7 @@ func TestCreatePipeFailsWithFile(t *testing.T) { }() set := componenttest.NewNopTelemetrySettings() - op, err := conf.Build(&set) + op, err := conf.Build(set) require.NoError(t, err) require.Error(t, op.Start(testutil.NewUnscopedMockPersister())) @@ -86,7 +86,7 @@ func TestCreatePipeAlreadyExists(t *testing.T) { require.NoError(t, unix.Mkfifo(conf.Path, conf.Permissions)) set := componenttest.NewNopTelemetrySettings() - op, err := conf.Build(&set) + op, err := conf.Build(set) require.NoError(t, err) require.NoError(t, op.Start(testutil.NewUnscopedMockPersister())) @@ -103,7 +103,7 @@ func TestPipeWrites(t *testing.T) { conf.OutputIDs = []string{fake.ID()} set := componenttest.NewNopTelemetrySettings() - op, err := conf.Build(&set) + op, err := conf.Build(set) require.NoError(t, err) ops := []operator.Operator{op, fake} diff --git a/pkg/stanza/operator/input/stdin/config.go b/pkg/stanza/operator/input/stdin/config.go index 5529809fc2c4..62e917a0f474 100644 --- a/pkg/stanza/operator/input/stdin/config.go +++ b/pkg/stanza/operator/input/stdin/config.go @@ -31,7 +31,7 @@ type Config struct { } // Build will build a stdin input operator. -func (c *Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c *Config) Build(set component.TelemetrySettings) (operator.Operator, error) { inputOperator, err := c.InputConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/input/stdin/input_test.go b/pkg/stanza/operator/input/stdin/input_test.go index aace14cd8d83..9cf800396a30 100644 --- a/pkg/stanza/operator/input/stdin/input_test.go +++ b/pkg/stanza/operator/input/stdin/input_test.go @@ -19,7 +19,7 @@ func TestStdin(t *testing.T) { cfg.OutputIDs = []string{"fake"} set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) fake := testutil.NewFakeOutput(t) diff --git a/pkg/stanza/operator/input/syslog/config.go b/pkg/stanza/operator/input/syslog/config.go index a902494e8a6f..9600b8403862 100644 --- a/pkg/stanza/operator/input/syslog/config.go +++ b/pkg/stanza/operator/input/syslog/config.go @@ -41,7 +41,7 @@ type Config struct { UDP *udp.BaseConfig `mapstructure:"udp"` } -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { inputBase, err := c.InputConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/input/syslog/input_test.go b/pkg/stanza/operator/input/syslog/input_test.go index 910fd8ca3436..5e90d3242967 100644 --- a/pkg/stanza/operator/input/syslog/input_test.go +++ b/pkg/stanza/operator/input/syslog/input_test.go @@ -139,7 +139,7 @@ func TestInput(t *testing.T) { func InputTest(t *testing.T, tc syslog.Case, cfg *Config, rsrc map[string]any, attr map[string]any) { set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) fake := testutil.NewFakeOutput(t) @@ -214,7 +214,7 @@ func TestSyslogIDs(t *testing.T) { t.Run("TCP", func(t *testing.T) { cfg := NewConfigWithTCP(basicConfig()) set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) syslogInputOp := op.(*Input) require.Equal(t, "test_syslog_internal_tcp", syslogInputOp.tcp.ID()) @@ -226,7 +226,7 @@ func TestSyslogIDs(t *testing.T) { t.Run("UDP", func(t *testing.T) { cfg := NewConfigWithUDP(basicConfig()) set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) syslogInputOp := op.(*Input) require.Equal(t, "test_syslog_internal_udp", syslogInputOp.udp.ID()) diff --git a/pkg/stanza/operator/input/tcp/config.go b/pkg/stanza/operator/input/tcp/config.go index 89e5d300b7ec..430b424f3992 100644 --- a/pkg/stanza/operator/input/tcp/config.go +++ b/pkg/stanza/operator/input/tcp/config.go @@ -80,7 +80,7 @@ func (c Config) defaultSplitFuncBuilder(enc encoding.Encoding) (bufio.SplitFunc, } // Build will build a tcp input operator. -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { inputOperator, err := c.InputConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/input/tcp/input_test.go b/pkg/stanza/operator/input/tcp/input_test.go index 6f522b06a73e..c0b0918a2fa7 100644 --- a/pkg/stanza/operator/input/tcp/input_test.go +++ b/pkg/stanza/operator/input/tcp/input_test.go @@ -80,7 +80,7 @@ func tcpInputTest(input []byte, expected []string) func(t *testing.T) { cfg.ListenAddress = ":0" set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) mockOutput := testutil.Operator{} @@ -130,7 +130,7 @@ func tcpInputAttributesTest(input []byte, expected []string) func(t *testing.T) cfg.AddAttributes = true set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) mockOutput := testutil.Operator{} @@ -217,7 +217,7 @@ func tlsInputTest(input []byte, expected []string) func(t *testing.T) { } set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) mockOutput := testutil.Operator{} @@ -348,7 +348,7 @@ func TestBuild(t *testing.T) { cfg.MaxLogSize = tc.inputBody.MaxLogSize cfg.TLS = tc.inputBody.TLS set := componenttest.NewNopTelemetrySettings() - _, err := cfg.Build(&set) + _, err := cfg.Build(set) if tc.expectErr { require.Error(t, err) return @@ -394,7 +394,7 @@ func TestFailToBind(t *testing.T) { cfg := NewConfigWithID("test_id") cfg.ListenAddress = net.JoinHostPort(ip, strconv.Itoa(port)) set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) mockOutput := testutil.Operator{} tcpInput := op.(*Input) @@ -422,7 +422,7 @@ func BenchmarkTCPInput(b *testing.B) { cfg.ListenAddress = ":0" set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(b, err) fakeOutput := testutil.NewFakeOutput(b) diff --git a/pkg/stanza/operator/input/udp/config.go b/pkg/stanza/operator/input/udp/config.go index 35be6874ed76..819212330833 100644 --- a/pkg/stanza/operator/input/udp/config.go +++ b/pkg/stanza/operator/input/udp/config.go @@ -75,7 +75,7 @@ type BaseConfig struct { } // Build will build a udp input operator. -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { inputOperator, err := c.InputConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/input/udp/input_test.go b/pkg/stanza/operator/input/udp/input_test.go index 593a4ee82822..f3862d2a7edb 100644 --- a/pkg/stanza/operator/input/udp/input_test.go +++ b/pkg/stanza/operator/input/udp/input_test.go @@ -22,7 +22,7 @@ import ( func udpInputTest(input []byte, expected []string, cfg *Config) func(t *testing.T) { return func(t *testing.T) { set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) mockOutput := testutil.Operator{} @@ -74,7 +74,7 @@ func udpInputAttributesTest(input []byte, expected []string) func(t *testing.T) cfg.AddAttributes = true set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) mockOutput := testutil.Operator{} @@ -183,7 +183,7 @@ func TestFailToBind(t *testing.T) { cfg.ListenAddress = net.JoinHostPort(ip, strconv.Itoa(port)) set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) mockOutput := testutil.Operator{} @@ -216,7 +216,7 @@ func BenchmarkUDPInput(b *testing.B) { cfg.ListenAddress = ":0" set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(b, err) fakeOutput := testutil.NewFakeOutput(b) diff --git a/pkg/stanza/operator/input/windows/config_windows.go b/pkg/stanza/operator/input/windows/config_windows.go index 3a501ff100c6..eb1324bc7d07 100644 --- a/pkg/stanza/operator/input/windows/config_windows.go +++ b/pkg/stanza/operator/input/windows/config_windows.go @@ -18,7 +18,7 @@ func init() { } // Build will build a windows event log operator. -func (c *Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c *Config) Build(set component.TelemetrySettings) (operator.Operator, error) { inputOperator, err := c.InputConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/output/drop/config.go b/pkg/stanza/operator/output/drop/config.go index ab0fea180f54..b5b4ebfb5493 100644 --- a/pkg/stanza/operator/output/drop/config.go +++ b/pkg/stanza/operator/output/drop/config.go @@ -29,7 +29,7 @@ type Config struct { } // Build will build a drop output operator. -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { outputOperator, err := c.OutputConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/output/drop/output_test.go b/pkg/stanza/operator/output/drop/output_test.go index 747b07c19709..469a36752614 100644 --- a/pkg/stanza/operator/output/drop/output_test.go +++ b/pkg/stanza/operator/output/drop/output_test.go @@ -16,7 +16,7 @@ import ( func TestBuildValid(t *testing.T) { cfg := NewConfig("test") set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) require.IsType(t, &Output{}, op) } @@ -25,7 +25,7 @@ func TestBuildIvalid(t *testing.T) { cfg := NewConfig("test") set := componenttest.NewNopTelemetrySettings() set.Logger = nil - _, err := cfg.Build(&set) + _, err := cfg.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "build context is missing a logger") } @@ -33,7 +33,7 @@ func TestBuildIvalid(t *testing.T) { func TestProcess(t *testing.T) { cfg := NewConfig("test") set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) entry := entry.New() diff --git a/pkg/stanza/operator/output/file/config.go b/pkg/stanza/operator/output/file/config.go index 816a869cd855..510b95c49a7f 100644 --- a/pkg/stanza/operator/output/file/config.go +++ b/pkg/stanza/operator/output/file/config.go @@ -35,7 +35,7 @@ type Config struct { } // Build will build a file output operator. -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { outputOperator, err := c.OutputConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/output/stdout/config.go b/pkg/stanza/operator/output/stdout/config.go index e878592f9a14..fca71d198edc 100644 --- a/pkg/stanza/operator/output/stdout/config.go +++ b/pkg/stanza/operator/output/stdout/config.go @@ -36,7 +36,7 @@ type Config struct { } // Build will build a stdout operator. -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { outputOperator, err := c.OutputConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/output/stdout/output_test.go b/pkg/stanza/operator/output/stdout/output_test.go index 9f6371293165..89ba89e541f0 100644 --- a/pkg/stanza/operator/output/stdout/output_test.go +++ b/pkg/stanza/operator/output/stdout/output_test.go @@ -28,7 +28,7 @@ func TestOperator(t *testing.T) { } set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) var buf bytes.Buffer diff --git a/pkg/stanza/operator/parser/csv/config.go b/pkg/stanza/operator/parser/csv/config.go index 64a88bc0fb9d..5cab8cb459f7 100644 --- a/pkg/stanza/operator/parser/csv/config.go +++ b/pkg/stanza/operator/parser/csv/config.go @@ -44,7 +44,7 @@ type Config struct { } // Build will build a csv parser operator. -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { parserOperator, err := c.ParserConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/parser/csv/parser_test.go b/pkg/stanza/operator/parser/csv/parser_test.go index c695c28dc922..27fd4a7a94ea 100644 --- a/pkg/stanza/operator/parser/csv/parser_test.go +++ b/pkg/stanza/operator/parser/csv/parser_test.go @@ -21,7 +21,7 @@ func newTestParser(t *testing.T) *Parser { cfg := NewConfigWithID("test") cfg.Header = testHeader set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) return op.(*Parser) } @@ -31,7 +31,7 @@ func newTestParserIgnoreQuotes(t *testing.T) *Parser { cfg.Header = testHeader cfg.IgnoreQuotes = true set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) return op.(*Parser) } @@ -40,7 +40,7 @@ func TestParserBuildFailure(t *testing.T) { cfg := NewConfigWithID("test") cfg.OnError = "invalid_on_error" set := componenttest.NewNopTelemetrySettings() - _, err := cfg.Build(&set) + _, err := cfg.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "invalid `on_error` field") } @@ -51,7 +51,7 @@ func TestParserBuildFailureLazyIgnoreQuotes(t *testing.T) { cfg.LazyQuotes = true cfg.IgnoreQuotes = true set := componenttest.NewNopTelemetrySettings() - _, err := cfg.Build(&set) + _, err := cfg.Build(set) require.Error(t, err) require.ErrorContains(t, err, "only one of 'ignore_quotes' or 'lazy_quotes' can be true") } @@ -61,7 +61,7 @@ func TestParserBuildFailureInvalidDelimiter(t *testing.T) { cfg.Header = testHeader cfg.FieldDelimiter = ";;" set := componenttest.NewNopTelemetrySettings() - _, err := cfg.Build(&set) + _, err := cfg.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "invalid 'delimiter': ';;'") } @@ -71,7 +71,7 @@ func TestParserBuildFailureBadHeaderConfig(t *testing.T) { cfg.Header = "testheader" cfg.HeaderAttribute = "testheader" set := componenttest.NewNopTelemetrySettings() - _, err := cfg.Build(&set) + _, err := cfg.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "only one header parameter can be set: 'header' or 'header_attribute'") } @@ -801,7 +801,7 @@ func TestParserCSV(t *testing.T) { tc.configure(cfg) set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) if tc.expectBuildErr { require.Error(t, err) return @@ -1046,7 +1046,7 @@ cc""",dddd,eeee`, cfg.Header = "A,B,C,D,E" set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) fake := testutil.NewFakeOutput(t) @@ -1069,7 +1069,7 @@ func TestParserCSVInvalidJSONInput(t *testing.T) { cfg.Header = testHeader set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) fake := testutil.NewFakeOutput(t) @@ -1095,7 +1095,7 @@ func TestBuildParserCSV(t *testing.T) { t.Run("BasicConfig", func(t *testing.T) { c := newBasicParser() set := componenttest.NewNopTelemetrySettings() - _, err := c.Build(&set) + _, err := c.Build(set) require.NoError(t, err) }) @@ -1103,7 +1103,7 @@ func TestBuildParserCSV(t *testing.T) { c := newBasicParser() c.Header = "" set := componenttest.NewNopTelemetrySettings() - _, err := c.Build(&set) + _, err := c.Build(set) require.Error(t, err) }) @@ -1111,7 +1111,7 @@ func TestBuildParserCSV(t *testing.T) { c := newBasicParser() c.Header = "name" set := componenttest.NewNopTelemetrySettings() - _, err := c.Build(&set) + _, err := c.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "missing field delimiter in header") }) @@ -1120,7 +1120,7 @@ func TestBuildParserCSV(t *testing.T) { c := newBasicParser() c.Header = "name;position;number" set := componenttest.NewNopTelemetrySettings() - _, err := c.Build(&set) + _, err := c.Build(set) require.Error(t, err) }) @@ -1129,7 +1129,7 @@ func TestBuildParserCSV(t *testing.T) { c.Header = "name,position,number" c.FieldDelimiter = ":" set := componenttest.NewNopTelemetrySettings() - _, err := c.Build(&set) + _, err := c.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "missing field delimiter in header") }) diff --git a/pkg/stanza/operator/parser/json/config.go b/pkg/stanza/operator/parser/json/config.go index d5a571f081f9..4bf7c0087144 100644 --- a/pkg/stanza/operator/parser/json/config.go +++ b/pkg/stanza/operator/parser/json/config.go @@ -35,7 +35,7 @@ type Config struct { } // Build will build a JSON parser operator. -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { parserOperator, err := c.ParserConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/parser/json/parser_test.go b/pkg/stanza/operator/parser/json/parser_test.go index 8423a4260f48..a018055e2c74 100644 --- a/pkg/stanza/operator/parser/json/parser_test.go +++ b/pkg/stanza/operator/parser/json/parser_test.go @@ -20,7 +20,7 @@ import ( func newTestParser(t *testing.T) *Parser { config := NewConfigWithID("test") set := componenttest.NewNopTelemetrySettings() - op, err := config.Build(&set) + op, err := config.Build(set) require.NoError(t, err) return op.(*Parser) } @@ -28,7 +28,7 @@ func newTestParser(t *testing.T) *Parser { func TestConfigBuild(t *testing.T) { config := NewConfigWithID("test") set := componenttest.NewNopTelemetrySettings() - op, err := config.Build(&set) + op, err := config.Build(set) require.NoError(t, err) require.IsType(t, &Parser{}, op) } @@ -37,7 +37,7 @@ func TestConfigBuildFailure(t *testing.T) { config := NewConfigWithID("test") config.OnError = "invalid_on_error" set := componenttest.NewNopTelemetrySettings() - _, err := config.Build(&set) + _, err := config.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "invalid `on_error` field") } @@ -148,7 +148,7 @@ func TestParser(t *testing.T) { tc.configure(cfg) set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) fake := testutil.NewFakeOutput(t) diff --git a/pkg/stanza/operator/parser/jsonarray/config.go b/pkg/stanza/operator/parser/jsonarray/config.go index 42c0fa0fa331..039217801561 100644 --- a/pkg/stanza/operator/parser/jsonarray/config.go +++ b/pkg/stanza/operator/parser/jsonarray/config.go @@ -49,7 +49,7 @@ type Config struct { } // Build will build a json array parser operator. -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { if !jsonArrayParserFeatureGate.IsEnabled() { return nil, fmt.Errorf("%s operator disabled", operatorType) } diff --git a/pkg/stanza/operator/parser/jsonarray/config_test.go b/pkg/stanza/operator/parser/jsonarray/config_test.go index 2621ef8abcaf..442e67d68a86 100644 --- a/pkg/stanza/operator/parser/jsonarray/config_test.go +++ b/pkg/stanza/operator/parser/jsonarray/config_test.go @@ -90,7 +90,7 @@ func TestBuildWithFeatureGate(t *testing.T) { require.True(t, ok) set := componenttest.NewNopTelemetrySettings() - _, err := buildFunc().Build(&set) + _, err := buildFunc().Build(set) if err != nil { require.Contains(t, err.Error(), c.onErr) } diff --git a/pkg/stanza/operator/parser/jsonarray/parser_test.go b/pkg/stanza/operator/parser/jsonarray/parser_test.go index 57ffd5a3ee2a..a07131e0a75e 100644 --- a/pkg/stanza/operator/parser/jsonarray/parser_test.go +++ b/pkg/stanza/operator/parser/jsonarray/parser_test.go @@ -21,7 +21,7 @@ func newTestParser(t *testing.T) *Parser { cfg := NewConfigWithID("test") set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) return op.(*Parser) } @@ -32,7 +32,7 @@ func TestParserBuildFailure(t *testing.T) { cfg := NewConfigWithID("test") cfg.OnError = "invalid_on_error" set := componenttest.NewNopTelemetrySettings() - _, err := cfg.Build(&set) + _, err := cfg.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "invalid `on_error` field") } @@ -50,7 +50,7 @@ func TestParserByteFailureHeadersMismatch(t *testing.T) { cfg := NewConfigWithID("test") cfg.Header = "name,sev,msg" set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) parser := op.(*Parser) _, err = parser.parse("[\"stanza\",\"INFO\",\"started agent\", 42, true]") @@ -252,7 +252,7 @@ func TestParserJarray(t *testing.T) { tc.configure(cfg) set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) if tc.expectBuildErr { require.Error(t, err) return @@ -374,7 +374,7 @@ dd","eeee"]`, cfg.OutputIDs = []string{"fake"} set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) fake := testutil.NewFakeOutput(t) @@ -402,7 +402,7 @@ func TestBuildParserJarray(t *testing.T) { t.Run("BasicConfig", func(t *testing.T) { c := newBasicParser() set := componenttest.NewNopTelemetrySettings() - _, err := c.Build(&set) + _, err := c.Build(set) require.NoError(t, err) }) } diff --git a/pkg/stanza/operator/parser/keyvalue/config.go b/pkg/stanza/operator/parser/keyvalue/config.go index 8ed5fbd9263a..b50219f9f4dd 100644 --- a/pkg/stanza/operator/parser/keyvalue/config.go +++ b/pkg/stanza/operator/parser/keyvalue/config.go @@ -40,7 +40,7 @@ type Config struct { } // Build will build a key value parser operator. -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { parserOperator, err := c.ParserConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/parser/keyvalue/parser_test.go b/pkg/stanza/operator/parser/keyvalue/parser_test.go index 48dacfd5c0d8..4df63935dd47 100644 --- a/pkg/stanza/operator/parser/keyvalue/parser_test.go +++ b/pkg/stanza/operator/parser/keyvalue/parser_test.go @@ -20,7 +20,7 @@ import ( func newTestParser(t *testing.T) *Parser { config := NewConfigWithID("test") set := componenttest.NewNopTelemetrySettings() - op, err := config.Build(&set) + op, err := config.Build(set) require.NoError(t, err) return op.(*Parser) } @@ -34,7 +34,7 @@ func TestInit(t *testing.T) { func TestConfigBuild(t *testing.T) { config := NewConfigWithID("test") set := componenttest.NewNopTelemetrySettings() - op, err := config.Build(&set) + op, err := config.Build(set) require.NoError(t, err) require.IsType(t, &Parser{}, op) } @@ -43,7 +43,7 @@ func TestConfigBuildFailure(t *testing.T) { config := NewConfigWithID("test") config.OnError = "invalid_on_error" set := componenttest.NewNopTelemetrySettings() - _, err := config.Build(&set) + _, err := config.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "invalid `on_error` field") } @@ -138,7 +138,7 @@ func TestBuild(t *testing.T) { t.Run(tc.name, func(t *testing.T) { cfg := tc.input set := componenttest.NewNopTelemetrySettings() - _, err := cfg.Build(&set) + _, err := cfg.Build(set) if tc.expectErr { require.Error(t, err) return @@ -701,7 +701,7 @@ key=value`, tc.configure(cfg) set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) if tc.expectBuildErr { require.Error(t, err) return diff --git a/pkg/stanza/operator/parser/regex/config.go b/pkg/stanza/operator/parser/regex/config.go index fe600edd0d61..420c86e82a2c 100644 --- a/pkg/stanza/operator/parser/regex/config.go +++ b/pkg/stanza/operator/parser/regex/config.go @@ -45,7 +45,7 @@ type Config struct { } // Build will build a regex parser operator. -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { parserOperator, err := c.ParserConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/parser/regex/parser_test.go b/pkg/stanza/operator/parser/regex/parser_test.go index 41e2361b9678..b6eb97079bc9 100644 --- a/pkg/stanza/operator/parser/regex/parser_test.go +++ b/pkg/stanza/operator/parser/regex/parser_test.go @@ -26,7 +26,7 @@ func newTestParser(t *testing.T, regex string, cacheSize uint16) *Parser { cfg.Cache.Size = cacheSize } set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) return op.(*Parser) } @@ -35,7 +35,7 @@ func TestParserBuildFailure(t *testing.T) { cfg := NewConfigWithID("test") cfg.OnError = "invalid_on_error" set := componenttest.NewNopTelemetrySettings() - _, err := cfg.Build(&set) + _, err := cfg.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "invalid `on_error` field") } @@ -139,7 +139,7 @@ func TestParserRegex(t *testing.T) { tc.configure(cfg) set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) defer func() { @@ -172,7 +172,7 @@ func TestBuildParserRegex(t *testing.T) { t.Run("BasicConfig", func(t *testing.T) { c := newBasicParser() set := componenttest.NewNopTelemetrySettings() - _, err := c.Build(&set) + _, err := c.Build(set) require.NoError(t, err) }) @@ -180,7 +180,7 @@ func TestBuildParserRegex(t *testing.T) { c := newBasicParser() c.Regex = "" set := componenttest.NewNopTelemetrySettings() - _, err := c.Build(&set) + _, err := c.Build(set) require.Error(t, err) }) @@ -188,7 +188,7 @@ func TestBuildParserRegex(t *testing.T) { c := newBasicParser() c.Regex = "())()" set := componenttest.NewNopTelemetrySettings() - _, err := c.Build(&set) + _, err := c.Build(set) require.Error(t, err) }) @@ -196,7 +196,7 @@ func TestBuildParserRegex(t *testing.T) { c := newBasicParser() c.Regex = ".*" set := componenttest.NewNopTelemetrySettings() - _, err := c.Build(&set) + _, err := c.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "no named capture groups") }) @@ -205,7 +205,7 @@ func TestBuildParserRegex(t *testing.T) { c := newBasicParser() c.Regex = "(.*)" set := componenttest.NewNopTelemetrySettings() - _, err := c.Build(&set) + _, err := c.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "no named capture groups") }) @@ -241,7 +241,7 @@ func newTestBenchParser(t *testing.T, cacheSize uint16) *Parser { cfg.Cache.Size = cacheSize set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) return op.(*Parser) } diff --git a/pkg/stanza/operator/parser/scope/config.go b/pkg/stanza/operator/parser/scope/config.go index 8ad80cf3de32..34d5425abcc8 100644 --- a/pkg/stanza/operator/parser/scope/config.go +++ b/pkg/stanza/operator/parser/scope/config.go @@ -36,7 +36,7 @@ type Config struct { } // Build will build a logger name parser operator. -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { transformerOperator, err := c.TransformerConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/parser/scope/parser_test.go b/pkg/stanza/operator/parser/scope/parser_test.go index e6852f7cbe63..3f8e614d405a 100644 --- a/pkg/stanza/operator/parser/scope/parser_test.go +++ b/pkg/stanza/operator/parser/scope/parser_test.go @@ -93,7 +93,7 @@ func TestScopeNameParser(t *testing.T) { for _, tc := range testCases { t.Run(tc.name, func(t *testing.T) { set := componenttest.NewNopTelemetrySettings() - parser, err := tc.config.Build(&set) + parser, err := tc.config.Build(set) require.NoError(t, err) err = parser.Process(context.Background(), tc.input) diff --git a/pkg/stanza/operator/parser/severity/config.go b/pkg/stanza/operator/parser/severity/config.go index 5b0eca5ab0bd..667899a7f6e3 100644 --- a/pkg/stanza/operator/parser/severity/config.go +++ b/pkg/stanza/operator/parser/severity/config.go @@ -36,7 +36,7 @@ type Config struct { } // Build will build a severity parser operator. -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { transformerOperator, err := c.TransformerConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/parser/severity/parser_test.go b/pkg/stanza/operator/parser/severity/parser_test.go index 517846d0168c..666f00b88f99 100644 --- a/pkg/stanza/operator/parser/severity/parser_test.go +++ b/pkg/stanza/operator/parser/severity/parser_test.go @@ -224,7 +224,7 @@ func TestSeverityParser(t *testing.T) { func runSeverityParseTest(cfg *Config, ent *entry.Entry, buildErr bool, parseErr bool, expected entry.Severity) func(*testing.T) { return func(t *testing.T) { set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) if buildErr { require.Error(t, err, "expected error when configuring operator") return diff --git a/pkg/stanza/operator/parser/syslog/config.go b/pkg/stanza/operator/parser/syslog/config.go index cea10d83c40e..08d1f02848ca 100644 --- a/pkg/stanza/operator/parser/syslog/config.go +++ b/pkg/stanza/operator/parser/syslog/config.go @@ -58,7 +58,7 @@ type BaseConfig struct { } // Build will build a JSON parser operator. -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { if c.ParserConfig.TimeParser == nil { parseFromField := entry.NewAttributeField("timestamp") c.ParserConfig.TimeParser = &helper.TimeParser{ diff --git a/pkg/stanza/operator/parser/syslog/config_test.go b/pkg/stanza/operator/parser/syslog/config_test.go index 85ec9d913b43..3d29fc57885d 100644 --- a/pkg/stanza/operator/parser/syslog/config_test.go +++ b/pkg/stanza/operator/parser/syslog/config_test.go @@ -127,7 +127,7 @@ func TestUnmarshal(t *testing.T) { func TestParserMissingProtocol(t *testing.T) { set := componenttest.NewNopTelemetrySettings() - _, err := NewConfig().Build(&set) + _, err := NewConfig().Build(set) require.Error(t, err) require.Contains(t, err.Error(), "missing field 'protocol'") } @@ -215,7 +215,7 @@ func TestRFC6587ConfigOptions(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { set := componenttest.NewNopTelemetrySettings() - _, err := tc.cfg.Build(&set) + _, err := tc.cfg.Build(set) if tc.errContents != "" { require.ErrorContains(t, err, tc.errContents) } else { @@ -231,7 +231,7 @@ func TestParserInvalidLocation(t *testing.T) { config.Protocol = RFC3164 set := componenttest.NewNopTelemetrySettings() - _, err := config.Build(&set) + _, err := config.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "failed to load location "+config.Location) } diff --git a/pkg/stanza/operator/parser/syslog/parser_test.go b/pkg/stanza/operator/parser/syslog/parser_test.go index 63755577b190..2e3ac6d051f2 100644 --- a/pkg/stanza/operator/parser/syslog/parser_test.go +++ b/pkg/stanza/operator/parser/syslog/parser_test.go @@ -29,7 +29,7 @@ func TestParser(t *testing.T) { for _, tc := range cases { t.Run(tc.Name, func(t *testing.T) { set := componenttest.NewNopTelemetrySettings() - op, err := tc.Config.Build(&set) + op, err := tc.Config.Build(set) require.NoError(t, err) fake := testutil.NewFakeOutput(t) @@ -60,7 +60,7 @@ func TestSyslogParseRFC5424_SDNameTooLong(t *testing.T) { body := `<86>1 2015-08-05T21:58:59.693Z 192.168.2.132 SecureAuth0 23108 ID52020 [verylongsdnamethatisgreaterthan32bytes@12345 UserHostAddress="192.168.2.132"] my message` set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) fake := testutil.NewFakeOutput(t) @@ -86,7 +86,7 @@ func TestSyslogProtocolConfig(t *testing.T) { cfg := basicConfig() cfg.Protocol = proto set := componenttest.NewNopTelemetrySettings() - _, err := cfg.Build(&set) + _, err := cfg.Build(set) require.NoError(t, err) } @@ -94,7 +94,7 @@ func TestSyslogProtocolConfig(t *testing.T) { cfg := basicConfig() cfg.Protocol = proto set := componenttest.NewNopTelemetrySettings() - _, err := cfg.Build(&set) + _, err := cfg.Build(set) require.Error(t, err) } } diff --git a/pkg/stanza/operator/parser/time/config.go b/pkg/stanza/operator/parser/time/config.go index 869e7c44985c..6ec1859e4bc1 100644 --- a/pkg/stanza/operator/parser/time/config.go +++ b/pkg/stanza/operator/parser/time/config.go @@ -41,7 +41,7 @@ func (c *Config) Unmarshal(component *confmap.Conf) error { } // Build will build a time parser operator. -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { transformerOperator, err := c.TransformerConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/parser/time/parser_test.go b/pkg/stanza/operator/parser/time/parser_test.go index 69166af8994d..8482da4aeeab 100644 --- a/pkg/stanza/operator/parser/time/parser_test.go +++ b/pkg/stanza/operator/parser/time/parser_test.go @@ -65,7 +65,7 @@ func TestBuild(t *testing.T) { cfg, err := tc.input() require.NoError(t, err, "expected nil error when running test cases input func") set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) if tc.expectErr { require.Error(t, err, "expected error while building time_parser operator") return @@ -124,7 +124,7 @@ func TestProcess(t *testing.T) { return } set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) if err != nil { require.NoError(t, err) return @@ -505,7 +505,7 @@ func runTimeParseTest(t *testing.T, cfg *Config, ent *entry.Entry, buildErr bool func runLossyTimeParseTest(_ *testing.T, cfg *Config, ent *entry.Entry, buildErr bool, parseErr bool, expected time.Time, maxLoss time.Duration) func(*testing.T) { return func(t *testing.T) { set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) if buildErr { require.Error(t, err, "expected error when configuring operator") return diff --git a/pkg/stanza/operator/parser/trace/config.go b/pkg/stanza/operator/parser/trace/config.go index c0410d64d16b..76eacdfe27f2 100644 --- a/pkg/stanza/operator/parser/trace/config.go +++ b/pkg/stanza/operator/parser/trace/config.go @@ -36,7 +36,7 @@ type Config struct { } // Build will build a trace parser operator. -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { transformerOperator, err := c.TransformerConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/parser/trace/parser_test.go b/pkg/stanza/operator/parser/trace/parser_test.go index d3c364c5487e..c2cc72d4fe40 100644 --- a/pkg/stanza/operator/parser/trace/parser_test.go +++ b/pkg/stanza/operator/parser/trace/parser_test.go @@ -23,7 +23,7 @@ func TestInit(t *testing.T) { func TestDefaultParser(t *testing.T) { traceParserConfig := NewConfig() set := componenttest.NewNopTelemetrySettings() - _, err := traceParserConfig.Build(&set) + _, err := traceParserConfig.Build(set) require.NoError(t, err) } @@ -85,7 +85,7 @@ func TestBuild(t *testing.T) { cfg, err := tc.input() require.NoError(t, err, "expected nil error when running test cases input func") set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) if tc.expectErr { require.Error(t, err, "expected error while building trace_parser operator") return @@ -112,7 +112,7 @@ func TestProcess(t *testing.T) { func() (operator.Operator, error) { cfg := NewConfigWithID("test_id") set := componenttest.NewNopTelemetrySettings() - return cfg.Build(&set) + return cfg.Build(set) }, &entry.Entry{ Body: "https://google.com:443/path?user=dev", @@ -132,7 +132,7 @@ func TestProcess(t *testing.T) { cfg.TraceID.ParseFrom = &traceFrom cfg.TraceFlags.ParseFrom = &flagsFrom set := componenttest.NewNopTelemetrySettings() - return cfg.Build(&set) + return cfg.Build(set) }, &entry.Entry{ Body: map[string]any{ @@ -263,7 +263,7 @@ func TestTraceParserParse(t *testing.T) { t.Run(tc.name, func(t *testing.T) { traceParserConfig := NewConfigWithID("") set := componenttest.NewNopTelemetrySettings() - _, _ = traceParserConfig.Build(&set) + _, _ = traceParserConfig.Build(set) e := entry.New() e.Body = tc.inputRecord err := traceParserConfig.Parse(e) diff --git a/pkg/stanza/operator/parser/uri/config.go b/pkg/stanza/operator/parser/uri/config.go index 456756e75c79..e1313436d7b1 100644 --- a/pkg/stanza/operator/parser/uri/config.go +++ b/pkg/stanza/operator/parser/uri/config.go @@ -34,7 +34,7 @@ type Config struct { } // Build will build a uri parser operator. -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { parserOperator, err := c.ParserConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/parser/uri/parser_test.go b/pkg/stanza/operator/parser/uri/parser_test.go index 52994cf04858..3bec6dc7469e 100644 --- a/pkg/stanza/operator/parser/uri/parser_test.go +++ b/pkg/stanza/operator/parser/uri/parser_test.go @@ -18,7 +18,7 @@ import ( func newTestParser(t *testing.T) *Parser { cfg := NewConfigWithID("test") set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) return op.(*Parser) } @@ -33,7 +33,7 @@ func TestParserBuildFailure(t *testing.T) { cfg := NewConfigWithID("test") cfg.OnError = "invalid_on_error" set := componenttest.NewNopTelemetrySettings() - _, err := cfg.Build(&set) + _, err := cfg.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "invalid `on_error` field") } @@ -71,7 +71,7 @@ func TestProcess(t *testing.T) { func() (operator.Operator, error) { cfg := NewConfigWithID("test_id") set := componenttest.NewNopTelemetrySettings() - return cfg.Build(&set) + return cfg.Build(set) }, &entry.Entry{ Body: "https://google.com:443/path?user=dev", @@ -98,7 +98,7 @@ func TestProcess(t *testing.T) { cfg.ParseFrom = entry.NewBodyField("url") cfg.ParseTo = entry.RootableField{Field: entry.NewBodyField("url2")} set := componenttest.NewNopTelemetrySettings() - return cfg.Build(&set) + return cfg.Build(set) }, &entry.Entry{ Body: map[string]any{ @@ -128,7 +128,7 @@ func TestProcess(t *testing.T) { cfg := NewConfigWithID("test_id") cfg.ParseFrom = entry.NewBodyField("url") set := componenttest.NewNopTelemetrySettings() - return cfg.Build(&set) + return cfg.Build(set) }, &entry.Entry{ Body: map[string]any{ @@ -496,7 +496,7 @@ func TestBuildParserURL(t *testing.T) { t.Run("BasicConfig", func(t *testing.T) { c := newBasicParser() set := componenttest.NewNopTelemetrySettings() - _, err := c.Build(&set) + _, err := c.Build(set) require.NoError(t, err) }) } diff --git a/pkg/stanza/operator/transformer/add/config.go b/pkg/stanza/operator/transformer/add/config.go index d4fd484d8a76..9dfba8b46f57 100644 --- a/pkg/stanza/operator/transformer/add/config.go +++ b/pkg/stanza/operator/transformer/add/config.go @@ -40,7 +40,7 @@ type Config struct { } // Build will build an add operator from the supplied configuration -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { transformerOperator, err := c.TransformerConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/transformer/add/transformer_test.go b/pkg/stanza/operator/transformer/add/transformer_test.go index 8991f14acce0..08dc83dace87 100644 --- a/pkg/stanza/operator/transformer/add/transformer_test.go +++ b/pkg/stanza/operator/transformer/add/transformer_test.go @@ -342,7 +342,7 @@ func TestProcessAndBuild(t *testing.T) { cfg.OutputIDs = []string{"fake"} cfg.OnError = "drop" set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) add := op.(*Transformer) diff --git a/pkg/stanza/operator/transformer/assignkeys/config.go b/pkg/stanza/operator/transformer/assignkeys/config.go index b53b18016575..42990dab4f2a 100644 --- a/pkg/stanza/operator/transformer/assignkeys/config.go +++ b/pkg/stanza/operator/transformer/assignkeys/config.go @@ -48,7 +48,7 @@ type Config struct { } // Build will build an assign_keys operator from the supplied configuration -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { transformerOperator, err := c.TransformerConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/transformer/assignkeys/transformer_test.go b/pkg/stanza/operator/transformer/assignkeys/transformer_test.go index 35702748b855..b69daec10693 100644 --- a/pkg/stanza/operator/transformer/assignkeys/transformer_test.go +++ b/pkg/stanza/operator/transformer/assignkeys/transformer_test.go @@ -131,7 +131,7 @@ func TestBuildAndProcess(t *testing.T) { cfg.OnError = "drop" set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) if tc.expectErr && err != nil { require.Error(t, err) return diff --git a/pkg/stanza/operator/transformer/copy/config.go b/pkg/stanza/operator/transformer/copy/config.go index 02debfd7c9d1..be74943c185d 100644 --- a/pkg/stanza/operator/transformer/copy/config.go +++ b/pkg/stanza/operator/transformer/copy/config.go @@ -39,7 +39,7 @@ type Config struct { } // Build will build a copy operator from the supplied configuration -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { transformerOperator, err := c.TransformerConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/transformer/copy/transformer_test.go b/pkg/stanza/operator/transformer/copy/transformer_test.go index e9b25015efef..acbedbfd3ec7 100644 --- a/pkg/stanza/operator/transformer/copy/transformer_test.go +++ b/pkg/stanza/operator/transformer/copy/transformer_test.go @@ -289,7 +289,7 @@ func TestBuildAndProcess(t *testing.T) { cfg.OutputIDs = []string{"fake"} cfg.OnError = "drop" set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) cp := op.(*Transformer) diff --git a/pkg/stanza/operator/transformer/filter/config.go b/pkg/stanza/operator/transformer/filter/config.go index b34fe086f0d6..4d8c82c264bb 100644 --- a/pkg/stanza/operator/transformer/filter/config.go +++ b/pkg/stanza/operator/transformer/filter/config.go @@ -46,7 +46,7 @@ type Config struct { } // Build will build a filter operator from the supplied configuration -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { transformer, err := c.TransformerConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/transformer/filter/transformer_test.go b/pkg/stanza/operator/transformer/filter/transformer_test.go index 3657e7d6ecbe..f19bab3c9b50 100644 --- a/pkg/stanza/operator/transformer/filter/transformer_test.go +++ b/pkg/stanza/operator/transformer/filter/transformer_test.go @@ -181,7 +181,7 @@ func TestTransformer(t *testing.T) { cfg.Expression = tc.expression set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) filtered := true @@ -207,7 +207,7 @@ func TestFilterDropRatio(t *testing.T) { cfg.Expression = `body.message == "test_message"` cfg.DropRatio = 0.5 set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) processedEntries := 0 diff --git a/pkg/stanza/operator/transformer/flatten/config.go b/pkg/stanza/operator/transformer/flatten/config.go index bceb82e04d93..00fbf4125cf4 100644 --- a/pkg/stanza/operator/transformer/flatten/config.go +++ b/pkg/stanza/operator/transformer/flatten/config.go @@ -38,7 +38,7 @@ type Config struct { } // Build will build a Flatten operator from the supplied configuration -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { transformerOperator, err := c.TransformerConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/transformer/flatten/transformer_test.go b/pkg/stanza/operator/transformer/flatten/transformer_test.go index 4f05488f2488..1358e338fc17 100644 --- a/pkg/stanza/operator/transformer/flatten/transformer_test.go +++ b/pkg/stanza/operator/transformer/flatten/transformer_test.go @@ -321,7 +321,7 @@ func TestBuildAndProcess(t *testing.T) { cfg.OnError = "drop" set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) if tc.expectErr && err != nil { require.Error(t, err) t.SkipNow() diff --git a/pkg/stanza/operator/transformer/move/config.go b/pkg/stanza/operator/transformer/move/config.go index ff0d1504221b..2d37481f90a0 100644 --- a/pkg/stanza/operator/transformer/move/config.go +++ b/pkg/stanza/operator/transformer/move/config.go @@ -39,7 +39,7 @@ type Config struct { } // Build will build a Move operator from the supplied configuration -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { transformerOperator, err := c.TransformerConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/transformer/move/transformer_test.go b/pkg/stanza/operator/transformer/move/transformer_test.go index f22f422696ba..d3ebb249d441 100644 --- a/pkg/stanza/operator/transformer/move/transformer_test.go +++ b/pkg/stanza/operator/transformer/move/transformer_test.go @@ -504,7 +504,7 @@ func TestProcessAndBuild(t *testing.T) { cfg.OutputIDs = []string{"fake"} cfg.OnError = "drop" set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) move := op.(*Transformer) diff --git a/pkg/stanza/operator/transformer/noop/config.go b/pkg/stanza/operator/transformer/noop/config.go index 83620ba4ccae..0a9410e16d31 100644 --- a/pkg/stanza/operator/transformer/noop/config.go +++ b/pkg/stanza/operator/transformer/noop/config.go @@ -34,7 +34,7 @@ type Config struct { } // Build will build a noop operator. -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { transformerOperator, err := c.TransformerConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/transformer/noop/config_test.go b/pkg/stanza/operator/transformer/noop/config_test.go index 1526c8443d49..92255e04e707 100644 --- a/pkg/stanza/operator/transformer/noop/config_test.go +++ b/pkg/stanza/operator/transformer/noop/config_test.go @@ -13,7 +13,7 @@ import ( func TestBuildValid(t *testing.T) { cfg := NewConfigWithID("test") set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) require.IsType(t, &Transformer{}, op) } @@ -22,7 +22,7 @@ func TestBuildInvalid(t *testing.T) { cfg := NewConfigWithID("test") set := componenttest.NewNopTelemetrySettings() set.Logger = nil - _, err := cfg.Build(&set) + _, err := cfg.Build(set) require.Error(t, err) require.Contains(t, err.Error(), "build context is missing a logger") } diff --git a/pkg/stanza/operator/transformer/noop/transformer_test.go b/pkg/stanza/operator/transformer/noop/transformer_test.go index 63f2b0b15c97..585972925af0 100644 --- a/pkg/stanza/operator/transformer/noop/transformer_test.go +++ b/pkg/stanza/operator/transformer/noop/transformer_test.go @@ -19,7 +19,7 @@ func TestProcess(t *testing.T) { cfg := NewConfigWithID("test") cfg.OutputIDs = []string{"fake"} set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) fake := testutil.NewFakeOutput(t) diff --git a/pkg/stanza/operator/transformer/recombine/config.go b/pkg/stanza/operator/transformer/recombine/config.go index 23c400279eee..ab02db27d80c 100644 --- a/pkg/stanza/operator/transformer/recombine/config.go +++ b/pkg/stanza/operator/transformer/recombine/config.go @@ -62,7 +62,7 @@ type Config struct { } // Build creates a new Transformer from a config -func (c *Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c *Config) Build(set component.TelemetrySettings) (operator.Operator, error) { transformer, err := c.TransformerConfig.Build(set) if err != nil { return nil, fmt.Errorf("failed to build transformer config: %w", err) diff --git a/pkg/stanza/operator/transformer/recombine/transformer_test.go b/pkg/stanza/operator/transformer/recombine/transformer_test.go index e0f282bbb1d8..d78931741646 100644 --- a/pkg/stanza/operator/transformer/recombine/transformer_test.go +++ b/pkg/stanza/operator/transformer/recombine/transformer_test.go @@ -672,7 +672,7 @@ func TestTransformer(t *testing.T) { t.Run(tc.name, func(t *testing.T) { ctx := context.Background() set := componenttest.NewNopTelemetrySettings() - op, err := tc.config.Build(&set) + op, err := tc.config.Build(set) require.NoError(t, err) require.NoError(t, op.Start(testutil.NewUnscopedMockPersister())) defer func() { require.NoError(t, op.Stop()) }() @@ -702,7 +702,7 @@ func TestTransformer(t *testing.T) { cfg.IsFirstEntry = MatchAll cfg.OutputIDs = []string{"fake"} set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) recombine := op.(*Transformer) @@ -739,7 +739,7 @@ func BenchmarkRecombine(b *testing.B) { cfg.OutputIDs = []string{"fake"} cfg.SourceIdentifier = entry.NewAttributeField("file.path") set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(b, err) recombine := op.(*Transformer) @@ -783,7 +783,7 @@ func BenchmarkRecombineLimitTrigger(b *testing.B) { cfg.MaxLogSize = 6 cfg.OutputIDs = []string{"fake"} set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(b, err) recombine := op.(*Transformer) @@ -826,7 +826,7 @@ func TestTimeout(t *testing.T) { cfg.OutputIDs = []string{"fake"} cfg.ForceFlushTimeout = 100 * time.Millisecond set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) recombine := op.(*Transformer) @@ -870,7 +870,7 @@ func TestTimeoutWhenAggregationKeepHappen(t *testing.T) { cfg.OutputIDs = []string{"fake"} cfg.ForceFlushTimeout = 100 * time.Millisecond set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) recombine := op.(*Transformer) @@ -924,7 +924,7 @@ func TestSourceBatchDelete(t *testing.T) { cfg.ForceFlushTimeout = 100 * time.Millisecond cfg.MaxLogSize = 6 set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) recombine := op.(*Transformer) diff --git a/pkg/stanza/operator/transformer/remove/config.go b/pkg/stanza/operator/transformer/remove/config.go index ad52954e5044..866ab05cd9ff 100644 --- a/pkg/stanza/operator/transformer/remove/config.go +++ b/pkg/stanza/operator/transformer/remove/config.go @@ -39,7 +39,7 @@ type Config struct { } // Build will build a Remove operator from the supplied configuration -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { transformerOperator, err := c.TransformerConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/transformer/remove/transformer_test.go b/pkg/stanza/operator/transformer/remove/transformer_test.go index 3b216d734660..c210567affff 100644 --- a/pkg/stanza/operator/transformer/remove/transformer_test.go +++ b/pkg/stanza/operator/transformer/remove/transformer_test.go @@ -254,7 +254,7 @@ func TestProcessAndBuild(t *testing.T) { cfg.OutputIDs = []string{"fake"} cfg.OnError = "drop" set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) remove := op.(*Transformer) diff --git a/pkg/stanza/operator/transformer/retain/config.go b/pkg/stanza/operator/transformer/retain/config.go index c585654936f2..3d3c8cafdbc6 100644 --- a/pkg/stanza/operator/transformer/retain/config.go +++ b/pkg/stanza/operator/transformer/retain/config.go @@ -39,7 +39,7 @@ type Config struct { } // Build will build a retain operator from the supplied configuration -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { transformerOperator, err := c.TransformerConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/transformer/retain/transformer_test.go b/pkg/stanza/operator/transformer/retain/transformer_test.go index cf064e4bd89d..d0ca8692acfb 100644 --- a/pkg/stanza/operator/transformer/retain/transformer_test.go +++ b/pkg/stanza/operator/transformer/retain/transformer_test.go @@ -386,7 +386,7 @@ func TestBuildAndProcess(t *testing.T) { cfg.OutputIDs = []string{"fake"} cfg.OnError = "drop" set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) retain := op.(*Transformer) diff --git a/pkg/stanza/operator/transformer/router/config.go b/pkg/stanza/operator/transformer/router/config.go index 144c816460bb..ec40315944cb 100644 --- a/pkg/stanza/operator/transformer/router/config.go +++ b/pkg/stanza/operator/transformer/router/config.go @@ -45,7 +45,7 @@ type RouteConfig struct { } // Build will build a router operator from the supplied configuration -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { basicOperator, err := c.BasicConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/transformer/router/transformer_test.go b/pkg/stanza/operator/transformer/router/transformer_test.go index 696b816ddc36..0e08f2ed3605 100644 --- a/pkg/stanza/operator/transformer/router/transformer_test.go +++ b/pkg/stanza/operator/transformer/router/transformer_test.go @@ -185,7 +185,7 @@ func TestTransformer(t *testing.T) { cfg.Default = tc.defaultOutput set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) results := map[string]int{} diff --git a/pkg/stanza/operator/transformer/unquote/config.go b/pkg/stanza/operator/transformer/unquote/config.go index 1915d4f059cd..a72b6b407404 100644 --- a/pkg/stanza/operator/transformer/unquote/config.go +++ b/pkg/stanza/operator/transformer/unquote/config.go @@ -36,7 +36,7 @@ type Config struct { } // Build will build an unquote operator. -func (c Config) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) { transformerOperator, err := c.TransformerConfig.Build(set) if err != nil { return nil, err diff --git a/pkg/stanza/operator/transformer/unquote/transformer_test.go b/pkg/stanza/operator/transformer/unquote/transformer_test.go index a7bfa2ab518e..1b2ca7190e81 100644 --- a/pkg/stanza/operator/transformer/unquote/transformer_test.go +++ b/pkg/stanza/operator/transformer/unquote/transformer_test.go @@ -196,7 +196,7 @@ func TestBuildAndProcess(t *testing.T) { cfg.OutputIDs = []string{"fake"} cfg.OnError = "send" set := componenttest.NewNopTelemetrySettings() - op, err := cfg.Build(&set) + op, err := cfg.Build(set) require.NoError(t, err) unqouteOp := op.(*Transformer) diff --git a/pkg/stanza/pipeline/config.go b/pkg/stanza/pipeline/config.go index eb17dfb2c9af..dfc6381a9c11 100644 --- a/pkg/stanza/pipeline/config.go +++ b/pkg/stanza/pipeline/config.go @@ -19,7 +19,7 @@ type Config struct { } // Build will build a pipeline from the config. -func (c Config) Build(set *component.TelemetrySettings) (*DirectedPipeline, error) { +func (c Config) Build(set component.TelemetrySettings) (*DirectedPipeline, error) { if set.Logger == nil { return nil, errors.NewError("logger must be provided", "") } diff --git a/pkg/stanza/pipeline/config_test.go b/pkg/stanza/pipeline/config_test.go index 1af2a63fc1fa..731796238b25 100644 --- a/pkg/stanza/pipeline/config_test.go +++ b/pkg/stanza/pipeline/config_test.go @@ -27,7 +27,7 @@ func TestBuildPipelineSuccess(t *testing.T) { } set := componenttest.NewNopTelemetrySettings() - pipe, err := cfg.Build(&set) + pipe, err := cfg.Build(set) require.NoError(t, err) require.Equal(t, 1, len(pipe.Operators())) } @@ -43,7 +43,7 @@ func TestBuildPipelineNoLogger(t *testing.T) { set := componenttest.NewNopTelemetrySettings() set.Logger = nil - pipe, err := cfg.Build(&set) + pipe, err := cfg.Build(set) require.EqualError(t, err, "logger must be provided") require.Nil(t, pipe) } @@ -52,7 +52,7 @@ func TestBuildPipelineNilOperators(t *testing.T) { cfg := Config{} set := componenttest.NewNopTelemetrySettings() - pipe, err := cfg.Build(&set) + pipe, err := cfg.Build(set) require.EqualError(t, err, "operators must be specified") require.Nil(t, pipe) } @@ -63,7 +63,7 @@ func TestBuildPipelineEmptyOperators(t *testing.T) { } set := componenttest.NewNopTelemetrySettings() - pipe, err := cfg.Build(&set) + pipe, err := cfg.Build(set) require.EqualError(t, err, "empty pipeline not allowed") require.Nil(t, pipe) } @@ -82,7 +82,7 @@ func TestBuildAPipelineDefaultOperator(t *testing.T) { } set := componenttest.NewNopTelemetrySettings() - pipe, err := cfg.Build(&set) + pipe, err := cfg.Build(set) require.NoError(t, err) ops := pipe.Operators() @@ -367,7 +367,7 @@ func TestUpdateOutputIDs(t *testing.T) { pipeline, err := Config{ Operators: tc.ops(), DefaultOutput: tc.defaultOut, - }.Build(&set) + }.Build(set) require.NoError(t, err) ops := pipeline.Operators() diff --git a/processor/logstransformprocessor/factory.go b/processor/logstransformprocessor/factory.go index 5fbf5e8e8bdc..f86b3cefc7df 100644 --- a/processor/logstransformprocessor/factory.go +++ b/processor/logstransformprocessor/factory.go @@ -47,5 +47,5 @@ func createLogsProcessor( return nil, errors.New("no operators were configured for this logs transform processor") } - return newProcessor(pCfg, nextConsumer, &set.TelemetrySettings) + return newProcessor(pCfg, nextConsumer, set.TelemetrySettings) } diff --git a/processor/logstransformprocessor/processor.go b/processor/logstransformprocessor/processor.go index d3570ae6680d..e194bb3573c3 100644 --- a/processor/logstransformprocessor/processor.go +++ b/processor/logstransformprocessor/processor.go @@ -36,7 +36,7 @@ type logsTransformProcessor struct { shutdownFns []component.ShutdownFunc } -func newProcessor(config *Config, nextConsumer consumer.Logs, set *component.TelemetrySettings) (*logsTransformProcessor, error) { +func newProcessor(config *Config, nextConsumer consumer.Logs, set component.TelemetrySettings) (*logsTransformProcessor, error) { p := &logsTransformProcessor{ logger: set.Logger, config: config, diff --git a/processor/logstransformprocessor/processor_test.go b/processor/logstransformprocessor/processor_test.go index fc1b2d0f4c7f..4f51240a313c 100644 --- a/processor/logstransformprocessor/processor_test.go +++ b/processor/logstransformprocessor/processor_test.go @@ -225,7 +225,7 @@ type laggyOperatorConfig struct { helper.WriterConfig } -func (l *laggyOperatorConfig) Build(set *component.TelemetrySettings) (operator.Operator, error) { +func (l *laggyOperatorConfig) Build(set component.TelemetrySettings) (operator.Operator, error) { wo, err := l.WriterConfig.Build(set) if err != nil { return nil, err diff --git a/receiver/otlpjsonfilereceiver/file.go b/receiver/otlpjsonfilereceiver/file.go index a467338a198d..01d4e1b94a00 100644 --- a/receiver/otlpjsonfilereceiver/file.go +++ b/receiver/otlpjsonfilereceiver/file.go @@ -78,7 +78,7 @@ func createLogsReceiver(_ context.Context, settings receiver.CreateSettings, con if cfg.ReplayFile { opts = append(opts, fileconsumer.WithNoTracking()) } - input, err := cfg.Config.Build(&settings.TelemetrySettings, func(ctx context.Context, token []byte, _ map[string]any) error { + input, err := cfg.Config.Build(settings.TelemetrySettings, func(ctx context.Context, token []byte, _ map[string]any) error { ctx = obsrecv.StartLogsOp(ctx) var l plog.Logs l, err = logsUnmarshaler.UnmarshalLogs(token) @@ -115,7 +115,7 @@ func createMetricsReceiver(_ context.Context, settings receiver.CreateSettings, if cfg.ReplayFile { opts = append(opts, fileconsumer.WithNoTracking()) } - input, err := cfg.Config.Build(&settings.TelemetrySettings, func(ctx context.Context, token []byte, _ map[string]any) error { + input, err := cfg.Config.Build(settings.TelemetrySettings, func(ctx context.Context, token []byte, _ map[string]any) error { ctx = obsrecv.StartMetricsOp(ctx) var m pmetric.Metrics m, err = metricsUnmarshaler.UnmarshalMetrics(token) @@ -151,7 +151,7 @@ func createTracesReceiver(_ context.Context, settings receiver.CreateSettings, c if cfg.ReplayFile { opts = append(opts, fileconsumer.WithNoTracking()) } - input, err := cfg.Config.Build(&settings.TelemetrySettings, func(ctx context.Context, token []byte, _ map[string]any) error { + input, err := cfg.Config.Build(settings.TelemetrySettings, func(ctx context.Context, token []byte, _ map[string]any) error { ctx = obsrecv.StartTracesOp(ctx) var t ptrace.Traces t, err = tracesUnmarshaler.UnmarshalTraces(token)