Merge branch 'jc-remove-find-all-tags-ff' into 'master'

Remove FindAllTags feature flag

Closes #1535

See merge request gitlab-org/gitaly!1155

3 files changed, 8 insertions, 77 deletions

diff --git a/changelogs/unreleased/jc-remove-find-all-tags-ff.yml b/changelogs/unreleased/jc-remove-find-all-tags-ff.yml
new file mode 100644
index 000000000..2a21abbf7
--- /dev/null
+++ b/changelogs/unreleased/jc-remove-find-all-tags-ff.yml
@@ -0,0 +1,5 @@
+---
+title: Remove FindAllTags feature flag
+merge_request: 1155
+author:
+type: other
diff --git a/internal/service/ref/refs.go b/internal/service/ref/refs.go
index 580c1670c..789c3653a 100644
--- a/internal/service/ref/refs.go
+++ b/internal/service/ref/refs.go
@@ -8,10 +8,6 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/prometheus/client_golang/prometheus"
-	"gitlab.com/gitlab-org/gitaly/internal/featureflag"
-	"gitlab.com/gitlab-org/gitaly/internal/rubyserver"
-
 	"gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
 	"gitlab.com/gitlab-org/gitaly/internal/git"
 	"gitlab.com/gitlab-org/gitaly/internal/git/catfile"
@@ -28,22 +24,8 @@ var (
 	headReference = _headReference
 	// FindBranchNames is exported to be used in other packages
 	FindBranchNames = _findBranchNames
-
-	findAllTagsFeatureFlag = "go-find-all-tags"
-
-	findAllTagsRequests = prometheus.NewCounterVec(
-		prometheus.CounterOpts{
-			Name: "gitaly_find_all_tags_requests_total",
-			Help: "Counter of go vs ruby implementation of FindAllTags",
-		},
-		[]string{"implementation"},
-	)
 )
 
-func init() {
-	prometheus.Register(findAllTagsRequests)
-}
-
 type findRefsOpts struct {
 	cmdArgs []string
 	delim   []byte
@@ -155,39 +137,10 @@ func (s *server) FindAllTags(in *gitalypb.FindAllTagsRequest, stream gitalypb.Re
 		return helper.ErrInvalidArgument(err)
 	}
 
-	if featureflag.IsEnabled(ctx, findAllTagsFeatureFlag) {
-		findAllTagsRequests.WithLabelValues("go").Inc()
-		if err := parseAndReturnTags(ctx, in.GetRepository(), stream); err != nil {
-			return helper.ErrInternal(err)
-		}
-		return nil
-	}
-
-	findAllTagsRequests.WithLabelValues("ruby").Inc()
-	client, err := s.RefServiceClient(ctx)
-	if err != nil {
-		return err
-	}
-
-	clientCtx, err := rubyserver.SetHeaders(ctx, in.GetRepository())
-	if err != nil {
-		return err
-	}
-
-	rubyStream, err := client.FindAllTags(clientCtx, in)
-	if err != nil {
-		return err
+	if err := parseAndReturnTags(ctx, in.GetRepository(), stream); err != nil {
+		return helper.ErrInternal(err)
 	}
-
-	return rubyserver.Proxy(func() error {
-		resp, err := rubyStream.Recv()
-		if err != nil {
-			md := rubyStream.Trailer()
-			stream.SetTrailer(md)
-			return err
-		}
-		return stream.Send(resp)
-	})
+	return nil
 }
 
 func validateFindAllTagsRequest(request *gitalypb.FindAllTagsRequest) error {
diff --git a/internal/service/ref/refs_test.go b/internal/service/ref/refs_test.go
index 8c4357c11..2fae85498 100644
--- a/internal/service/ref/refs_test.go
+++ b/internal/service/ref/refs_test.go
@@ -13,13 +13,11 @@ import (
 	"github.com/golang/protobuf/ptypes/timestamp"
 	"github.com/stretchr/testify/require"
 	"gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
-	"gitlab.com/gitlab-org/gitaly/internal/featureflag"
 	"gitlab.com/gitlab-org/gitaly/internal/git/log"
 	"gitlab.com/gitlab-org/gitaly/internal/git/updateref"
 	"gitlab.com/gitlab-org/gitaly/internal/helper"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
 	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/metadata"
 )
 
 func containsRef(refs [][]byte, ref string) bool {
@@ -583,31 +581,6 @@ func TestSuccessfulFindAllTagsRequest(t *testing.T) {
 	for i, expectedTag := range expectedTags {
 		require.Equal(t, expectedTag, receivedTags[i])
 	}
-
-	expectedNumberOfTags := len(receivedTags)
-	// using Go implementation
-
-	md := metadata.New(map[string]string{featureflag.HeaderKey(findAllTagsFeatureFlag): "true"})
-	ctx = metadata.NewOutgoingContext(context.Background(), md)
-
-	c, err = client.FindAllTags(ctx, rpcRequest)
-	require.NoError(t, err)
-
-	receivedTags = nil
-	for {
-		r, err := c.Recv()
-		if err == io.EOF {
-			break
-		}
-		require.NoError(t, err)
-		receivedTags = append(receivedTags, r.GetTags()...)
-	}
-
-	require.Len(t, receivedTags, expectedNumberOfTags, "received wrong number of tags")
-
-	for i, expectedTag := range expectedTags {
-		require.Equal(t, expectedTag, receivedTags[i])
-	}
 }
 
 func TestInvalidFindAllTagsRequest(t *testing.T) {