make fmt

.mockery.yaml

@@ -24,3 +24,6 @@ packages:
   github.com/grafana/pyroscope/pkg/experiment/metastore/discovery:
     interfaces:
       Discovery:
+  github.com/grafana/pyroscope/pkg/experiment/metastore/dlq:
+    interfaces:
+      LocalServer:

pkg/experiment/ingester/segment_test.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"github.com/grafana/dskit/flagext"
 	"github.com/grafana/pyroscope/pkg/experiment/metastore"
+	"github.com/grafana/pyroscope/pkg/test/mocks/mockdlq"
 	"io"
 	"math/rand"
 	"path/filepath"
@@ -389,8 +390,8 @@ func TestDLQRecoveryMock(t *testing.T) {
 	assert.Len(t, allBlocks, 1)
 
 	recoveredMetas := make(chan *metastorev1.BlockMeta, 1)
-	srv := mockmetastorev1.NewMockMetastoreServiceServer(t)
-	srv.On("AddBlock", mock.Anything, mock.Anything).
+	srv := mockdlq.NewMockLocalServer(t)
+	srv.On("AddRecoveredBlock", mock.Anything, mock.Anything).
 		Once().
 		Run(func(args mock.Arguments) {
 			meta := args.Get(1).(*metastorev1.AddBlockRequest).Block

pkg/experiment/metastore/dlq/recovery_test.go

@@ -7,7 +7,7 @@ import (
 	typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
 	segmentstorage "github.com/grafana/pyroscope/pkg/experiment/ingester/storage"
 	"github.com/grafana/pyroscope/pkg/objstore/providers/memory"
-	"github.com/grafana/pyroscope/pkg/test/mocks/mockmetastorev1"
+	"github.com/grafana/pyroscope/pkg/test/mocks/mockdlq"
 	"github.com/oklog/ulid"
 	"github.com/prometheus/prometheus/util/testutil"
 	"github.com/stretchr/testify/assert"
@@ -37,8 +37,8 @@ func TestRecoverTick(t *testing.T) {
 	}
 	actual := []*metastorev1.BlockMeta{}
 
-	srv := mockmetastorev1.NewMockMetastoreServiceServer(t)
-	srv.On("AddBlock", mock.Anything, mock.Anything).
+	srv := mockdlq.NewMockLocalServer(t)
+	srv.On("AddRecoveredBlock", mock.Anything, mock.Anything).
 		Times(3).
 		Run(func(args mock.Arguments) {
 			meta := args.Get(1).(*metastorev1.AddBlockRequest).Block
@@ -75,9 +75,9 @@ func TestNotRaftLeader(t *testing.T) {
 		},
 	}
 
-	srv := mockmetastorev1.NewMockMetastoreServiceServer(t)
+	srv := mockdlq.NewMockLocalServer(t)
 	s, _ := status.New(codes.Unavailable, "mock metastore error").WithDetails(&typesv1.RaftDetails{Leader: string("239")})
-	srv.On("AddBlock", mock.Anything, mock.Anything).
+	srv.On("AddRecoveredBlock", mock.Anything, mock.Anything).
 		Once().
 		Return(nil, s.Err())
 
@@ -110,8 +110,8 @@ func TestStartStop(t *testing.T) {
 	m := new(sync.Mutex)
 	actual := []*metastorev1.BlockMeta{}
 
-	srv := mockmetastorev1.NewMockMetastoreServiceServer(t)
-	srv.On("AddBlock", mock.Anything, mock.Anything).
+	srv := mockdlq.NewMockLocalServer(t)
+	srv.On("AddRecoveredBlock", mock.Anything, mock.Anything).
 		Times(3).
 		Run(func(args mock.Arguments) {
 			meta := args.Get(1).(*metastorev1.AddBlockRequest).Block