From 67d37183e6ac9b7180fefc6dc3a55f2a75c12fba Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 3 May 2024 15:11:55 -0700 Subject: [PATCH] Revert pipeline type validation (#10078) #### Description This PR reverts the change made in https://github.com/open-telemetry/opentelemetry-collector/pull/9257 due to problems reported in https://github.com/open-telemetry/opentelemetry-collector/issues/10031. #### Link to tracking issue Fixes #10031. --- .chloggen/revert-validate-pipeline-types.yaml | 25 ++++++++++++++++++ otelcol/collector.go | 26 +------------------ otelcol/collector_test.go | 8 ------ 3 files changed, 26 insertions(+), 33 deletions(-) create mode 100644 .chloggen/revert-validate-pipeline-types.yaml diff --git a/.chloggen/revert-validate-pipeline-types.yaml b/.chloggen/revert-validate-pipeline-types.yaml new file mode 100644 index 00000000000..82ed0228449 --- /dev/null +++ b/.chloggen/revert-validate-pipeline-types.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: 'breaking' + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: service + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "The `validate` sub-command no longer validates that each pipeline's type is the same as its component types" + +# One or more tracking issues or pull requests related to the change +issues: [10031] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [user] diff --git a/otelcol/collector.go b/otelcol/collector.go index df0860446a2..bca6e9b86dc 100644 --- a/otelcol/collector.go +++ b/otelcol/collector.go @@ -240,11 +240,7 @@ func (col *Collector) DryRun(ctx context.Context) error { return fmt.Errorf("failed to get config: %w", err) } - if err := cfg.Validate(); err != nil { - return err - } - - return col.validatePipelineCfg(ctx, cfg, factories) + return cfg.Validate() } // Run starts the collector according to the given configuration, and waits for it to complete. @@ -325,23 +321,3 @@ func (col *Collector) shutdown(ctx context.Context) error { func (col *Collector) setCollectorState(state State) { col.state.Store(int32(state)) } - -// validatePipelineCfg validates that the components in a pipeline support the -// signal type of the pipeline. For example, this function will return an error if -// a metrics pipeline has non-metrics components. -func (col *Collector) validatePipelineCfg(ctx context.Context, cfg *Config, factories Factories) error { - set := service.Settings{ - Receivers: receiver.NewBuilder(cfg.Receivers, factories.Receivers), - Processors: processor.NewBuilder(cfg.Processors, factories.Processors), - Exporters: exporter.NewBuilder(cfg.Exporters, factories.Exporters), - Connectors: connector.NewBuilder(cfg.Connectors, factories.Connectors), - Extensions: extension.NewBuilder(cfg.Extensions, factories.Extensions), - } - - _, err := service.New(ctx, set, cfg.Service) - if err != nil { - return err - } - - return nil -} diff --git a/otelcol/collector_test.go b/otelcol/collector_test.go index 2ae56fc58c0..b96a6fc15db 100644 --- a/otelcol/collector_test.go +++ b/otelcol/collector_test.go @@ -433,14 +433,6 @@ func TestCollectorDryRun(t *testing.T) { }, expectedErr: `service::pipelines::traces: references processor "invalid" which is not configured`, }, - "logs_receiver_traces_pipeline": { - settings: CollectorSettings{ - BuildInfo: component.NewDefaultBuildInfo(), - Factories: nopFactories, - ConfigProviderSettings: newDefaultConfigProviderSettings([]string{filepath.Join("testdata", "otelcol-invalid-receiver-type.yaml")}), - }, - expectedErr: `failed to build pipelines: failed to create "nop_logs" receiver for data type "traces": telemetry type is not supported`, - }, } for name, test := range tests {