Move componentprofiles to pipelineprofiles (#11421)

Move componentprofiles to pipelineprofiles since only the signal
constant is defined in that package.

Signed-off-by: Bogdan Drutu <[email protected]>

.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]

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 \

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",

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

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

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

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)
 }

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())

connector/connectorprofiles/go.mod

@@ -6,14 +6,14 @@ 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
  go.opentelemetry.io/collector/consumer/consumertest v0.111.0
  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