[chore] Remove unused method from grpc handler

plugin/storage/grpc/shared/grpc_handler.go

@@ -49,31 +49,6 @@ func NewGRPCHandler(impl *GRPCHandlerStorageImpl) *GRPCHandler {
 	return &GRPCHandler{impl: impl}
 }
 
-// NewGRPCHandler creates a handler given implementations grouped by plugin services.
-func NewGRPCHandlerWithPlugins(
-	mainImpl StoragePlugin,
-	archiveImpl ArchiveStoragePlugin,
-	streamImpl StreamingSpanWriterPlugin,
-) *GRPCHandler {
-	impl := &GRPCHandlerStorageImpl{
-		SpanReader:       mainImpl.SpanReader,
-		SpanWriter:       mainImpl.SpanWriter,
-		DependencyReader: mainImpl.DependencyReader,
-
-		ArchiveSpanReader:   func() spanstore.Reader { return nil },
-		ArchiveSpanWriter:   func() spanstore.Writer { return nil },
-		StreamingSpanWriter: func() spanstore.Writer { return nil },
-	}
-	if archiveImpl != nil {
-		impl.ArchiveSpanReader = archiveImpl.ArchiveSpanReader
-		impl.ArchiveSpanWriter = archiveImpl.ArchiveSpanWriter
-	}
-	if streamImpl != nil {
-		impl.StreamingSpanWriter = streamImpl.StreamingSpanWriter
-	}
-	return NewGRPCHandler(impl)
-}
-
 // Register registers the server as gRPC methods handler.
 func (s *GRPCHandler) Register(ss *grpc.Server, hs *health.Server) error {
 	storage_v1.RegisterSpanReaderPluginServer(ss, s)

plugin/storage/grpc/shared/grpc_handler_test.go

@@ -71,7 +71,7 @@ func withGRPCServer(fn func(r *grpcServerTest)) {
 	depReader := new(dependencyStoreMocks.Reader)
 	streamWriter := new(spanStoreMocks.Writer)
 
-	impl := &mockStoragePlugin{
+	mockPlugin := &mockStoragePlugin{
 		spanReader:    spanReader,
 		spanWriter:    spanWriter,
 		archiveReader: archiveReader,
@@ -80,11 +80,32 @@ func withGRPCServer(fn func(r *grpcServerTest)) {
 		streamWriter:  streamWriter,
 	}
 
-	handler := NewGRPCHandlerWithPlugins(impl, impl, impl)
+	impl := &GRPCHandlerStorageImpl{
+		SpanReader: func() spanstore.Reader {
+			return mockPlugin.spanReader
+		},
+		SpanWriter: func() spanstore.Writer {
+			return mockPlugin.spanWriter
+		},
+		DependencyReader: func() dependencystore.Reader {
+			return mockPlugin.depsReader
+		},
+		ArchiveSpanReader: func() spanstore.Reader {
+			return mockPlugin.archiveReader
+		},
+		ArchiveSpanWriter: func() spanstore.Writer {
+			return mockPlugin.archiveWriter
+		},
+		StreamingSpanWriter: func() spanstore.Writer {
+			return mockPlugin.streamWriter
+		},
+	}
+
+	handler := NewGRPCHandler(impl)
 	defer handler.Close(context.Background(), &storage_v1.CloseWriterRequest{})
 	r := &grpcServerTest{
 		server: handler,
-		impl:   impl,
+		impl:   mockPlugin,
 	}
 	fn(r)
 }
@@ -433,20 +454,3 @@ func TestGRPCServerCapabilities_NoStreamWriter(t *testing.T) {
 		assert.Equal(t, expected, capabilities)
 	})
 }
-
-func TestNewGRPCHandlerWithPlugins_Nils(t *testing.T) {
-	spanReader := new(spanStoreMocks.Reader)
-	spanWriter := new(spanStoreMocks.Writer)
-	depReader := new(dependencyStoreMocks.Reader)
-
-	impl := &mockStoragePlugin{
-		spanReader: spanReader,
-		spanWriter: spanWriter,
-		depsReader: depReader,
-	}
-
-	handler := NewGRPCHandlerWithPlugins(impl, nil, nil)
-	assert.Nil(t, handler.impl.ArchiveSpanReader())
-	assert.Nil(t, handler.impl.ArchiveSpanWriter())
-	assert.Nil(t, handler.impl.StreamingSpanWriter())
-}