[chore] Move back receiver definitions, make profile embed receiver (o…

…pen-telemetry#11254) Signed-off-by: Bogdan Drutu <[email protected]>
jackgopack4 · Oct 8, 2024 · fe41120 · fe41120
1 parent 873fe08
commit fe41120
Show file tree

Hide file tree

Showing 18 changed files with 303 additions and 340 deletions.
diff --git a/receiver/internal/factory.go b/receiver/internal/factory.go
diff --git a/receiver/internal/logs.go b/receiver/internal/logs.go
diff --git a/receiver/internal/metrics.go b/receiver/internal/metrics.go
diff --git a/receiver/internal/profiles.go b/receiver/internal/profiles.go
diff --git a/receiver/internal/receiver.go b/receiver/internal/receiver.go
diff --git a/receiver/internal/traces.go b/receiver/internal/traces.go
diff --git a/receiver/otlpreceiver/factory.go b/receiver/otlpreceiver/factory.go
@@ -27,12 +27,12 @@ const (
 
 // NewFactory creates a new OTLP receiver factory.
 func NewFactory() receiver.Factory {
-	return receiver.NewFactory(
+	return receiverprofiles.NewFactory(
 		metadata.Type,
 		createDefaultConfig,
-		receiver.WithTraces(createTraces, metadata.TracesStability),
-		receiver.WithMetrics(createMetrics, metadata.MetricsStability),
-		receiver.WithLogs(createLog, metadata.LogsStability),
+		receiverprofiles.WithTraces(createTraces, metadata.TracesStability),
+		receiverprofiles.WithMetrics(createMetrics, metadata.MetricsStability),
+		receiverprofiles.WithLogs(createLog, metadata.LogsStability),
 		receiverprofiles.WithProfiles(createProfiles, metadata.ProfilesStability),
 	)
 }

diff --git a/receiver/otlpreceiver/factory_test.go b/receiver/otlpreceiver/factory_test.go
@@ -18,6 +18,7 @@ import (
 	"go.opentelemetry.io/collector/consumer/consumerprofiles"
 	"go.opentelemetry.io/collector/consumer/consumertest"
 	"go.opentelemetry.io/collector/internal/testutil"
+	"go.opentelemetry.io/collector/receiver/receiverprofiles"
 	"go.opentelemetry.io/collector/receiver/receivertest"
 )
 
@@ -47,7 +48,7 @@ func TestCreateSameReceiver(t *testing.T) {
 	assert.NotNil(t, lReceiver)
 	require.NoError(t, err)
 
-	pReceiver, err := factory.CreateProfilesReceiver(context.Background(), creationSet, cfg, consumertest.NewNop())
+	pReceiver, err := factory.(receiverprofiles.Factory).CreateProfilesReceiver(context.Background(), creationSet, cfg, consumertest.NewNop())
 	assert.NotNil(t, pReceiver)
 	require.NoError(t, err)
 
@@ -415,7 +416,7 @@ func TestCreateProfilesReceiver(t *testing.T) {
 	creationSet := receivertest.NewNopSettings()
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			tr, err := factory.CreateProfilesReceiver(ctx, creationSet, tt.cfg, tt.sink)
+			tr, err := factory.(receiverprofiles.Factory).CreateProfilesReceiver(ctx, creationSet, tt.cfg, tt.sink)
 			if tt.wantErr {
 				assert.Error(t, err)
 				return