Skip to content

Commit

Permalink
Revert pipeline type validation (open-telemetry#10078)
Browse files Browse the repository at this point in the history
#### Description

This PR reverts the change made in
open-telemetry#9257 due
to problems reported in
open-telemetry#10031.

<!-- Issue number if applicable -->
#### Link to tracking issue
Fixes open-telemetry#10031.
  • Loading branch information
ycombinator authored and andrzej-stencel committed May 27, 2024
1 parent 0305f02 commit 9a7fd3f
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 33 deletions.
25 changes: 25 additions & 0 deletions .chloggen/revert-validate-pipeline-types.yaml
Original file line number Diff line number Diff line change
@@ -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]
26 changes: 1 addition & 25 deletions otelcol/collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
}
8 changes: 0 additions & 8 deletions otelcol/collector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 9a7fd3f

Please sign in to comment.