From 98a326a3c5999ca5baa1abbbf633a6e949604f9c Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Sun, 13 Oct 2024 13:47:00 -0700 Subject: [PATCH] Move componentprofiles to pipelineprofiles (#11421) Move componentprofiles to pipelineprofiles since only the signal constant is defined in that package. Signed-off-by: Bogdan Drutu --- .chloggen/movecomponentprofiles.yaml | 25 +++++ Makefile | 4 +- cmd/builder/internal/builder/main_test.go | 2 +- cmd/builder/test/core.builder.yaml | 2 +- cmd/otelcorecol/builder-config.yaml | 2 +- cmd/otelcorecol/go.mod | 6 +- connector/connectorprofiles/connector.go | 16 +-- connector/connectorprofiles/connector_test.go | 22 ++-- connector/connectorprofiles/go.mod | 6 +- .../connectorprofiles/profiles_router_test.go | 10 +- connector/forwardconnector/go.mod | 6 +- connector/go.mod | 6 +- internal/e2e/go.mod | 6 +- otelcol/go.mod | 6 +- otelcol/otelcoltest/go.mod | 6 +- .../pipelineprofiles}/Makefile | 0 .../pipelineprofiles}/config.go | 2 +- .../pipelineprofiles}/go.mod | 4 +- .../pipelineprofiles}/go.sum | 0 service/go.mod | 6 +- service/internal/builders/connector.go | 16 +-- service/internal/builders/connector_test.go | 16 +-- service/internal/graph/connector.go | 12 +- service/internal/graph/exporter.go | 4 +- service/internal/graph/graph.go | 18 +-- service/internal/graph/graph_test.go | 106 +++++++++--------- service/internal/graph/processor.go | 4 +- service/internal/graph/receiver.go | 4 +- service/internal/graph/util_test.go | 4 +- service/pipelines/config.go | 4 +- service/service_test.go | 12 +- versions.yaml | 2 +- 32 files changed, 182 insertions(+), 157 deletions(-) create mode 100644 .chloggen/movecomponentprofiles.yaml rename {component/componentprofiles => pipeline/pipelineprofiles}/Makefile (100%) rename {component/componentprofiles => pipeline/pipelineprofiles}/config.go (68%) rename {component/componentprofiles => pipeline/pipelineprofiles}/go.mod (61%) rename {component/componentprofiles => pipeline/pipelineprofiles}/go.sum (100%) diff --git a/.chloggen/movecomponentprofiles.yaml b/.chloggen/movecomponentprofiles.yaml new file mode 100644 index 00000000000..8d59cfb6372 --- /dev/null +++ b/.chloggen/movecomponentprofiles.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: componentprofiles + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Move componentprofiles to pipelineprofiles + +# One or more tracking issues or pull requests related to the change +issues: [11421] + +# (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/Makefile b/Makefile index 9703b833756..522bfbdeaa0 100644 --- a/Makefile +++ b/Makefile @@ -264,7 +264,6 @@ check-contrib: -replace go.opentelemetry.io/collector/client=$(CURDIR)/client \ -replace go.opentelemetry.io/collector/cmd/mdatagen=$(CURDIR)/cmd/mdatagen \ -replace go.opentelemetry.io/collector/component=$(CURDIR)/component \ - -replace go.opentelemetry.io/collector/component/componentprofiles=$(CURDIR)/component/componentprofiles \ -replace go.opentelemetry.io/collector/component/componentstatus=$(CURDIR)/component/componentstatus \ -replace go.opentelemetry.io/collector/config/configauth=$(CURDIR)/config/configauth \ -replace go.opentelemetry.io/collector/config/configcompression=$(CURDIR)/config/configcompression \ @@ -310,6 +309,7 @@ check-contrib: -replace go.opentelemetry.io/collector/pdata/testdata=$(CURDIR)/pdata/testdata \ -replace go.opentelemetry.io/collector/pdata/pprofile=$(CURDIR)/pdata/pprofile \ -replace go.opentelemetry.io/collector/pipeline=$(CURDIR)/pipeline \ + -replace go.opentelemetry.io/collector/pipeline/pipelineprofiles=$(CURDIR)/pipeline/pipelineprofiles \ -replace go.opentelemetry.io/collector/processor=$(CURDIR)/processor \ -replace go.opentelemetry.io/collector/processor/batchprocessor=$(CURDIR)/processor/batchprocessor \ -replace go.opentelemetry.io/collector/processor/memorylimiterprocessor=$(CURDIR)/processor/memorylimiterprocessor \ @@ -335,7 +335,6 @@ restore-contrib: -dropreplace go.opentelemetry.io/collector/client \ -dropreplace go.opentelemetry.io/collector/cmd/mdatagen \ -dropreplace go.opentelemetry.io/collector/component \ - -dropreplace go.opentelemetry.io/collector/component/componentprofiles \ -dropreplace go.opentelemetry.io/collector/component/componentstatus \ -dropreplace go.opentelemetry.io/collector/config/configauth \ -dropreplace go.opentelemetry.io/collector/config/configcompression \ @@ -378,6 +377,7 @@ restore-contrib: -dropreplace go.opentelemetry.io/collector/pdata/testdata \ -dropreplace go.opentelemetry.io/collector/pdata/pprofile \ -dropreplace go.opentelemetry.io/collector/pipeline \ + -dropreplace go.opentelemetry.io/collector/pipeline/pipelineprofiles \ -dropreplace go.opentelemetry.io/collector/processor \ -dropreplace go.opentelemetry.io/collector/processor/batchprocessor \ -dropreplace go.opentelemetry.io/collector/processor/memorylimiterprocessor \ diff --git a/cmd/builder/internal/builder/main_test.go b/cmd/builder/internal/builder/main_test.go index 20103c11169..5d7162e8c34 100644 --- a/cmd/builder/internal/builder/main_test.go +++ b/cmd/builder/internal/builder/main_test.go @@ -41,7 +41,6 @@ var ( replaceModules = []string{ "", "/component", - "/component/componentprofiles", "/component/componentstatus", "/client", "/config/configauth", @@ -79,6 +78,7 @@ var ( "/featuregate", "/internal/globalsignal", "/pipeline", + "/pipeline/pipelineprofiles", "/processor", "/processor/batchprocessor", "/processor/memorylimiterprocessor", diff --git a/cmd/builder/test/core.builder.yaml b/cmd/builder/test/core.builder.yaml index a4b96e939a6..fc33f39e078 100644 --- a/cmd/builder/test/core.builder.yaml +++ b/cmd/builder/test/core.builder.yaml @@ -15,7 +15,6 @@ replaces: - go.opentelemetry.io/collector => ${WORKSPACE_DIR} - go.opentelemetry.io/collector/client => ${WORKSPACE_DIR}/client - go.opentelemetry.io/collector/component => ${WORKSPACE_DIR}/component - - go.opentelemetry.io/collector/component/componentprofiles => ${WORKSPACE_DIR}/component/componentprofiles - go.opentelemetry.io/collector/component/componentstatus => ${WORKSPACE_DIR}/component/componentstatus - go.opentelemetry.io/collector/config/configauth => ${WORKSPACE_DIR}/config/configauth - go.opentelemetry.io/collector/config/configcompression => ${WORKSPACE_DIR}/config/configcompression @@ -54,6 +53,7 @@ replaces: - go.opentelemetry.io/collector/pdata/pprofile => ${WORKSPACE_DIR}/pdata/pprofile - go.opentelemetry.io/collector/pdata/testdata => ${WORKSPACE_DIR}/pdata/testdata - go.opentelemetry.io/collector/pipeline => ${WORKSPACE_DIR}/pipeline + - go.opentelemetry.io/collector/pipeline/pipelineprofiles => ${WORKSPACE_DIR}/pipeline/pipelineprofiles - go.opentelemetry.io/collector/processor => ${WORKSPACE_DIR}/processor - go.opentelemetry.io/collector/processor/processorprofiles => ${WORKSPACE_DIR}/processor/processorprofiles - go.opentelemetry.io/collector/receiver => ${WORKSPACE_DIR}/receiver diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index a2222fdbd3a..b975754c5ca 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -43,7 +43,6 @@ replaces: - go.opentelemetry.io/collector/client => ../../client - go.opentelemetry.io/collector/otelcol => ../../otelcol - go.opentelemetry.io/collector/component => ../../component - - go.opentelemetry.io/collector/component/componentprofiles => ../../component/componentprofiles - go.opentelemetry.io/collector/component/componentstatus => ../../component/componentstatus - go.opentelemetry.io/collector/config/configauth => ../../config/configauth - go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression @@ -84,6 +83,7 @@ replaces: - go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata - go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile - go.opentelemetry.io/collector/pipeline => ../../pipeline + - go.opentelemetry.io/collector/pipeline/pipelineprofiles => ../../pipeline/pipelineprofiles - go.opentelemetry.io/collector/processor => ../../processor - go.opentelemetry.io/collector/processor/batchprocessor => ../../processor/batchprocessor - go.opentelemetry.io/collector/processor/memorylimiterprocessor => ../../processor/memorylimiterprocessor diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 154fd703e20..3ed466cf0a8 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -81,7 +81,6 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector v0.111.0 // indirect go.opentelemetry.io/collector/client v1.17.0 // indirect - go.opentelemetry.io/collector/component/componentprofiles v0.111.0 // indirect go.opentelemetry.io/collector/component/componentstatus v0.111.0 // indirect go.opentelemetry.io/collector/config/configauth v0.111.0 // indirect go.opentelemetry.io/collector/config/configcompression v1.17.0 // indirect @@ -107,6 +106,7 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.111.0 // indirect go.opentelemetry.io/collector/pipeline v0.111.0 // indirect + go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.111.0 // indirect go.opentelemetry.io/collector/processor/processorprofiles v0.111.0 // indirect go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.0 // indirect go.opentelemetry.io/collector/semconv v0.111.0 // indirect @@ -157,8 +157,6 @@ replace go.opentelemetry.io/collector/otelcol => ../../otelcol replace go.opentelemetry.io/collector/component => ../../component -replace go.opentelemetry.io/collector/component/componentprofiles => ../../component/componentprofiles - replace go.opentelemetry.io/collector/component/componentstatus => ../../component/componentstatus replace go.opentelemetry.io/collector/config/configauth => ../../config/configauth @@ -239,6 +237,8 @@ replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile replace go.opentelemetry.io/collector/pipeline => ../../pipeline +replace go.opentelemetry.io/collector/pipeline/pipelineprofiles => ../../pipeline/pipelineprofiles + replace go.opentelemetry.io/collector/processor => ../../processor replace go.opentelemetry.io/collector/processor/batchprocessor => ../../processor/batchprocessor diff --git a/connector/connectorprofiles/connector.go b/connector/connectorprofiles/connector.go index 6c2f3d7d7bf..589e3089b55 100644 --- a/connector/connectorprofiles/connector.go +++ b/connector/connectorprofiles/connector.go @@ -7,12 +7,12 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componentprofiles" "go.opentelemetry.io/collector/connector" "go.opentelemetry.io/collector/connector/internal" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumerprofiles" "go.opentelemetry.io/collector/pipeline" + "go.opentelemetry.io/collector/pipeline/pipelineprofiles" ) type Factory interface { @@ -60,7 +60,7 @@ type CreateTracesToProfilesFunc func(context.Context, connector.Settings, compon // CreateTracesToProfiles implements Factory.CreateTracesToProfiles(). func (f CreateTracesToProfilesFunc) CreateTracesToProfiles(ctx context.Context, set connector.Settings, cfg component.Config, next consumerprofiles.Profiles) (connector.Traces, error) { if f == nil { - return nil, internal.ErrDataTypes(set.ID, pipeline.SignalTraces, componentprofiles.SignalProfiles) + return nil, internal.ErrDataTypes(set.ID, pipeline.SignalTraces, pipelineprofiles.SignalProfiles) } return f(ctx, set, cfg, next) } @@ -71,7 +71,7 @@ type CreateMetricsToProfilesFunc func(context.Context, connector.Settings, compo // CreateMetricsToProfiles implements Factory.CreateMetricsToProfiles(). func (f CreateMetricsToProfilesFunc) CreateMetricsToProfiles(ctx context.Context, set connector.Settings, cfg component.Config, next consumerprofiles.Profiles) (connector.Metrics, error) { if f == nil { - return nil, internal.ErrDataTypes(set.ID, pipeline.SignalMetrics, componentprofiles.SignalProfiles) + return nil, internal.ErrDataTypes(set.ID, pipeline.SignalMetrics, pipelineprofiles.SignalProfiles) } return f(ctx, set, cfg, next) } @@ -82,7 +82,7 @@ type CreateLogsToProfilesFunc func(context.Context, connector.Settings, componen // CreateLogsToProfiles implements Factory.CreateLogsToProfiles(). func (f CreateLogsToProfilesFunc) CreateLogsToProfiles(ctx context.Context, set connector.Settings, cfg component.Config, next consumerprofiles.Profiles) (connector.Logs, error) { if f == nil { - return nil, internal.ErrDataTypes(set.ID, pipeline.SignalLogs, componentprofiles.SignalProfiles) + return nil, internal.ErrDataTypes(set.ID, pipeline.SignalLogs, pipelineprofiles.SignalProfiles) } return f(ctx, set, cfg, next) } @@ -93,7 +93,7 @@ type CreateProfilesToProfilesFunc func(context.Context, connector.Settings, comp // CreateProfilesToProfiles implements Factory.CreateProfilesToProfiles(). func (f CreateProfilesToProfilesFunc) CreateProfilesToProfiles(ctx context.Context, set connector.Settings, cfg component.Config, next consumerprofiles.Profiles) (Profiles, error) { if f == nil { - return nil, internal.ErrDataTypes(set.ID, componentprofiles.SignalProfiles, componentprofiles.SignalProfiles) + return nil, internal.ErrDataTypes(set.ID, pipelineprofiles.SignalProfiles, pipelineprofiles.SignalProfiles) } return f(ctx, set, cfg, next) } @@ -104,7 +104,7 @@ type CreateProfilesToTracesFunc func(context.Context, connector.Settings, compon // CreateProfilesToTraces implements Factory.CreateProfilesToTraces(). func (f CreateProfilesToTracesFunc) CreateProfilesToTraces(ctx context.Context, set connector.Settings, cfg component.Config, next consumer.Traces) (Profiles, error) { if f == nil { - return nil, internal.ErrDataTypes(set.ID, componentprofiles.SignalProfiles, pipeline.SignalTraces) + return nil, internal.ErrDataTypes(set.ID, pipelineprofiles.SignalProfiles, pipeline.SignalTraces) } return f(ctx, set, cfg, next) } @@ -115,7 +115,7 @@ type CreateProfilesToMetricsFunc func(context.Context, connector.Settings, compo // CreateProfilesToMetrics implements Factory.CreateProfilesToMetrics(). func (f CreateProfilesToMetricsFunc) CreateProfilesToMetrics(ctx context.Context, set connector.Settings, cfg component.Config, next consumer.Metrics) (Profiles, error) { if f == nil { - return nil, internal.ErrDataTypes(set.ID, componentprofiles.SignalProfiles, pipeline.SignalMetrics) + return nil, internal.ErrDataTypes(set.ID, pipelineprofiles.SignalProfiles, pipeline.SignalMetrics) } return f(ctx, set, cfg, next) } @@ -126,7 +126,7 @@ type CreateProfilesToLogsFunc func(context.Context, connector.Settings, componen // CreateProfilesToLogs implements Factory.CreateProfilesToLogs(). func (f CreateProfilesToLogsFunc) CreateProfilesToLogs(ctx context.Context, set connector.Settings, cfg component.Config, next consumer.Logs) (Profiles, error) { if f == nil { - return nil, internal.ErrDataTypes(set.ID, componentprofiles.SignalProfiles, pipeline.SignalLogs) + return nil, internal.ErrDataTypes(set.ID, pipelineprofiles.SignalProfiles, pipeline.SignalLogs) } return f(ctx, set, cfg, next) } diff --git a/connector/connectorprofiles/connector_test.go b/connector/connectorprofiles/connector_test.go index d1435887c1e..9e351b7f468 100644 --- a/connector/connectorprofiles/connector_test.go +++ b/connector/connectorprofiles/connector_test.go @@ -11,13 +11,13 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componentprofiles" "go.opentelemetry.io/collector/connector" "go.opentelemetry.io/collector/connector/internal" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumerprofiles" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pipeline" + "go.opentelemetry.io/collector/pipeline/pipelineprofiles" ) var ( @@ -32,18 +32,18 @@ func TestNewFactoryNoOptions(t *testing.T) { assert.EqualValues(t, &defaultCfg, factory.CreateDefaultConfig()) _, err := factory.CreateTracesToProfiles(context.Background(), connector.Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) - assert.Equal(t, err, internal.ErrDataTypes(testID, pipeline.SignalTraces, componentprofiles.SignalProfiles)) + assert.Equal(t, err, internal.ErrDataTypes(testID, pipeline.SignalTraces, pipelineprofiles.SignalProfiles)) _, err = factory.CreateMetricsToProfiles(context.Background(), connector.Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) - assert.Equal(t, err, internal.ErrDataTypes(testID, pipeline.SignalMetrics, componentprofiles.SignalProfiles)) + assert.Equal(t, err, internal.ErrDataTypes(testID, pipeline.SignalMetrics, pipelineprofiles.SignalProfiles)) _, err = factory.CreateLogsToProfiles(context.Background(), connector.Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) - assert.Equal(t, err, internal.ErrDataTypes(testID, pipeline.SignalLogs, componentprofiles.SignalProfiles)) + assert.Equal(t, err, internal.ErrDataTypes(testID, pipeline.SignalLogs, pipelineprofiles.SignalProfiles)) _, err = factory.CreateProfilesToTraces(context.Background(), connector.Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) - assert.Equal(t, err, internal.ErrDataTypes(testID, componentprofiles.SignalProfiles, pipeline.SignalTraces)) + assert.Equal(t, err, internal.ErrDataTypes(testID, pipelineprofiles.SignalProfiles, pipeline.SignalTraces)) _, err = factory.CreateProfilesToMetrics(context.Background(), connector.Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) - assert.Equal(t, err, internal.ErrDataTypes(testID, componentprofiles.SignalProfiles, pipeline.SignalMetrics)) + assert.Equal(t, err, internal.ErrDataTypes(testID, pipelineprofiles.SignalProfiles, pipeline.SignalMetrics)) _, err = factory.CreateProfilesToLogs(context.Background(), connector.Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) - assert.Equal(t, err, internal.ErrDataTypes(testID, componentprofiles.SignalProfiles, pipeline.SignalLogs)) + assert.Equal(t, err, internal.ErrDataTypes(testID, pipelineprofiles.SignalProfiles, pipeline.SignalLogs)) } func TestNewFactoryWithSameTypes(t *testing.T) { @@ -59,11 +59,11 @@ func TestNewFactoryWithSameTypes(t *testing.T) { require.NoError(t, err) _, err = factory.CreateProfilesToTraces(context.Background(), connector.Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) - assert.Equal(t, err, internal.ErrDataTypes(testID, componentprofiles.SignalProfiles, pipeline.SignalTraces)) + assert.Equal(t, err, internal.ErrDataTypes(testID, pipelineprofiles.SignalProfiles, pipeline.SignalTraces)) _, err = factory.CreateProfilesToMetrics(context.Background(), connector.Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) - assert.Equal(t, err, internal.ErrDataTypes(testID, componentprofiles.SignalProfiles, pipeline.SignalMetrics)) + assert.Equal(t, err, internal.ErrDataTypes(testID, pipelineprofiles.SignalProfiles, pipeline.SignalMetrics)) _, err = factory.CreateProfilesToLogs(context.Background(), connector.Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) - assert.Equal(t, err, internal.ErrDataTypes(testID, componentprofiles.SignalProfiles, pipeline.SignalLogs)) + assert.Equal(t, err, internal.ErrDataTypes(testID, pipelineprofiles.SignalProfiles, pipeline.SignalLogs)) } func TestNewFactoryWithTranslateTypes(t *testing.T) { @@ -81,7 +81,7 @@ func TestNewFactoryWithTranslateTypes(t *testing.T) { assert.EqualValues(t, &defaultCfg, factory.CreateDefaultConfig()) _, err := factory.CreateProfilesToProfiles(context.Background(), connector.Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) - assert.Equal(t, err, internal.ErrDataTypes(testID, componentprofiles.SignalProfiles, componentprofiles.SignalProfiles)) + assert.Equal(t, err, internal.ErrDataTypes(testID, pipelineprofiles.SignalProfiles, pipelineprofiles.SignalProfiles)) assert.Equal(t, component.StabilityLevelBeta, factory.TracesToProfilesStability()) _, err = factory.CreateTracesToProfiles(context.Background(), connector.Settings{ID: testID}, &defaultCfg, consumertest.NewNop()) diff --git a/connector/connectorprofiles/go.mod b/connector/connectorprofiles/go.mod index 3d4cb375c70..1a699f44a3c 100644 --- a/connector/connectorprofiles/go.mod +++ b/connector/connectorprofiles/go.mod @@ -6,7 +6,6 @@ require ( github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector v0.111.0 go.opentelemetry.io/collector/component v0.111.0 - go.opentelemetry.io/collector/component/componentprofiles v0.111.0 go.opentelemetry.io/collector/connector v0.111.0 go.opentelemetry.io/collector/consumer v0.111.0 go.opentelemetry.io/collector/consumer/consumerprofiles v0.111.0 @@ -14,6 +13,7 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.111.0 go.opentelemetry.io/collector/pdata/testdata v0.111.0 go.opentelemetry.io/collector/pipeline v0.111.0 + go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.111.0 ) require ( @@ -50,8 +50,6 @@ replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../../consumer/consumerprofiles -replace go.opentelemetry.io/collector/component/componentprofiles => ../../component/componentprofiles - replace go.opentelemetry.io/collector => ../.. replace go.opentelemetry.io/collector/confmap => ../../confmap @@ -69,3 +67,5 @@ replace go.opentelemetry.io/collector/component/componentstatus => ../../compone replace go.opentelemetry.io/collector/pipeline => ../../pipeline replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal + +replace go.opentelemetry.io/collector/pipeline/pipelineprofiles => ../../pipeline/pipelineprofiles diff --git a/connector/connectorprofiles/profiles_router_test.go b/connector/connectorprofiles/profiles_router_test.go index 4dabc097b1f..1a0dd770976 100644 --- a/connector/connectorprofiles/profiles_router_test.go +++ b/connector/connectorprofiles/profiles_router_test.go @@ -12,13 +12,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componentprofiles" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumerprofiles" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pprofile" "go.opentelemetry.io/collector/pdata/testdata" "go.opentelemetry.io/collector/pipeline" + "go.opentelemetry.io/collector/pipeline/pipelineprofiles" ) type mutatingProfilesSink struct { @@ -51,7 +51,7 @@ func fuzzProfiles(numIDs, numCons, numProfiles int) func(*testing.T) { // If any consumer is mutating, the router must report mutating for i := 0; i < numCons; i++ { - allIDs = append(allIDs, pipeline.NewIDWithName(componentprofiles.SignalProfiles, "sink_"+strconv.Itoa(numCons))) + allIDs = append(allIDs, pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "sink_"+strconv.Itoa(numCons))) // Random chance for each consumer to be mutating if (numCons+numProfiles+i)%4 == 0 { allCons = append(allCons, &mutatingProfilesSink{ProfilesSink: new(consumertest.ProfilesSink)}) @@ -111,8 +111,8 @@ func TestProfilessRouterConsumer(t *testing.T) { ctx := context.Background() td := testdata.GenerateProfiles(1) - fooID := pipeline.NewIDWithName(componentprofiles.SignalProfiles, "foo") - barID := pipeline.NewIDWithName(componentprofiles.SignalProfiles, "bar") + fooID := pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "foo") + barID := pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "bar") foo := new(consumertest.ProfilesSink) bar := new(consumertest.ProfilesSink) @@ -153,7 +153,7 @@ func TestProfilessRouterConsumer(t *testing.T) { assert.Nil(t, none) require.Error(t, err) - fake, err := r.Consumer(pipeline.NewIDWithName(componentprofiles.SignalProfiles, "fake")) + fake, err := r.Consumer(pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "fake")) assert.Nil(t, fake) assert.Error(t, err) } diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index 35804ba3b6a..d1aa8378784 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -31,12 +31,12 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector v0.111.0 // indirect - go.opentelemetry.io/collector/component/componentprofiles v0.111.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.111.0 // indirect go.opentelemetry.io/collector/connector/connectorprofiles v0.111.0 // indirect go.opentelemetry.io/collector/consumer/consumerprofiles v0.111.0 // indirect go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect + go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.111.0 // indirect go.opentelemetry.io/otel v1.31.0 // indirect go.opentelemetry.io/otel/metric v1.31.0 // indirect go.opentelemetry.io/otel/sdk v1.31.0 // indirect @@ -80,8 +80,6 @@ replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../../consume replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/consumertest -replace go.opentelemetry.io/collector/component/componentprofiles => ../../component/componentprofiles - replace go.opentelemetry.io/collector/component/componentstatus => ../../component/componentstatus replace go.opentelemetry.io/collector/connector/connectorprofiles => ../connectorprofiles @@ -89,3 +87,5 @@ replace go.opentelemetry.io/collector/connector/connectorprofiles => ../connecto replace go.opentelemetry.io/collector/pipeline => ../../pipeline replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal + +replace go.opentelemetry.io/collector/pipeline/pipelineprofiles => ../../pipeline/pipelineprofiles diff --git a/connector/go.mod b/connector/go.mod index 1f39b8ce4ca..e1ad96e3b0f 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -28,9 +28,9 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/component/componentprofiles v0.111.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.111.0 // indirect go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect + go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.111.0 // indirect go.opentelemetry.io/otel v1.31.0 // indirect go.opentelemetry.io/otel/metric v1.31.0 // indirect go.opentelemetry.io/otel/sdk v1.31.0 // indirect @@ -66,8 +66,6 @@ replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../consumer/c replace go.opentelemetry.io/collector/consumer/consumertest => ../consumer/consumertest -replace go.opentelemetry.io/collector/component/componentprofiles => ../component/componentprofiles - replace go.opentelemetry.io/collector/component/componentstatus => ../component/componentstatus replace go.opentelemetry.io/collector/connector/connectorprofiles => ./connectorprofiles @@ -75,3 +73,5 @@ replace go.opentelemetry.io/collector/connector/connectorprofiles => ./connector replace go.opentelemetry.io/collector/pipeline => ../pipeline replace go.opentelemetry.io/collector/internal/globalsignal => ../internal/globalsignal + +replace go.opentelemetry.io/collector/pipeline/pipelineprofiles => ../pipeline/pipelineprofiles diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 98bce9b3490..c20fe1ab36f 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -73,7 +73,6 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/client v1.17.0 // indirect - go.opentelemetry.io/collector/component/componentprofiles v0.111.0 // indirect go.opentelemetry.io/collector/config/configauth v0.111.0 // indirect go.opentelemetry.io/collector/config/configcompression v1.17.0 // indirect go.opentelemetry.io/collector/config/confignet v1.17.0 // indirect @@ -87,6 +86,7 @@ require ( go.opentelemetry.io/collector/featuregate v1.17.0 // indirect go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect + go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.111.0 // indirect go.opentelemetry.io/collector/processor v0.111.0 // indirect go.opentelemetry.io/collector/processor/processorprofiles v0.111.0 // indirect go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.0 // indirect @@ -195,8 +195,6 @@ replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extensi replace go.opentelemetry.io/collector/service => ../../service -replace go.opentelemetry.io/collector/component/componentprofiles => ../../component/componentprofiles - replace go.opentelemetry.io/collector/extension/extensioncapabilities => ../../extension/extensioncapabilities replace go.opentelemetry.io/collector/receiver/receiverprofiles => ../../receiver/receiverprofiles @@ -210,3 +208,5 @@ replace go.opentelemetry.io/collector/exporter/exporterprofiles => ../../exporte replace go.opentelemetry.io/collector/pipeline => ../../pipeline replace go.opentelemetry.io/collector/internal/globalsignal => ../globalsignal + +replace go.opentelemetry.io/collector/pipeline/pipelineprofiles => ../../pipeline/pipelineprofiles diff --git a/otelcol/go.mod b/otelcol/go.mod index 93e892d1cb9..231a38af3c8 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -65,7 +65,6 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector v0.111.0 // indirect - go.opentelemetry.io/collector/component/componentprofiles v0.111.0 // indirect go.opentelemetry.io/collector/connector/connectorprofiles v0.111.0 // indirect go.opentelemetry.io/collector/consumer v0.111.0 // indirect go.opentelemetry.io/collector/consumer/consumerprofiles v0.111.0 // indirect @@ -76,6 +75,7 @@ require ( go.opentelemetry.io/collector/pdata v1.17.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.111.0 // indirect + go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.111.0 // indirect go.opentelemetry.io/collector/processor/processorprofiles v0.111.0 // indirect go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.0 // indirect go.opentelemetry.io/collector/semconv v0.111.0 // indirect @@ -162,8 +162,6 @@ replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../consumer/c replace go.opentelemetry.io/collector/consumer/consumertest => ../consumer/consumertest -replace go.opentelemetry.io/collector/component/componentprofiles => ../component/componentprofiles - replace go.opentelemetry.io/collector/client => ../client replace go.opentelemetry.io/collector/component/componentstatus => ../component/componentstatus @@ -181,3 +179,5 @@ replace go.opentelemetry.io/collector/exporter/exporterprofiles => ../exporter/e replace go.opentelemetry.io/collector/pipeline => ../pipeline replace go.opentelemetry.io/collector/internal/globalsignal => ../internal/globalsignal + +replace go.opentelemetry.io/collector/pipeline/pipelineprofiles => ../pipeline/pipelineprofiles diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index 1adbd2dd2ce..108b4b97553 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -60,7 +60,6 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector v0.111.0 // indirect - go.opentelemetry.io/collector/component/componentprofiles v0.111.0 // indirect go.opentelemetry.io/collector/component/componentstatus v0.111.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.111.0 // indirect go.opentelemetry.io/collector/connector/connectorprofiles v0.111.0 // indirect @@ -74,6 +73,7 @@ require ( go.opentelemetry.io/collector/pdata v1.17.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.111.0 // indirect + go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.111.0 // indirect go.opentelemetry.io/collector/processor/processorprofiles v0.111.0 // indirect go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.0 // indirect go.opentelemetry.io/collector/semconv v0.111.0 // indirect @@ -177,8 +177,6 @@ replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../../consume replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/consumertest -replace go.opentelemetry.io/collector/component/componentprofiles => ../../component/componentprofiles - replace go.opentelemetry.io/collector/client => ../../client replace go.opentelemetry.io/collector/component/componentstatus => ../../component/componentstatus @@ -196,3 +194,5 @@ replace go.opentelemetry.io/collector/exporter/exporterprofiles => ../../exporte replace go.opentelemetry.io/collector/pipeline => ../../pipeline replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal + +replace go.opentelemetry.io/collector/pipeline/pipelineprofiles => ../../pipeline/pipelineprofiles diff --git a/component/componentprofiles/Makefile b/pipeline/pipelineprofiles/Makefile similarity index 100% rename from component/componentprofiles/Makefile rename to pipeline/pipelineprofiles/Makefile diff --git a/component/componentprofiles/config.go b/pipeline/pipelineprofiles/config.go similarity index 68% rename from component/componentprofiles/config.go rename to pipeline/pipelineprofiles/config.go index 39106b9888d..8aa00dd61a1 100644 --- a/component/componentprofiles/config.go +++ b/pipeline/pipelineprofiles/config.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package componentprofiles // import "go.opentelemetry.io/collector/component/componentprofiles" +package pipelineprofiles // import "go.opentelemetry.io/collector/pipeline/pipelineprofiles" import ( "go.opentelemetry.io/collector/internal/globalsignal" diff --git a/component/componentprofiles/go.mod b/pipeline/pipelineprofiles/go.mod similarity index 61% rename from component/componentprofiles/go.mod rename to pipeline/pipelineprofiles/go.mod index 2f7410b0dc8..8170d7826b5 100644 --- a/component/componentprofiles/go.mod +++ b/pipeline/pipelineprofiles/go.mod @@ -1,7 +1,7 @@ -module go.opentelemetry.io/collector/component/componentprofiles +module go.opentelemetry.io/collector/pipeline/pipelineprofiles go 1.22.0 require go.opentelemetry.io/collector/internal/globalsignal v0.111.0 -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal +replace go.opentelemetry.io/collector/internal/globalsignal => ./../../internal/globalsignal diff --git a/component/componentprofiles/go.sum b/pipeline/pipelineprofiles/go.sum similarity index 100% rename from component/componentprofiles/go.sum rename to pipeline/pipelineprofiles/go.sum diff --git a/service/go.mod b/service/go.mod index b662f6c6ca9..62083742a71 100644 --- a/service/go.mod +++ b/service/go.mod @@ -11,7 +11,6 @@ require ( github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector v0.111.0 go.opentelemetry.io/collector/component v0.111.0 - go.opentelemetry.io/collector/component/componentprofiles v0.111.0 go.opentelemetry.io/collector/component/componentstatus v0.111.0 go.opentelemetry.io/collector/config/confighttp v0.111.0 go.opentelemetry.io/collector/config/configtelemetry v0.111.0 @@ -31,6 +30,7 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.111.0 go.opentelemetry.io/collector/pdata/testdata v0.111.0 go.opentelemetry.io/collector/pipeline v0.111.0 + go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.111.0 go.opentelemetry.io/collector/processor v0.111.0 go.opentelemetry.io/collector/processor/processorprofiles v0.111.0 go.opentelemetry.io/collector/receiver v0.111.0 @@ -177,8 +177,6 @@ replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../consumer/c replace go.opentelemetry.io/collector/consumer/consumertest => ../consumer/consumertest -replace go.opentelemetry.io/collector/component/componentprofiles => ../component/componentprofiles - replace go.opentelemetry.io/collector/client => ../client replace go.opentelemetry.io/collector/receiver/receiverprofiles => ../receiver/receiverprofiles @@ -190,3 +188,5 @@ replace go.opentelemetry.io/collector/connector/connectorprofiles => ../connecto replace go.opentelemetry.io/collector/exporter/exporterprofiles => ../exporter/exporterprofiles replace go.opentelemetry.io/collector/internal/globalsignal => ../internal/globalsignal + +replace go.opentelemetry.io/collector/pipeline/pipelineprofiles => ../pipeline/pipelineprofiles diff --git a/service/internal/builders/connector.go b/service/internal/builders/connector.go index f5c94dc26d9..d93a7345f81 100644 --- a/service/internal/builders/connector.go +++ b/service/internal/builders/connector.go @@ -8,13 +8,13 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componentprofiles" "go.opentelemetry.io/collector/connector" "go.opentelemetry.io/collector/connector/connectorprofiles" "go.opentelemetry.io/collector/connector/connectortest" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumerprofiles" "go.opentelemetry.io/collector/pipeline" + "go.opentelemetry.io/collector/pipeline/pipelineprofiles" ) func errDataTypes(id component.ID, from, to pipeline.Signal) error { @@ -106,7 +106,7 @@ func (b *ConnectorBuilder) CreateTracesToProfiles(ctx context.Context, set conne f, ok := connFact.(connectorprofiles.Factory) if !ok { - return nil, errDataTypes(set.ID, pipeline.SignalTraces, componentprofiles.SignalProfiles) + return nil, errDataTypes(set.ID, pipeline.SignalTraces, pipelineprofiles.SignalProfiles) } logStabilityLevel(set.Logger, f.TracesToProfilesStability()) @@ -187,7 +187,7 @@ func (b *ConnectorBuilder) CreateMetricsToProfiles(ctx context.Context, set conn f, ok := connFact.(connectorprofiles.Factory) if !ok { - return nil, errDataTypes(set.ID, pipeline.SignalMetrics, componentprofiles.SignalProfiles) + return nil, errDataTypes(set.ID, pipeline.SignalMetrics, pipelineprofiles.SignalProfiles) } logStabilityLevel(set.Logger, f.MetricsToProfilesStability()) @@ -268,7 +268,7 @@ func (b *ConnectorBuilder) CreateLogsToProfiles(ctx context.Context, set connect f, ok := connFact.(connectorprofiles.Factory) if !ok { - return nil, errDataTypes(set.ID, pipeline.SignalLogs, componentprofiles.SignalProfiles) + return nil, errDataTypes(set.ID, pipeline.SignalLogs, pipelineprofiles.SignalProfiles) } logStabilityLevel(set.Logger, f.LogsToProfilesStability()) @@ -292,7 +292,7 @@ func (b *ConnectorBuilder) CreateProfilesToTraces(ctx context.Context, set conne f, ok := connFact.(connectorprofiles.Factory) if !ok { - return nil, errDataTypes(set.ID, componentprofiles.SignalProfiles, pipeline.SignalTraces) + return nil, errDataTypes(set.ID, pipelineprofiles.SignalProfiles, pipeline.SignalTraces) } logStabilityLevel(set.Logger, f.ProfilesToTracesStability()) @@ -316,7 +316,7 @@ func (b *ConnectorBuilder) CreateProfilesToMetrics(ctx context.Context, set conn f, ok := connFact.(connectorprofiles.Factory) if !ok { - return nil, errDataTypes(set.ID, componentprofiles.SignalProfiles, pipeline.SignalMetrics) + return nil, errDataTypes(set.ID, pipelineprofiles.SignalProfiles, pipeline.SignalMetrics) } logStabilityLevel(set.Logger, f.ProfilesToMetricsStability()) @@ -340,7 +340,7 @@ func (b *ConnectorBuilder) CreateProfilesToLogs(ctx context.Context, set connect f, ok := connFact.(connectorprofiles.Factory) if !ok { - return nil, errDataTypes(set.ID, componentprofiles.SignalProfiles, pipeline.SignalLogs) + return nil, errDataTypes(set.ID, pipelineprofiles.SignalProfiles, pipeline.SignalLogs) } logStabilityLevel(set.Logger, f.ProfilesToLogsStability()) @@ -364,7 +364,7 @@ func (b *ConnectorBuilder) CreateProfilesToProfiles(ctx context.Context, set con f, ok := connFact.(connectorprofiles.Factory) if !ok { - return nil, errDataTypes(set.ID, componentprofiles.SignalProfiles, componentprofiles.SignalProfiles) + return nil, errDataTypes(set.ID, pipelineprofiles.SignalProfiles, pipelineprofiles.SignalProfiles) } logStabilityLevel(set.Logger, f.ProfilesToProfilesStability()) diff --git a/service/internal/builders/connector_test.go b/service/internal/builders/connector_test.go index abd145a14fa..d02f304d930 100644 --- a/service/internal/builders/connector_test.go +++ b/service/internal/builders/connector_test.go @@ -12,7 +12,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componentprofiles" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/connector" "go.opentelemetry.io/collector/connector/connectorprofiles" @@ -21,6 +20,7 @@ import ( "go.opentelemetry.io/collector/consumer/consumerprofiles" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pipeline" + "go.opentelemetry.io/collector/pipeline/pipelineprofiles" ) func TestConnectorBuilder(t *testing.T) { @@ -146,7 +146,7 @@ func TestConnectorBuilder(t *testing.T) { assert.Equal(t, nopConnectorInstance, t2l) } t2p, err := b.CreateTracesToProfiles(context.Background(), createConnectorSettings(tt.id), tt.nextProfiles) - if expectedErr := tt.err(pipeline.SignalTraces, componentprofiles.SignalProfiles); expectedErr != "" { + if expectedErr := tt.err(pipeline.SignalTraces, pipelineprofiles.SignalProfiles); expectedErr != "" { assert.EqualError(t, err, expectedErr) assert.Nil(t, t2p) } else { @@ -181,7 +181,7 @@ func TestConnectorBuilder(t *testing.T) { assert.Equal(t, nopConnectorInstance, m2l) } m2p, err := b.CreateMetricsToProfiles(context.Background(), createConnectorSettings(tt.id), tt.nextProfiles) - if expectedErr := tt.err(pipeline.SignalMetrics, componentprofiles.SignalProfiles); expectedErr != "" { + if expectedErr := tt.err(pipeline.SignalMetrics, pipelineprofiles.SignalProfiles); expectedErr != "" { assert.EqualError(t, err, expectedErr) assert.Nil(t, m2p) } else { @@ -216,7 +216,7 @@ func TestConnectorBuilder(t *testing.T) { assert.Equal(t, nopConnectorInstance, l2l) } l2p, err := b.CreateLogsToProfiles(context.Background(), createConnectorSettings(tt.id), tt.nextProfiles) - if expectedErr := tt.err(pipeline.SignalLogs, componentprofiles.SignalProfiles); expectedErr != "" { + if expectedErr := tt.err(pipeline.SignalLogs, pipelineprofiles.SignalProfiles); expectedErr != "" { assert.EqualError(t, err, expectedErr) assert.Nil(t, l2p) } else { @@ -225,7 +225,7 @@ func TestConnectorBuilder(t *testing.T) { } p2t, err := b.CreateProfilesToTraces(context.Background(), createConnectorSettings(tt.id), tt.nextTraces) - if expectedErr := tt.err(componentprofiles.SignalProfiles, pipeline.SignalTraces); expectedErr != "" { + if expectedErr := tt.err(pipelineprofiles.SignalProfiles, pipeline.SignalTraces); expectedErr != "" { assert.EqualError(t, err, expectedErr) assert.Nil(t, p2t) } else { @@ -233,7 +233,7 @@ func TestConnectorBuilder(t *testing.T) { assert.Equal(t, nopConnectorInstance, p2t) } p2m, err := b.CreateProfilesToMetrics(context.Background(), createConnectorSettings(tt.id), tt.nextMetrics) - if expectedErr := tt.err(componentprofiles.SignalProfiles, pipeline.SignalMetrics); expectedErr != "" { + if expectedErr := tt.err(pipelineprofiles.SignalProfiles, pipeline.SignalMetrics); expectedErr != "" { assert.EqualError(t, err, expectedErr) assert.Nil(t, p2m) } else { @@ -241,7 +241,7 @@ func TestConnectorBuilder(t *testing.T) { assert.Equal(t, nopConnectorInstance, p2m) } p2l, err := b.CreateProfilesToLogs(context.Background(), createConnectorSettings(tt.id), tt.nextLogs) - if expectedErr := tt.err(componentprofiles.SignalProfiles, pipeline.SignalLogs); expectedErr != "" { + if expectedErr := tt.err(pipelineprofiles.SignalProfiles, pipeline.SignalLogs); expectedErr != "" { assert.EqualError(t, err, expectedErr) assert.Nil(t, p2l) } else { @@ -249,7 +249,7 @@ func TestConnectorBuilder(t *testing.T) { assert.Equal(t, nopConnectorInstance, p2l) } p2p, err := b.CreateProfilesToProfiles(context.Background(), createConnectorSettings(tt.id), tt.nextProfiles) - if expectedErr := tt.err(componentprofiles.SignalProfiles, componentprofiles.SignalProfiles); expectedErr != "" { + if expectedErr := tt.err(pipelineprofiles.SignalProfiles, pipelineprofiles.SignalProfiles); expectedErr != "" { assert.EqualError(t, err, expectedErr) assert.Nil(t, p2p) } else { diff --git a/service/internal/graph/connector.go b/service/internal/graph/connector.go index 6b949c3f25d..76e69df77d1 100644 --- a/service/internal/graph/connector.go +++ b/service/internal/graph/connector.go @@ -7,12 +7,12 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componentprofiles" "go.opentelemetry.io/collector/connector" "go.opentelemetry.io/collector/connector/connectorprofiles" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumerprofiles" "go.opentelemetry.io/collector/pipeline" + "go.opentelemetry.io/collector/pipeline/pipelineprofiles" "go.opentelemetry.io/collector/service/internal/builders" "go.opentelemetry.io/collector/service/internal/capabilityconsumer" "go.opentelemetry.io/collector/service/internal/components" @@ -61,7 +61,7 @@ func (n *connectorNode) buildComponent( return n.buildMetrics(ctx, set, builder, nexts) case pipeline.SignalLogs: return n.buildLogs(ctx, set, builder, nexts) - case componentprofiles.SignalProfiles: + case pipelineprofiles.SignalProfiles: return n.buildProfiles(ctx, set, builder, nexts) } return nil @@ -96,7 +96,7 @@ func (n *connectorNode) buildTraces( n.Component, err = builder.CreateMetricsToTraces(ctx, set, next) case pipeline.SignalLogs: n.Component, err = builder.CreateLogsToTraces(ctx, set, next) - case componentprofiles.SignalProfiles: + case pipelineprofiles.SignalProfiles: n.Component, err = builder.CreateProfilesToTraces(ctx, set, next) } return err @@ -131,7 +131,7 @@ func (n *connectorNode) buildMetrics( n.Component, err = builder.CreateTracesToMetrics(ctx, set, next) case pipeline.SignalLogs: n.Component, err = builder.CreateLogsToMetrics(ctx, set, next) - case componentprofiles.SignalProfiles: + case pipelineprofiles.SignalProfiles: n.Component, err = builder.CreateProfilesToMetrics(ctx, set, next) } return err @@ -166,7 +166,7 @@ func (n *connectorNode) buildLogs( n.Component, err = builder.CreateTracesToLogs(ctx, set, next) case pipeline.SignalMetrics: n.Component, err = builder.CreateMetricsToLogs(ctx, set, next) - case componentprofiles.SignalProfiles: + case pipelineprofiles.SignalProfiles: n.Component, err = builder.CreateProfilesToLogs(ctx, set, next) } return err @@ -186,7 +186,7 @@ func (n *connectorNode) buildProfiles( var err error switch n.exprPipelineType { - case componentprofiles.SignalProfiles: + case pipelineprofiles.SignalProfiles: var conn connectorprofiles.Profiles conn, err = builder.CreateProfilesToProfiles(ctx, set, next) if err != nil { diff --git a/service/internal/graph/exporter.go b/service/internal/graph/exporter.go index 04532a81992..948da2f759a 100644 --- a/service/internal/graph/exporter.go +++ b/service/internal/graph/exporter.go @@ -8,9 +8,9 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componentprofiles" "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pipeline" + "go.opentelemetry.io/collector/pipeline/pipelineprofiles" "go.opentelemetry.io/collector/service/internal/builders" "go.opentelemetry.io/collector/service/internal/components" ) @@ -56,7 +56,7 @@ func (n *exporterNode) buildComponent( n.Component, err = builder.CreateMetrics(ctx, set) case pipeline.SignalLogs: n.Component, err = builder.CreateLogs(ctx, set) - case componentprofiles.SignalProfiles: + case pipelineprofiles.SignalProfiles: n.Component, err = builder.CreateProfiles(ctx, set) default: return fmt.Errorf("error creating exporter %q for data type %q is not supported", set.ID, n.pipelineType) diff --git a/service/internal/graph/graph.go b/service/internal/graph/graph.go index 3e0c1e5d057..26754e8fc34 100644 --- a/service/internal/graph/graph.go +++ b/service/internal/graph/graph.go @@ -25,7 +25,6 @@ import ( "gonum.org/v1/gonum/graph/topo" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componentprofiles" "go.opentelemetry.io/collector/component/componentstatus" "go.opentelemetry.io/collector/connector" "go.opentelemetry.io/collector/connector/connectorprofiles" @@ -33,6 +32,7 @@ import ( "go.opentelemetry.io/collector/consumer/consumerprofiles" "go.opentelemetry.io/collector/internal/fanoutconsumer" "go.opentelemetry.io/collector/pipeline" + "go.opentelemetry.io/collector/pipeline/pipelineprofiles" "go.opentelemetry.io/collector/service/internal/builders" "go.opentelemetry.io/collector/service/internal/capabilityconsumer" "go.opentelemetry.io/collector/service/internal/status" @@ -318,7 +318,7 @@ func (g *Graph) buildComponents(ctx context.Context, set Settings) error { cc := capabilityconsumer.NewLogs(next.(consumer.Logs), capability) n.baseConsumer = cc n.ConsumeLogsFunc = cc.ConsumeLogs - case componentprofiles.SignalProfiles: + case pipelineprofiles.SignalProfiles: cc := capabilityconsumer.NewProfiles(next.(consumerprofiles.Profiles), capability) n.baseConsumer = cc n.ConsumeProfilesFunc = cc.ConsumeProfiles @@ -344,7 +344,7 @@ func (g *Graph) buildComponents(ctx context.Context, set Settings) error { consumers = append(consumers, next.(consumer.Logs)) } n.baseConsumer = fanoutconsumer.NewLogs(consumers) - case componentprofiles.SignalProfiles: + case pipelineprofiles.SignalProfiles: consumers := make([]consumerprofiles.Profiles, 0, len(nexts)) for _, next := range nexts { consumers = append(consumers, next.(consumerprofiles.Profiles)) @@ -484,7 +484,7 @@ func (g *Graph) GetExporters() map[pipeline.Signal]map[component.ID]component.Co exportersMap[pipeline.SignalTraces] = make(map[component.ID]component.Component) exportersMap[pipeline.SignalMetrics] = make(map[component.ID]component.Component) exportersMap[pipeline.SignalLogs] = make(map[component.ID]component.Component) - exportersMap[componentprofiles.SignalProfiles] = make(map[component.ID]component.Component) + exportersMap[pipelineprofiles.SignalProfiles] = make(map[component.ID]component.Component) for _, pg := range g.pipelines { for _, expNode := range pg.exporters { @@ -547,7 +547,7 @@ func connectorStability(f connector.Factory, expType, recType pipeline.Signal) c return f.TracesToMetricsStability() case pipeline.SignalLogs: return f.TracesToLogsStability() - case componentprofiles.SignalProfiles: + case pipelineprofiles.SignalProfiles: fprof, ok := f.(connectorprofiles.Factory) if !ok { return component.StabilityLevelUndefined @@ -562,7 +562,7 @@ func connectorStability(f connector.Factory, expType, recType pipeline.Signal) c return f.MetricsToMetricsStability() case pipeline.SignalLogs: return f.MetricsToLogsStability() - case componentprofiles.SignalProfiles: + case pipelineprofiles.SignalProfiles: fprof, ok := f.(connectorprofiles.Factory) if !ok { return component.StabilityLevelUndefined @@ -577,14 +577,14 @@ func connectorStability(f connector.Factory, expType, recType pipeline.Signal) c return f.LogsToMetricsStability() case pipeline.SignalLogs: return f.LogsToLogsStability() - case componentprofiles.SignalProfiles: + case pipelineprofiles.SignalProfiles: fprof, ok := f.(connectorprofiles.Factory) if !ok { return component.StabilityLevelUndefined } return fprof.LogsToProfilesStability() } - case componentprofiles.SignalProfiles: + case pipelineprofiles.SignalProfiles: fprof, ok := f.(connectorprofiles.Factory) if !ok { return component.StabilityLevelUndefined @@ -596,7 +596,7 @@ func connectorStability(f connector.Factory, expType, recType pipeline.Signal) c return fprof.ProfilesToMetricsStability() case pipeline.SignalLogs: return fprof.ProfilesToLogsStability() - case componentprofiles.SignalProfiles: + case pipelineprofiles.SignalProfiles: return fprof.ProfilesToProfilesStability() } } diff --git a/service/internal/graph/graph_test.go b/service/internal/graph/graph_test.go index f89a4576c4e..50c274f053a 100644 --- a/service/internal/graph/graph_test.go +++ b/service/internal/graph/graph_test.go @@ -13,7 +13,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componentprofiles" "go.opentelemetry.io/collector/component/componentstatus" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/connector" @@ -22,6 +21,7 @@ import ( "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/testdata" "go.opentelemetry.io/collector/pipeline" + "go.opentelemetry.io/collector/pipeline/pipelineprofiles" "go.opentelemetry.io/collector/processor" "go.opentelemetry.io/collector/processor/processortest" "go.opentelemetry.io/collector/receiver" @@ -57,7 +57,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, }, - pipeline.NewID(componentprofiles.SignalProfiles): { + pipeline.NewID(pipelineprofiles.SignalProfiles): { Receivers: []component.ID{component.MustNewID("examplereceiver")}, Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, @@ -83,7 +83,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { Processors: []component.ID{component.MustNewIDWithName("exampleprocessor", "mutate")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, }, - pipeline.NewID(componentprofiles.SignalProfiles): { + pipeline.NewID(pipelineprofiles.SignalProfiles): { Receivers: []component.ID{component.MustNewID("examplereceiver")}, Processors: []component.ID{component.MustNewIDWithName("exampleprocessor", "mutate")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, @@ -109,7 +109,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { Processors: []component.ID{component.MustNewID("exampleprocessor"), component.MustNewIDWithName("exampleprocessor", "mutate")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, }, - pipeline.NewID(componentprofiles.SignalProfiles): { + pipeline.NewID(pipelineprofiles.SignalProfiles): { Receivers: []component.ID{component.MustNewID("examplereceiver")}, Processors: []component.ID{component.MustNewID("exampleprocessor"), component.MustNewIDWithName("exampleprocessor", "mutate")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, @@ -132,7 +132,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { Receivers: []component.ID{component.MustNewID("examplereceiver")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, }, - pipeline.NewID(componentprofiles.SignalProfiles): { + pipeline.NewID(pipelineprofiles.SignalProfiles): { Receivers: []component.ID{component.MustNewID("examplereceiver")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, }, @@ -157,7 +157,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { Processors: []component.ID{component.MustNewIDWithName("exampleprocessor", "mutate"), component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewID("exampleexporter"), component.MustNewIDWithName("exampleexporter", "1")}, }, - pipeline.NewID(componentprofiles.SignalProfiles): { + pipeline.NewID(pipelineprofiles.SignalProfiles): { Receivers: []component.ID{component.MustNewID("examplereceiver"), component.MustNewIDWithName("examplereceiver", "1")}, Processors: []component.ID{component.MustNewIDWithName("exampleprocessor", "mutate"), component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewID("exampleexporter"), component.MustNewIDWithName("exampleexporter", "1")}, @@ -180,7 +180,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { Receivers: []component.ID{component.MustNewID("examplereceiver"), component.MustNewIDWithName("examplereceiver", "1")}, Exporters: []component.ID{component.MustNewID("exampleexporter"), component.MustNewIDWithName("exampleexporter", "1")}, }, - pipeline.NewID(componentprofiles.SignalProfiles): { + pipeline.NewID(pipelineprofiles.SignalProfiles): { Receivers: []component.ID{component.MustNewID("examplereceiver"), component.MustNewIDWithName("examplereceiver", "1")}, Exporters: []component.ID{component.MustNewID("exampleexporter"), component.MustNewIDWithName("exampleexporter", "1")}, }, @@ -217,12 +217,12 @@ func TestConnectorPipelinesGraph(t *testing.T) { Receivers: []component.ID{component.MustNewID("examplereceiver")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, }, - pipeline.NewID(componentprofiles.SignalProfiles): { + pipeline.NewID(pipelineprofiles.SignalProfiles): { Receivers: []component.ID{component.MustNewID("examplereceiver")}, Processors: []component.ID{component.MustNewIDWithName("exampleprocessor", "mutate")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "1"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "1"): { Receivers: []component.ID{component.MustNewID("examplereceiver")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, }, @@ -280,12 +280,12 @@ func TestConnectorPipelinesGraph(t *testing.T) { { name: "pipelines_conn_simple_profiles.yaml", pipelineConfigs: pipelines.Config{ - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "in"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "in"): { Receivers: []component.ID{component.MustNewID("examplereceiver")}, Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewIDWithName("exampleconnector", "inherit_mutate")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "out"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "out"): { Receivers: []component.ID{component.MustNewIDWithName("exampleconnector", "inherit_mutate")}, Processors: []component.ID{component.MustNewIDWithName("exampleprocessor", "mutate")}, // mutate propagates upstream to connector Exporters: []component.ID{component.MustNewID("exampleexporter")}, @@ -374,22 +374,22 @@ func TestConnectorPipelinesGraph(t *testing.T) { { name: "pipelines_conn_fork_merge_profiles.yaml", pipelineConfigs: pipelines.Config{ - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "in"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "in"): { Receivers: []component.ID{component.MustNewID("examplereceiver")}, Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewIDWithName("exampleconnector", "inherit_mutate")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "type0"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "type0"): { Receivers: []component.ID{component.MustNewIDWithName("exampleconnector", "inherit_mutate")}, Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewIDWithName("exampleconnector", "merge")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "type1"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "type1"): { Receivers: []component.ID{component.MustNewIDWithName("exampleconnector", "inherit_mutate")}, Processors: []component.ID{component.MustNewIDWithName("exampleprocessor", "mutate")}, // mutate propagates upstream to connector Exporters: []component.ID{component.MustNewIDWithName("exampleconnector", "merge")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "out"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "out"): { Receivers: []component.ID{component.MustNewIDWithName("exampleconnector", "merge")}, Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, @@ -415,7 +415,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, }, - pipeline.NewID(componentprofiles.SignalProfiles): { + pipeline.NewID(pipelineprofiles.SignalProfiles): { Receivers: []component.ID{component.MustNewID("exampleconnector")}, Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, @@ -441,7 +441,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, }, - pipeline.NewID(componentprofiles.SignalProfiles): { + pipeline.NewID(pipelineprofiles.SignalProfiles): { Receivers: []component.ID{component.MustNewID("exampleconnector")}, Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, @@ -467,7 +467,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, }, - pipeline.NewID(componentprofiles.SignalProfiles): { + pipeline.NewID(pipelineprofiles.SignalProfiles): { Receivers: []component.ID{component.MustNewID("exampleconnector")}, Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, @@ -493,7 +493,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, }, - pipeline.NewID(componentprofiles.SignalProfiles): { + pipeline.NewID(pipelineprofiles.SignalProfiles): { Receivers: []component.ID{component.MustNewID("exampleconnector")}, Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, @@ -519,7 +519,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewID("exampleconnector")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "in"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "in"): { Receivers: []component.ID{component.MustNewID("examplereceiver")}, Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewID("exampleconnector")}, @@ -539,7 +539,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "out"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "out"): { Receivers: []component.ID{component.MustNewID("exampleconnector")}, Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, @@ -565,7 +565,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { Processors: []component.ID{component.MustNewIDWithName("exampleprocessor", "mutate")}, Exporters: []component.ID{component.MustNewIDWithName("exampleconnector", "inherit_mutate")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "in"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "in"): { Receivers: []component.ID{component.MustNewID("examplereceiver")}, Processors: []component.ID{component.MustNewIDWithName("exampleprocessor", "mutate")}, Exporters: []component.ID{component.MustNewIDWithName("exampleconnector", "inherit_mutate")}, @@ -585,7 +585,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { Processors: []component.ID{component.MustNewIDWithName("exampleprocessor", "mutate")}, // mutate propagates upstream to connector Exporters: []component.ID{component.MustNewID("exampleexporter")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "out"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "out"): { Receivers: []component.ID{component.MustNewIDWithName("exampleconnector", "inherit_mutate")}, Processors: []component.ID{component.MustNewIDWithName("exampleprocessor", "mutate")}, // mutate propagates upstream to connector Exporters: []component.ID{component.MustNewID("exampleexporter")}, @@ -620,11 +620,11 @@ func TestConnectorPipelinesGraph(t *testing.T) { Receivers: []component.ID{component.MustNewID("mockforward")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "in"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "in"): { Receivers: []component.ID{component.MustNewID("examplereceiver")}, Exporters: []component.ID{component.MustNewID("mockforward")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "out"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "out"): { Receivers: []component.ID{component.MustNewID("mockforward")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, }, @@ -712,22 +712,22 @@ func TestConnectorPipelinesGraph(t *testing.T) { { name: "pipelines_conn_mutate_profiles.yaml", pipelineConfigs: pipelines.Config{ - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "in"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "in"): { Receivers: []component.ID{component.MustNewID("examplereceiver")}, Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewIDWithName("exampleconnector", "inherit_mutate")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "out0"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "out0"): { Receivers: []component.ID{component.MustNewIDWithName("exampleconnector", "inherit_mutate")}, Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "middle"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "middle"): { Receivers: []component.ID{component.MustNewIDWithName("exampleconnector", "inherit_mutate")}, Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewIDWithName("exampleconnector", "mutate")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "out1"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "out1"): { Receivers: []component.ID{component.MustNewIDWithName("exampleconnector", "mutate")}, Processors: []component.ID{component.MustNewID("exampleprocessor")}, Exporters: []component.ID{component.MustNewID("exampleexporter")}, @@ -902,7 +902,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { logsReceiver := c.(*testcomponents.ExampleReceiver) require.NoError(t, logsReceiver.ConsumeLogs(context.Background(), testdata.GenerateLogs(1))) } - for _, c := range allReceivers[componentprofiles.SignalProfiles] { + for _, c := range allReceivers[pipelineprofiles.SignalProfiles] { profilesReceiver := c.(*testcomponents.ExampleReceiver) require.NoError(t, profilesReceiver.ConsumeProfiles(context.Background(), testdata.GenerateProfiles(1))) } @@ -992,7 +992,7 @@ func TestConnectorPipelinesGraph(t *testing.T) { } } } - for _, e := range allExporters[componentprofiles.SignalProfiles] { + for _, e := range allExporters[pipelineprofiles.SignalProfiles] { profilesExporter := e.(*testcomponents.ExampleExporter) assert.Len(t, profilesExporter.Profiles, tt.expectedPerExporter) expectedMutable := testdata.GenerateProfiles(1) @@ -1031,9 +1031,9 @@ func TestConnectorRouter(t *testing.T) { logsRightID := pipeline.NewIDWithName(pipeline.SignalLogs, "right") logsLeftID := pipeline.NewIDWithName(pipeline.SignalLogs, "left") - profilesInID := pipeline.NewIDWithName(componentprofiles.SignalProfiles, "in") - profilesRightID := pipeline.NewIDWithName(componentprofiles.SignalProfiles, "right") - profilesLeftID := pipeline.NewIDWithName(componentprofiles.SignalProfiles, "left") + profilesInID := pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "in") + profilesRightID := pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "right") + profilesLeftID := pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "left") ctx := context.Background() set := Settings{ @@ -1214,9 +1214,9 @@ func TestConnectorRouter(t *testing.T) { assert.Len(t, logsLeft.Logs, 2) // Get a handle for the profiles receiver and both Exporters - profilesReceiver := allReceivers[componentprofiles.SignalProfiles][rcvrID].(*testcomponents.ExampleReceiver) - profilesRight := allExporters[componentprofiles.SignalProfiles][expRightID].(*testcomponents.ExampleExporter) - profilesLeft := allExporters[componentprofiles.SignalProfiles][expLeftID].(*testcomponents.ExampleExporter) + profilesReceiver := allReceivers[pipelineprofiles.SignalProfiles][rcvrID].(*testcomponents.ExampleReceiver) + profilesRight := allExporters[pipelineprofiles.SignalProfiles][expRightID].(*testcomponents.ExampleExporter) + profilesLeft := allExporters[pipelineprofiles.SignalProfiles][expLeftID].(*testcomponents.ExampleExporter) // Consume 1, validate it went right require.NoError(t, profilesReceiver.ConsumeProfiles(ctx, testdata.GenerateProfiles(1))) @@ -1314,7 +1314,7 @@ func TestGraphBuildErrors(t *testing.T) { component.MustNewID("bf"): badExporterFactory.CreateDefaultConfig(), }, pipelineCfgs: pipelines.Config{ - pipeline.NewID(componentprofiles.SignalProfiles): { + pipeline.NewID(pipelineprofiles.SignalProfiles): { Receivers: []component.ID{component.MustNewID("nop")}, Exporters: []component.ID{component.MustNewID("bf")}, }, @@ -1393,7 +1393,7 @@ func TestGraphBuildErrors(t *testing.T) { component.MustNewID("nop"): nopReceiverFactory.CreateDefaultConfig(), }, pipelineCfgs: pipelines.Config{ - pipeline.NewID(componentprofiles.SignalProfiles): { + pipeline.NewID(pipelineprofiles.SignalProfiles): { Receivers: []component.ID{component.MustNewID("nop")}, Processors: []component.ID{component.MustNewID("bf")}, Exporters: []component.ID{component.MustNewID("nop")}, @@ -1458,7 +1458,7 @@ func TestGraphBuildErrors(t *testing.T) { component.MustNewID("nop"): nopReceiverFactory.CreateDefaultConfig(), }, pipelineCfgs: pipelines.Config{ - pipeline.NewID(componentprofiles.SignalProfiles): { + pipeline.NewID(pipelineprofiles.SignalProfiles): { Receivers: []component.ID{component.MustNewID("bf")}, Exporters: []component.ID{component.MustNewID("nop")}, }, @@ -1550,7 +1550,7 @@ func TestGraphBuildErrors(t *testing.T) { Receivers: []component.ID{component.MustNewID("nop")}, Exporters: []component.ID{component.MustNewID("bf")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "out"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "out"): { Receivers: []component.ID{component.MustNewID("bf")}, Exporters: []component.ID{component.MustNewID("nop")}, }, @@ -1642,7 +1642,7 @@ func TestGraphBuildErrors(t *testing.T) { Receivers: []component.ID{component.MustNewID("nop")}, Exporters: []component.ID{component.MustNewID("bf")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "out"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "out"): { Receivers: []component.ID{component.MustNewID("bf")}, Exporters: []component.ID{component.MustNewID("nop")}, }, @@ -1734,7 +1734,7 @@ func TestGraphBuildErrors(t *testing.T) { Receivers: []component.ID{component.MustNewID("nop")}, Exporters: []component.ID{component.MustNewID("bf")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "out"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "out"): { Receivers: []component.ID{component.MustNewID("bf")}, Exporters: []component.ID{component.MustNewID("nop")}, }, @@ -1753,7 +1753,7 @@ func TestGraphBuildErrors(t *testing.T) { component.MustNewID("bf"): nopConnectorFactory.CreateDefaultConfig(), }, pipelineCfgs: pipelines.Config{ - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "in"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "in"): { Receivers: []component.ID{component.MustNewID("nop")}, Exporters: []component.ID{component.MustNewID("bf")}, }, @@ -1776,7 +1776,7 @@ func TestGraphBuildErrors(t *testing.T) { component.MustNewID("bf"): nopConnectorFactory.CreateDefaultConfig(), }, pipelineCfgs: pipelines.Config{ - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "in"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "in"): { Receivers: []component.ID{component.MustNewID("nop")}, Exporters: []component.ID{component.MustNewID("bf")}, }, @@ -1799,7 +1799,7 @@ func TestGraphBuildErrors(t *testing.T) { component.MustNewID("bf"): nopConnectorFactory.CreateDefaultConfig(), }, pipelineCfgs: pipelines.Config{ - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "in"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "in"): { Receivers: []component.ID{component.MustNewID("nop")}, Exporters: []component.ID{component.MustNewID("bf")}, }, @@ -1822,11 +1822,11 @@ func TestGraphBuildErrors(t *testing.T) { component.MustNewID("bf"): nopConnectorFactory.CreateDefaultConfig(), }, pipelineCfgs: pipelines.Config{ - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "in"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "in"): { Receivers: []component.ID{component.MustNewID("nop")}, Exporters: []component.ID{component.MustNewID("bf")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "out"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "out"): { Receivers: []component.ID{component.MustNewID("bf")}, Exporters: []component.ID{component.MustNewID("nop")}, }, @@ -2018,7 +2018,7 @@ func TestGraphBuildErrors(t *testing.T) { component.MustNewIDWithName("nop", "conn"): nopConnectorFactory.CreateDefaultConfig(), }, pipelineCfgs: pipelines.Config{ - pipeline.NewID(componentprofiles.SignalProfiles): { + pipeline.NewID(pipelineprofiles.SignalProfiles): { Receivers: []component.ID{component.MustNewIDWithName("nop", "conn")}, Processors: []component.ID{component.MustNewID("nop")}, Exporters: []component.ID{component.MustNewIDWithName("nop", "conn")}, @@ -2181,22 +2181,22 @@ func TestGraphBuildErrors(t *testing.T) { component.MustNewIDWithName("nop", "conn2"): nopConnectorFactory.CreateDefaultConfig(), }, pipelineCfgs: pipelines.Config{ - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "in"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "in"): { Receivers: []component.ID{component.MustNewID("nop")}, Processors: []component.ID{component.MustNewID("nop")}, Exporters: []component.ID{component.MustNewIDWithName("nop", "conn")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "1"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "1"): { Receivers: []component.ID{component.MustNewIDWithName("nop", "conn")}, Processors: []component.ID{component.MustNewID("nop")}, Exporters: []component.ID{component.MustNewIDWithName("nop", "conn1")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "2"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "2"): { Receivers: []component.ID{component.MustNewIDWithName("nop", "conn1")}, Processors: []component.ID{component.MustNewID("nop")}, Exporters: []component.ID{component.MustNewIDWithName("nop", "conn2"), component.MustNewIDWithName("nop", "conn")}, }, - pipeline.NewIDWithName(componentprofiles.SignalProfiles, "out"): { + pipeline.NewIDWithName(pipelineprofiles.SignalProfiles, "out"): { Receivers: []component.ID{component.MustNewIDWithName("nop", "conn2")}, Processors: []component.ID{component.MustNewID("nop")}, Exporters: []component.ID{component.MustNewID("nop")}, diff --git a/service/internal/graph/processor.go b/service/internal/graph/processor.go index a20e8e8dfd8..9167152011c 100644 --- a/service/internal/graph/processor.go +++ b/service/internal/graph/processor.go @@ -8,10 +8,10 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componentprofiles" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumerprofiles" "go.opentelemetry.io/collector/pipeline" + "go.opentelemetry.io/collector/pipeline/pipelineprofiles" "go.opentelemetry.io/collector/processor" "go.opentelemetry.io/collector/service/internal/builders" "go.opentelemetry.io/collector/service/internal/components" @@ -58,7 +58,7 @@ func (n *processorNode) buildComponent(ctx context.Context, n.Component, err = builder.CreateMetrics(ctx, set, next.(consumer.Metrics)) case pipeline.SignalLogs: n.Component, err = builder.CreateLogs(ctx, set, next.(consumer.Logs)) - case componentprofiles.SignalProfiles: + case pipelineprofiles.SignalProfiles: n.Component, err = builder.CreateProfiles(ctx, set, next.(consumerprofiles.Profiles)) default: return fmt.Errorf("error creating processor %q in pipeline %q, data type %q is not supported", set.ID, n.pipelineID.String(), n.pipelineID.Signal()) diff --git a/service/internal/graph/receiver.go b/service/internal/graph/receiver.go index e462671bfc7..d5de95ca3b2 100644 --- a/service/internal/graph/receiver.go +++ b/service/internal/graph/receiver.go @@ -8,11 +8,11 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componentprofiles" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumerprofiles" "go.opentelemetry.io/collector/internal/fanoutconsumer" "go.opentelemetry.io/collector/pipeline" + "go.opentelemetry.io/collector/pipeline/pipelineprofiles" "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/service/internal/builders" "go.opentelemetry.io/collector/service/internal/components" @@ -65,7 +65,7 @@ func (n *receiverNode) buildComponent(ctx context.Context, consumers = append(consumers, next.(consumer.Logs)) } n.Component, err = builder.CreateLogs(ctx, set, fanoutconsumer.NewLogs(consumers)) - case componentprofiles.SignalProfiles: + case pipelineprofiles.SignalProfiles: var consumers []consumerprofiles.Profiles for _, next := range nexts { consumers = append(consumers, next.(consumerprofiles.Profiles)) diff --git a/service/internal/graph/util_test.go b/service/internal/graph/util_test.go index 0a9165622c4..dc788bca56a 100644 --- a/service/internal/graph/util_test.go +++ b/service/internal/graph/util_test.go @@ -9,7 +9,6 @@ import ( "sync" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componentprofiles" "go.opentelemetry.io/collector/connector" "go.opentelemetry.io/collector/connector/connectorprofiles" "go.opentelemetry.io/collector/consumer" @@ -18,6 +17,7 @@ import ( "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterprofiles" "go.opentelemetry.io/collector/pipeline" + "go.opentelemetry.io/collector/pipeline/pipelineprofiles" "go.opentelemetry.io/collector/processor" "go.opentelemetry.io/collector/processor/processorprofiles" "go.opentelemetry.io/collector/receiver" @@ -79,7 +79,7 @@ func (g *Graph) getReceivers() map[pipeline.Signal]map[component.ID]component.Co receiversMap[pipeline.SignalTraces] = make(map[component.ID]component.Component) receiversMap[pipeline.SignalMetrics] = make(map[component.ID]component.Component) receiversMap[pipeline.SignalLogs] = make(map[component.ID]component.Component) - receiversMap[componentprofiles.SignalProfiles] = make(map[component.ID]component.Component) + receiversMap[pipelineprofiles.SignalProfiles] = make(map[component.ID]component.Component) for _, pg := range g.pipelines { for _, rcvrNode := range pg.receivers { diff --git a/service/pipelines/config.go b/service/pipelines/config.go index ff898aafacb..30db3e820db 100644 --- a/service/pipelines/config.go +++ b/service/pipelines/config.go @@ -8,8 +8,8 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componentprofiles" "go.opentelemetry.io/collector/pipeline" + "go.opentelemetry.io/collector/pipeline/pipelineprofiles" ) var ( @@ -31,7 +31,7 @@ func (cfg Config) Validate() error { // only configured components. for pipelineID, p := range cfg { switch pipelineID.Signal() { - case pipeline.SignalTraces, pipeline.SignalMetrics, pipeline.SignalLogs, componentprofiles.SignalProfiles: + case pipeline.SignalTraces, pipeline.SignalMetrics, pipeline.SignalLogs, pipelineprofiles.SignalProfiles: // Continue default: return fmt.Errorf("pipeline %q: unknown signal %q", pipelineID.String(), pipelineID.Signal()) diff --git a/service/service_test.go b/service/service_test.go index 042aa978cf3..09aa0b7a4ab 100644 --- a/service/service_test.go +++ b/service/service_test.go @@ -22,7 +22,6 @@ import ( "go.uber.org/zap/zapcore" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componentprofiles" "go.opentelemetry.io/collector/component/componentstatus" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtelemetry" @@ -32,6 +31,7 @@ import ( "go.opentelemetry.io/collector/internal/testutil" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pipeline" + "go.opentelemetry.io/collector/pipeline/pipelineprofiles" "go.opentelemetry.io/collector/service/extensions" "go.opentelemetry.io/collector/service/internal/builders" "go.opentelemetry.io/collector/service/internal/promtest" @@ -242,8 +242,8 @@ func TestServiceGetExporters(t *testing.T) { assert.Contains(t, expMap[pipeline.SignalMetrics], component.NewID(nopType)) assert.Len(t, expMap[pipeline.SignalLogs], 1) assert.Contains(t, expMap[pipeline.SignalLogs], component.NewID(nopType)) - assert.Len(t, expMap[componentprofiles.SignalProfiles], 1) - assert.Contains(t, expMap[componentprofiles.SignalProfiles], component.NewID(nopType)) + assert.Len(t, expMap[pipelineprofiles.SignalProfiles], 1) + assert.Contains(t, expMap[pipelineprofiles.SignalProfiles], component.NewID(nopType)) } func TestServiceGetExportersWithSignal(t *testing.T) { @@ -269,8 +269,8 @@ func TestServiceGetExportersWithSignal(t *testing.T) { assert.Contains(t, expMap[pipeline.SignalMetrics], component.NewID(nopType)) assert.Len(t, expMap[pipeline.SignalLogs], 1) assert.Contains(t, expMap[pipeline.SignalLogs], component.NewID(nopType)) - assert.Len(t, expMap[componentprofiles.SignalProfiles], 1) - assert.Contains(t, expMap[componentprofiles.SignalProfiles], component.NewID(nopType)) + assert.Len(t, expMap[pipelineprofiles.SignalProfiles], 1) + assert.Contains(t, expMap[pipelineprofiles.SignalProfiles], component.NewID(nopType)) } // TestServiceTelemetryCleanupOnError tests that if newService errors due to an invalid config telemetry is cleaned up @@ -639,7 +639,7 @@ func newNopConfig() Config { Processors: []component.ID{component.NewID(nopType)}, Exporters: []component.ID{component.NewID(nopType)}, }, - pipeline.NewID(componentprofiles.SignalProfiles): { + pipeline.NewID(pipelineprofiles.SignalProfiles): { Receivers: []component.ID{component.NewID(nopType)}, Processors: []component.ID{component.NewID(nopType)}, Exporters: []component.ID{component.NewID(nopType)}, diff --git a/versions.yaml b/versions.yaml index 14e07075e23..1a82dbb2daf 100644 --- a/versions.yaml +++ b/versions.yaml @@ -28,7 +28,6 @@ module-sets: - go.opentelemetry.io/collector/cmd/mdatagen - go.opentelemetry.io/collector/component - go.opentelemetry.io/collector/component/componentstatus - - go.opentelemetry.io/collector/component/componentprofiles - go.opentelemetry.io/collector/confmap/converter/expandconverter - go.opentelemetry.io/collector/config/configauth - go.opentelemetry.io/collector/config/configgrpc @@ -59,6 +58,7 @@ module-sets: - go.opentelemetry.io/collector/pdata/pprofile - go.opentelemetry.io/collector/pdata/testdata - go.opentelemetry.io/collector/pipeline + - go.opentelemetry.io/collector/pipeline/pipelineprofiles - go.opentelemetry.io/collector/processor - go.opentelemetry.io/collector/processor/batchprocessor - go.opentelemetry.io/collector/processor/memorylimiterprocessor