From dfa6b6ee621ae024a5afae6e2db1813f6448192e Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Tue, 1 Oct 2024 14:27:29 -0600 Subject: [PATCH] [component] Remove deprecated DataType (#11253) #### Description Continues the switch to use `pipeline.ID` and `pipeline.Signal`. - Removes deprecated code - Continues rename process for function/type changes. #### Link to tracking issue Related to https://github.com/open-telemetry/opentelemetry-collector/issues/9429 --- .chloggen/pipeline-continue-refactor.yaml | 25 ++++++++++++++++++++ component/component.go | 10 -------- component/config.go | 28 ----------------------- component/go.mod | 6 ----- config/configauth/go.mod | 6 ----- config/configgrpc/go.mod | 6 ----- config/confighttp/go.mod | 6 ----- extension/auth/go.mod | 6 ----- extension/experimental/storage/go.mod | 6 ----- extension/extensioncapabilities/go.mod | 6 ----- extension/go.mod | 6 ----- extension/memorylimiterextension/go.mod | 2 -- service/pipelines/config_test.go | 14 ++++++------ 13 files changed, 32 insertions(+), 95 deletions(-) create mode 100644 .chloggen/pipeline-continue-refactor.yaml diff --git a/.chloggen/pipeline-continue-refactor.yaml b/.chloggen/pipeline-continue-refactor.yaml new file mode 100644 index 00000000000..915abda7b93 --- /dev/null +++ b/.chloggen/pipeline-continue-refactor.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: component + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Removed deprecated `ErrDataTypeIsNotSupported`, `DataType`, `DataTypeTraces`, `DataTypeMetrics`, and `DataTypeLogs`. Use `pipeline.ErrSignalNotSupported`, `pipeline.Signal`, `pipeline.SignalTraces`, `pipeline.SignalMetrics`, and `pipeline.SignalLogs` instead. + +# One or more tracking issues or pull requests related to the change +issues: [11253] + +# (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: [api] diff --git a/component/component.go b/component/component.go index 40267a416ab..7e8c1426dfd 100644 --- a/component/component.go +++ b/component/component.go @@ -7,16 +7,6 @@ package component // import "go.opentelemetry.io/collector/component" import ( "context" - - "go.opentelemetry.io/collector/pipeline" -) - -var ( - // ErrDataTypeIsNotSupported can be returned by receiver, exporter, processor or connector factory funcs that create the - // Component if the particular telemetry data type is not supported by the receiver, exporter, processor or connector factory. - // - // Deprecated: [v0.110.0] Use pipeline.ErrSignalNotSupported instead - ErrDataTypeIsNotSupported = pipeline.ErrSignalNotSupported ) // Component is either a receiver, exporter, processor, connector, or an extension. diff --git a/component/config.go b/component/config.go index 001b18916cd..91898258f6a 100644 --- a/component/config.go +++ b/component/config.go @@ -145,34 +145,6 @@ func MustNewType(strType string) Type { return ty } -// DataType is a special Type that represents the data types supported by the collector. We currently support -// collecting metrics, traces and logs, this can expand in the future. -// -// Deprecated: [v0.110.0] Use pipeline.Signal instead. -type DataType = Type - -func mustNewDataType(strType string) DataType { - return MustNewType(strType) -} - -// Currently supported data types. Add new data types here when new types are supported in the future. -var ( - // DataTypeTraces is the data type tag for traces. - // - // Deprecated: [v0.110.0] Use pipeline.SignalTraces instead. - DataTypeTraces = mustNewDataType("traces") - - // DataTypeMetrics is the data type tag for metrics. - // - // Deprecated: [v0.110.0] Use pipeline.SignalMetrics instead. - DataTypeMetrics = mustNewDataType("metrics") - - // DataTypeLogs is the data type tag for logs. - // - // Deprecated: [v0.110.0] Use pipeline.SignalLogs instead. - DataTypeLogs = mustNewDataType("logs") -) - // nameRegexp is used to validate the name of a component. A name can consist of // 1 to 1024 unicode characters excluding whitespace, control characters, and // symbols. diff --git a/component/go.mod b/component/go.mod index 503a622573c..d2f54d1e34c 100644 --- a/component/go.mod +++ b/component/go.mod @@ -6,7 +6,6 @@ require ( github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/config/configtelemetry v0.110.0 go.opentelemetry.io/collector/pdata v1.16.0 - go.opentelemetry.io/collector/pipeline v0.110.0 go.opentelemetry.io/otel v1.30.0 go.opentelemetry.io/otel/metric v1.30.0 go.opentelemetry.io/otel/sdk v1.30.0 @@ -24,7 +23,6 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/google/uuid v1.6.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.110.0 // indirect golang.org/x/net v0.28.0 // indirect golang.org/x/sys v0.25.0 // indirect golang.org/x/text v0.17.0 // indirect @@ -42,7 +40,3 @@ retract ( v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1 v0.69.0 // Release failed, use v0.69.1 ) - -replace go.opentelemetry.io/collector/pipeline => ../pipeline - -replace go.opentelemetry.io/collector/internal/globalsignal => ../internal/globalsignal diff --git a/config/configauth/go.mod b/config/configauth/go.mod index 0cae4d6210e..dd0ea7f391d 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -15,9 +15,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.110.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.110.0 // indirect go.opentelemetry.io/collector/pdata v1.16.0 // indirect - go.opentelemetry.io/collector/pipeline v0.110.0 // indirect go.opentelemetry.io/otel v1.30.0 // indirect go.opentelemetry.io/otel/metric v1.30.0 // indirect go.opentelemetry.io/otel/trace v1.30.0 // indirect @@ -41,7 +39,3 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../configtelemet replace go.opentelemetry.io/collector/extension => ../../extension replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth - -replace go.opentelemetry.io/collector/pipeline => ../../pipeline - -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index a0c895f6b66..17d4b5b23c1 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -38,9 +38,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/extension v0.110.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.110.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.110.0 // indirect - go.opentelemetry.io/collector/pipeline v0.110.0 // indirect go.opentelemetry.io/otel/metric v1.30.0 // indirect go.opentelemetry.io/otel/sdk v1.30.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.30.0 // indirect @@ -83,7 +81,3 @@ replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/consumer => ../../consumer - -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal - -replace go.opentelemetry.io/collector/pipeline => ../../pipeline diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index 8ca7547edd7..9874f60d470 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -34,9 +34,7 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/extension v0.110.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.110.0 // indirect go.opentelemetry.io/collector/pdata v1.16.0 // indirect - go.opentelemetry.io/collector/pipeline v0.110.0 // indirect go.opentelemetry.io/otel/sdk v1.30.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.30.0 // indirect go.opentelemetry.io/otel/trace v1.30.0 // indirect @@ -76,7 +74,3 @@ replace go.opentelemetry.io/collector/client => ../../client replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile - -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal - -replace go.opentelemetry.io/collector/pipeline => ../../pipeline diff --git a/extension/auth/go.mod b/extension/auth/go.mod index c603f4fbf2a..26ebad88ad1 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -18,9 +18,7 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.110.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.110.0 // indirect go.opentelemetry.io/collector/pdata v1.16.0 // indirect - go.opentelemetry.io/collector/pipeline v0.110.0 // indirect go.opentelemetry.io/otel v1.30.0 // indirect go.opentelemetry.io/otel/metric v1.30.0 // indirect go.opentelemetry.io/otel/sdk v1.30.0 // indirect @@ -43,7 +41,3 @@ replace go.opentelemetry.io/collector/extension => ../ replace go.opentelemetry.io/collector/pdata => ../../pdata replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry - -replace go.opentelemetry.io/collector/pipeline => ../../pipeline - -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal diff --git a/extension/experimental/storage/go.mod b/extension/experimental/storage/go.mod index 24bdb1fd056..6fe263dd740 100644 --- a/extension/experimental/storage/go.mod +++ b/extension/experimental/storage/go.mod @@ -10,9 +10,7 @@ require ( require ( github.com/gogo/protobuf v1.3.2 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.110.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.110.0 // indirect go.opentelemetry.io/collector/pdata v1.16.0 // indirect - go.opentelemetry.io/collector/pipeline v0.110.0 // indirect go.opentelemetry.io/otel v1.30.0 // indirect go.opentelemetry.io/otel/metric v1.30.0 // indirect go.opentelemetry.io/otel/trace v1.30.0 // indirect @@ -33,7 +31,3 @@ replace go.opentelemetry.io/collector/component => ../../../component replace go.opentelemetry.io/collector/pdata => ../../../pdata replace go.opentelemetry.io/collector/config/configtelemetry => ../../../config/configtelemetry - -replace go.opentelemetry.io/collector/internal/globalsignal => ../../../internal/globalsignal - -replace go.opentelemetry.io/collector/pipeline => ../../../pipeline diff --git a/extension/extensioncapabilities/go.mod b/extension/extensioncapabilities/go.mod index 5e31f7b9b86..257b8381743 100644 --- a/extension/extensioncapabilities/go.mod +++ b/extension/extensioncapabilities/go.mod @@ -17,9 +17,7 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.110.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.110.0 // indirect go.opentelemetry.io/collector/pdata v1.16.0 // indirect - go.opentelemetry.io/collector/pipeline v0.110.0 // indirect go.opentelemetry.io/otel v1.30.0 // indirect go.opentelemetry.io/otel/metric v1.30.0 // indirect go.opentelemetry.io/otel/trace v1.30.0 // indirect @@ -43,7 +41,3 @@ replace go.opentelemetry.io/collector/confmap => ../../confmap replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry replace go.opentelemetry.io/collector/component => ../../component - -replace go.opentelemetry.io/collector/pipeline => ../../pipeline - -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal diff --git a/extension/go.mod b/extension/go.mod index b9266bece51..c7568a4ffb8 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -16,9 +16,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.110.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.110.0 // indirect go.opentelemetry.io/collector/pdata v1.16.0 // indirect - go.opentelemetry.io/collector/pipeline v0.110.0 // indirect go.opentelemetry.io/otel v1.30.0 // indirect go.opentelemetry.io/otel/metric v1.30.0 // indirect go.opentelemetry.io/otel/sdk v1.30.0 // indirect @@ -40,7 +38,3 @@ replace go.opentelemetry.io/collector/component => ../component replace go.opentelemetry.io/collector/pdata => ../pdata replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry - -replace go.opentelemetry.io/collector/pipeline => ../pipeline - -replace go.opentelemetry.io/collector/internal/globalsignal => ../internal/globalsignal diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index 4be397f5d5c..c053d450f4b 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -34,9 +34,7 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.110.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.110.0 // indirect go.opentelemetry.io/collector/pdata v1.16.0 // indirect - go.opentelemetry.io/collector/pipeline v0.110.0 // indirect go.opentelemetry.io/otel v1.30.0 // indirect go.opentelemetry.io/otel/metric v1.30.0 // indirect go.opentelemetry.io/otel/sdk v1.30.0 // indirect diff --git a/service/pipelines/config_test.go b/service/pipelines/config_test.go index 2ec239ac54b..33a836f5395 100644 --- a/service/pipelines/config_test.go +++ b/service/pipelines/config_test.go @@ -17,7 +17,7 @@ import ( func TestConfigValidate(t *testing.T) { var testCases = []struct { name string // test case name (also file name containing config yaml) - cfgFn func() ConfigWithPipelineID + cfgFn func() Config expected error }{ { @@ -27,7 +27,7 @@ func TestConfigValidate(t *testing.T) { }, { name: "duplicate-processor-reference", - cfgFn: func() ConfigWithPipelineID { + cfgFn: func() Config { cfg := generateConfig() pipe := cfg[pipeline.MustNewID("traces")] pipe.Processors = append(pipe.Processors, pipe.Processors...) @@ -37,7 +37,7 @@ func TestConfigValidate(t *testing.T) { }, { name: "missing-pipeline-receivers", - cfgFn: func() ConfigWithPipelineID { + cfgFn: func() Config { cfg := generateConfig() cfg[pipeline.MustNewID("traces")].Receivers = nil return cfg @@ -46,7 +46,7 @@ func TestConfigValidate(t *testing.T) { }, { name: "missing-pipeline-exporters", - cfgFn: func() ConfigWithPipelineID { + cfgFn: func() Config { cfg := generateConfig() cfg[pipeline.MustNewID("traces")].Exporters = nil return cfg @@ -55,14 +55,14 @@ func TestConfigValidate(t *testing.T) { }, { name: "missing-pipelines", - cfgFn: func() ConfigWithPipelineID { + cfgFn: func() Config { return nil }, expected: errMissingServicePipelines, }, { name: "invalid-service-pipeline-type", - cfgFn: func() ConfigWithPipelineID { + cfgFn: func() Config { cfg := generateConfig() cfg[pipeline.MustNewID("wrongtype")] = &PipelineConfig{ Receivers: []component.ID{component.MustNewID("nop")}, @@ -83,7 +83,7 @@ func TestConfigValidate(t *testing.T) { } } -func generateConfig() ConfigWithPipelineID { +func generateConfig() Config { return map[pipeline.ID]*PipelineConfig{ pipeline.MustNewID("traces"): { Receivers: []component.ID{component.MustNewID("nop")},