[chore] refactor statustest, fold into status (#13584)

This is just moving an internal package around, as a side effect of
#13573

Author: atoulme

service/extensions/extensions.go

@@ -203,7 +203,7 @@ func New(ctx context.Context, set Settings, cfg Config, options ...Option) (*Ext
 		extMap:       make(map[component.ID]extension.Extension),
 		instanceIDs:  make(map[component.ID]*componentstatus.InstanceID),
 		extensionIDs: make([]component.ID, 0, len(cfg)),
-		reporter:     &nopReporter{},
+		reporter:     status.NewNopStatusReporter(),
 	}
 
 	for _, opt := range options {
@@ -238,11 +238,3 @@ func New(ctx context.Context, set Settings, cfg Config, options ...Option) (*Ext
 	exts.extensionIDs = order
 	return exts, nil
 }
-
-type nopReporter struct{}
-
-func (r *nopReporter) Ready() {}
-
-func (r *nopReporter) ReportStatus(*componentstatus.InstanceID, *componentstatus.Event) {}
-
-func (r *nopReporter) ReportOKIfStarting(*componentstatus.InstanceID) {}

service/internal/graph/graph_test.go

@@ -31,7 +31,6 @@ import (
 	"go.opentelemetry.io/collector/receiver/receivertest"
 	"go.opentelemetry.io/collector/service/internal/builders"
 	"go.opentelemetry.io/collector/service/internal/status"
-	"go.opentelemetry.io/collector/service/internal/status/statustest"
 	"go.opentelemetry.io/collector/service/internal/testcomponents"
 	"go.opentelemetry.io/collector/service/pipelines"
 )
@@ -918,7 +917,7 @@ func testConnectorPipelinesGraph(t *testing.T) {
 			}
 
 			// Shut down the entire component graph
-			require.NoError(t, pg.ShutdownAll(context.Background(), statustest.NewNopStatusReporter()))
+			require.NoError(t, pg.ShutdownAll(context.Background(), status.NewNopStatusReporter()))
 
 			// Check each pipeline individually, ensuring that all components are stopped.
 			for pipelineID := range tt.pipelineConfigs {

service/internal/graph/lifecycle_test.go

@@ -26,7 +26,6 @@ import (
 	"go.opentelemetry.io/collector/receiver/receivertest"
 	"go.opentelemetry.io/collector/service/internal/builders"
 	"go.opentelemetry.io/collector/service/internal/status"
-	"go.opentelemetry.io/collector/service/internal/status/statustest"
 	"go.opentelemetry.io/collector/service/pipelines"
 )
 
@@ -119,7 +118,7 @@ func testGraphStartStop(t *testing.T) {
 			}
 
 			ctx.order = map[component.ID]int{}
-			require.NoError(t, pg.ShutdownAll(ctx, statustest.NewNopStatusReporter()))
+			require.NoError(t, pg.ShutdownAll(ctx, status.NewNopStatusReporter()))
 			for _, edge := range tt.edges {
 				assert.Less(t, ctx.order[edge[0]], ctx.order[edge[1]])
 			}
@@ -161,7 +160,7 @@ func testGraphStartStopCycle(t *testing.T) {
 	err := pg.StartAll(context.Background(), &Host{Reporter: status.NewReporter(func(*componentstatus.InstanceID, *componentstatus.Event) {}, func(error) {})})
 	require.ErrorContains(t, err, `topo: no topological ordering: cyclic components`)
 
-	err = pg.ShutdownAll(context.Background(), statustest.NewNopStatusReporter())
+	err = pg.ShutdownAll(context.Background(), status.NewNopStatusReporter())
 	assert.ErrorContains(t, err, `topo: no topological ordering: cyclic components`)
 }
 
@@ -196,7 +195,7 @@ func testGraphStartStopComponentError(t *testing.T) {
 		T: e1,
 	})
 	require.ErrorIs(t, pg.StartAll(context.Background(), &Host{Reporter: status.NewReporter(func(*componentstatus.InstanceID, *componentstatus.Event) {}, func(error) {})}), r1.startErr)
-	assert.EqualError(t, pg.ShutdownAll(context.Background(), statustest.NewNopStatusReporter()), "bar")
+	assert.EqualError(t, pg.ShutdownAll(context.Background(), status.NewNopStatusReporter()), "bar")
 }
 
 // This includes all tests from the previous implementation, plus a new one
@@ -276,7 +275,7 @@ func testGraphFailToStartAndShutdown(t *testing.T) {
 			pipelines, err := Build(context.Background(), set)
 			require.NoError(t, err)
 			require.Error(t, pipelines.StartAll(context.Background(), &Host{Reporter: status.NewReporter(func(*componentstatus.InstanceID, *componentstatus.Event) {}, func(error) {})}))
-			assert.Error(t, pipelines.ShutdownAll(context.Background(), statustest.NewNopStatusReporter()))
+			assert.Error(t, pipelines.ShutdownAll(context.Background(), status.NewNopStatusReporter()))
 		})
 
 		t.Run(dt.String()+"/processor", func(t *testing.T) {
@@ -290,7 +289,7 @@ func testGraphFailToStartAndShutdown(t *testing.T) {
 			pipelines, err := Build(context.Background(), set)
 			require.NoError(t, err)
 			require.Error(t, pipelines.StartAll(context.Background(), &Host{Reporter: status.NewReporter(func(*componentstatus.InstanceID, *componentstatus.Event) {}, func(error) {})}))
-			assert.Error(t, pipelines.ShutdownAll(context.Background(), statustest.NewNopStatusReporter()))
+			assert.Error(t, pipelines.ShutdownAll(context.Background(), status.NewNopStatusReporter()))
 		})
 
 		t.Run(dt.String()+"/exporter", func(t *testing.T) {
@@ -304,7 +303,7 @@ func testGraphFailToStartAndShutdown(t *testing.T) {
 			pipelines, err := Build(context.Background(), set)
 			require.NoError(t, err)
 			require.Error(t, pipelines.StartAll(context.Background(), &Host{Reporter: status.NewReporter(func(*componentstatus.InstanceID, *componentstatus.Event) {}, func(error) {})}))
-			assert.Error(t, pipelines.ShutdownAll(context.Background(), statustest.NewNopStatusReporter()))
+			assert.Error(t, pipelines.ShutdownAll(context.Background(), status.NewNopStatusReporter()))
 		})
 
 		for _, dt2 := range dataTypes {
@@ -324,7 +323,7 @@ func testGraphFailToStartAndShutdown(t *testing.T) {
 				pipelines, err := Build(context.Background(), set)
 				require.NoError(t, err)
 				require.Error(t, pipelines.StartAll(context.Background(), &Host{Reporter: status.NewReporter(func(*componentstatus.InstanceID, *componentstatus.Event) {}, func(error) {})}))
-				assert.Error(t, pipelines.ShutdownAll(context.Background(), statustest.NewNopStatusReporter()))
+				assert.Error(t, pipelines.ShutdownAll(context.Background(), status.NewNopStatusReporter()))
 			})
 		}
 	}

service/internal/status/statustest/statustest.go renamed to service/internal/status/nop.go

@@ -1,14 +1,13 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-package statustest // import "go.opentelemetry.io/collector/service/internal/status/statustest"
+package status // import "go.opentelemetry.io/collector/service/internal/status"
 
 import (
 	"go.opentelemetry.io/collector/component/componentstatus"
-	"go.opentelemetry.io/collector/service/internal/status"
 )
 
-func NewNopStatusReporter() status.Reporter {
+func NewNopStatusReporter() Reporter {
 	return &nopStatusReporter{}
 }
 

service/internal/status/statustest/statustest_test.go renamed to service/internal/status/nop_test.go

@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-package statustest // import "go.opentelemetry.io/collector/service/internal/status/statustest"
+package status // import "go.opentelemetry.io/collector/service/internal/status"
 
 import "testing"