chore: move vcs service handler from querier to query frontend (#3709)

grafana · Nov 20, 2024 · 7532763 · 7532763
1 parent 954b967
commit 7532763
Show file tree

Hide file tree

Showing 28 changed files with 12 additions and 66 deletions.
diff --git a/pkg/frontend/frontend.go b/pkg/frontend/frontend.go
@@ -29,7 +29,9 @@ import (
 
 	"github.com/grafana/dskit/tenant"
 
+	"github.com/grafana/pyroscope/api/gen/proto/go/vcs/v1/vcsv1connect"
 	"github.com/grafana/pyroscope/pkg/frontend/frontendpb"
+	"github.com/grafana/pyroscope/pkg/frontend/vcs"
 	"github.com/grafana/pyroscope/pkg/querier/stats"
 	"github.com/grafana/pyroscope/pkg/scheduler/schedulerdiscovery"
 	"github.com/grafana/pyroscope/pkg/util/connectgrpc"
@@ -80,6 +82,7 @@ func (cfg *Config) Validate() error {
 type Frontend struct {
 	services.Service
 	connectgrpc.GRPCRoundTripper
+	vcsv1connect.VCSServiceHandler
 	frontendpb.UnimplementedFrontendForQuerierServer
 
 	cfg Config
@@ -150,6 +153,7 @@ func NewFrontend(cfg Config, limits Limits, log log.Logger, reg prometheus.Regis
 		schedulerWorkers:        schedulerWorkers,
 		schedulerWorkersWatcher: services.NewFailureWatcher(),
 		requests:                newRequestsInProgress(),
+		VCSServiceHandler:       vcs.New(log, reg),
 	}
 	f.GRPCRoundTripper = &realFrontendRoundTripper{frontend: f}
 	// Randomize to avoid getting responses from queries sent before restart, which could lead to mixing results

diff --git a/pkg/frontend/frontend_vcs.go b/pkg/frontend/frontend_vcs.go
diff --git a/pkg/querier/vcs/client/client.go → pkg/frontend/vcs/client/client.go b/pkg/querier/vcs/client/client.go → pkg/frontend/vcs/client/client.go
diff --git a/pkg/querier/vcs/client/github.go → pkg/frontend/vcs/client/github.go b/pkg/querier/vcs/client/github.go → pkg/frontend/vcs/client/github.go
diff --git a/pkg/querier/vcs/client/metrics.go → pkg/frontend/vcs/client/metrics.go b/pkg/querier/vcs/client/metrics.go → pkg/frontend/vcs/client/metrics.go
diff --git a/pkg/querier/vcs/client/metrics_test.go → pkg/frontend/vcs/client/metrics_test.go b/pkg/querier/vcs/client/metrics_test.go → pkg/frontend/vcs/client/metrics_test.go
diff --git a/pkg/querier/vcs/commit.go → pkg/frontend/vcs/commit.go b/pkg/querier/vcs/commit.go → pkg/frontend/vcs/commit.go
diff --git a/pkg/querier/vcs/commit_test.go → pkg/frontend/vcs/commit_test.go b/pkg/querier/vcs/commit_test.go → pkg/frontend/vcs/commit_test.go
diff --git a/pkg/querier/vcs/encryption.go → pkg/frontend/vcs/encryption.go b/pkg/querier/vcs/encryption.go → pkg/frontend/vcs/encryption.go
diff --git a/pkg/querier/vcs/encryption_test.go → pkg/frontend/vcs/encryption_test.go b/pkg/querier/vcs/encryption_test.go → pkg/frontend/vcs/encryption_test.go
diff --git a/pkg/querier/vcs/github.go → pkg/frontend/vcs/github.go b/pkg/querier/vcs/github.go → pkg/frontend/vcs/github.go
diff --git a/pkg/querier/vcs/github_test.go → pkg/frontend/vcs/github_test.go b/pkg/querier/vcs/github_test.go → pkg/frontend/vcs/github_test.go
diff --git a/pkg/querier/vcs/service.go → pkg/frontend/vcs/service.go b/pkg/querier/vcs/service.go → pkg/frontend/vcs/service.go
@@ -16,8 +16,8 @@ import (
 
 	vcsv1 "github.com/grafana/pyroscope/api/gen/proto/go/vcs/v1"
 	"github.com/grafana/pyroscope/api/gen/proto/go/vcs/v1/vcsv1connect"
-	"github.com/grafana/pyroscope/pkg/querier/vcs/client"
-	"github.com/grafana/pyroscope/pkg/querier/vcs/source"
+	"github.com/grafana/pyroscope/pkg/frontend/vcs/client"
+	"github.com/grafana/pyroscope/pkg/frontend/vcs/source"
 )
 
 var _ vcsv1connect.VCSServiceHandler = (*Service)(nil)

diff --git a/pkg/querier/vcs/source/find.go → pkg/frontend/vcs/source/find.go b/pkg/querier/vcs/source/find.go → pkg/frontend/vcs/source/find.go
@@ -13,7 +13,7 @@ import (
 	giturl "github.com/kubescape/go-git-url"
 
 	vcsv1 "github.com/grafana/pyroscope/api/gen/proto/go/vcs/v1"
-	"github.com/grafana/pyroscope/pkg/querier/vcs/client"
+	"github.com/grafana/pyroscope/pkg/frontend/vcs/client"
 )
 
 type VCSClient interface {

diff --git a/pkg/querier/vcs/source/find_go.go → pkg/frontend/vcs/source/find_go.go b/pkg/querier/vcs/source/find_go.go → pkg/frontend/vcs/source/find_go.go
@@ -13,8 +13,8 @@ import (
 	"golang.org/x/mod/module"
 
 	vcsv1 "github.com/grafana/pyroscope/api/gen/proto/go/vcs/v1"
-	"github.com/grafana/pyroscope/pkg/querier/vcs/client"
-	"github.com/grafana/pyroscope/pkg/querier/vcs/source/golang"
+	"github.com/grafana/pyroscope/pkg/frontend/vcs/client"
+	"github.com/grafana/pyroscope/pkg/frontend/vcs/source/golang"
 )
 
 const (

diff --git a/pkg/querier/vcs/source/find_go_test.go → pkg/frontend/vcs/source/find_go_test.go b/pkg/querier/vcs/source/find_go_test.go → pkg/frontend/vcs/source/find_go_test.go
@@ -7,7 +7,7 @@ import (
 	giturl "github.com/kubescape/go-git-url"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/grafana/pyroscope/pkg/querier/vcs/client"
+	"github.com/grafana/pyroscope/pkg/frontend/vcs/client"
 )
 
 type VCSClientMock struct {

diff --git a/pkg/querier/vcs/source/golang/gen.go → pkg/frontend/vcs/source/golang/gen.go b/pkg/querier/vcs/source/golang/gen.go → pkg/frontend/vcs/source/golang/gen.go
diff --git a/pkg/querier/vcs/source/golang/golang.go → pkg/frontend/vcs/source/golang/golang.go b/pkg/querier/vcs/source/golang/golang.go → pkg/frontend/vcs/source/golang/golang.go
diff --git a/pkg/querier/vcs/source/golang/golang_test.go → ...frontend/vcs/source/golang/golang_test.go b/pkg/querier/vcs/source/golang/golang_test.go → ...frontend/vcs/source/golang/golang_test.go
@@ -13,7 +13,7 @@ func TestStandardLibraryURL(t *testing.T) {
 		expectedOk bool
 	}{
 		{
-			input:      "github.com/grafana/grafana/pkg/querier/vcs.go",
+			input:      "github.com/grafana/grafana/pkg/frontend/vcs.go",
 			expected:   "",
 			expectedOk: false,
 		},

diff --git a/pkg/querier/vcs/source/golang/modules.go → pkg/frontend/vcs/source/golang/modules.go b/pkg/querier/vcs/source/golang/modules.go → pkg/frontend/vcs/source/golang/modules.go
diff --git a/...querier/vcs/source/golang/modules_test.go → ...rontend/vcs/source/golang/modules_test.go b/...querier/vcs/source/golang/modules_test.go → ...rontend/vcs/source/golang/modules_test.go
diff --git a/pkg/querier/vcs/source/golang/packages.go → pkg/frontend/vcs/source/golang/packages.go b/pkg/querier/vcs/source/golang/packages.go → pkg/frontend/vcs/source/golang/packages.go
diff --git a/...querier/vcs/source/golang/packages_gen.go → ...rontend/vcs/source/golang/packages_gen.go b/...querier/vcs/source/golang/packages_gen.go → ...rontend/vcs/source/golang/packages_gen.go
diff --git a/pkg/querier/vcs/token.go → pkg/frontend/vcs/token.go b/pkg/querier/vcs/token.go → pkg/frontend/vcs/token.go
diff --git a/pkg/querier/vcs/token_test.go → pkg/frontend/vcs/token_test.go b/pkg/querier/vcs/token_test.go → pkg/frontend/vcs/token_test.go
diff --git a/pkg/phlare/modules.go b/pkg/phlare/modules.go
@@ -44,13 +44,13 @@ import (
 	"github.com/grafana/pyroscope/pkg/frontend"
 	readpath "github.com/grafana/pyroscope/pkg/frontend/read_path"
 	queryfrontend "github.com/grafana/pyroscope/pkg/frontend/read_path/query_frontend"
+	"github.com/grafana/pyroscope/pkg/frontend/vcs"
 	"github.com/grafana/pyroscope/pkg/ingester"
 	objstoreclient "github.com/grafana/pyroscope/pkg/objstore/client"
 	"github.com/grafana/pyroscope/pkg/objstore/providers/filesystem"
 	"github.com/grafana/pyroscope/pkg/operations"
 	phlarecontext "github.com/grafana/pyroscope/pkg/phlare/context"
 	"github.com/grafana/pyroscope/pkg/querier"
-	"github.com/grafana/pyroscope/pkg/querier/vcs"
 	"github.com/grafana/pyroscope/pkg/querier/worker"
 	"github.com/grafana/pyroscope/pkg/scheduler"
 	"github.com/grafana/pyroscope/pkg/settings"
@@ -318,7 +318,6 @@ func (f *Phlare) initQuerier() (services.Service, error) {
 	if !f.isModuleActive(QueryFrontend) {
 		f.API.RegisterPyroscopeHandlers(querierSvc)
 		f.API.RegisterQuerierServiceHandler(querierSvc)
-		f.API.RegisterVCSServiceHandler(querierSvc)
 	}
 
 	qWorker, err := worker.NewQuerierWorker(

diff --git a/pkg/querier/grpc_handler.go b/pkg/querier/grpc_handler.go
@@ -4,21 +4,18 @@ import (
 	"net/http"
 
 	"github.com/grafana/pyroscope/api/gen/proto/go/querier/v1/querierv1connect"
-	vcsv1connect "github.com/grafana/pyroscope/api/gen/proto/go/vcs/v1/vcsv1connect"
 	connectapi "github.com/grafana/pyroscope/pkg/api/connect"
 	"github.com/grafana/pyroscope/pkg/util/connectgrpc"
 	httputil "github.com/grafana/pyroscope/pkg/util/http"
 )
 
 type QuerierSvc interface {
 	querierv1connect.QuerierServiceHandler
-	vcsv1connect.VCSServiceHandler
 }
 
 func NewGRPCHandler(svc QuerierSvc, useK6Middleware bool) connectgrpc.GRPCHandler {
 	mux := http.NewServeMux()
 	mux.Handle(querierv1connect.NewQuerierServiceHandler(svc, connectapi.DefaultHandlerOptions()...))
-	mux.Handle(vcsv1connect.NewVCSServiceHandler(svc, connectapi.DefaultHandlerOptions()...))
 
 	if useK6Middleware {
 		httpMiddleware := httputil.K6Middleware()

diff --git a/pkg/querier/querier.go b/pkg/querier/querier.go
@@ -31,14 +31,12 @@ import (
 	ingestv1 "github.com/grafana/pyroscope/api/gen/proto/go/ingester/v1"
 	querierv1 "github.com/grafana/pyroscope/api/gen/proto/go/querier/v1"
 	typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
-	"github.com/grafana/pyroscope/api/gen/proto/go/vcs/v1/vcsv1connect"
 	connectapi "github.com/grafana/pyroscope/pkg/api/connect"
 	"github.com/grafana/pyroscope/pkg/clientpool"
 	phlaremodel "github.com/grafana/pyroscope/pkg/model"
 	phlareobj "github.com/grafana/pyroscope/pkg/objstore"
 	"github.com/grafana/pyroscope/pkg/phlaredb/bucketindex"
 	"github.com/grafana/pyroscope/pkg/pprof"
-	"github.com/grafana/pyroscope/pkg/querier/vcs"
 	"github.com/grafana/pyroscope/pkg/storegateway"
 	pmath "github.com/grafana/pyroscope/pkg/util/math"
 	"github.com/grafana/pyroscope/pkg/util/spanlogger"
@@ -71,8 +69,6 @@ type Querier struct {
 	ingesterQuerier     *IngesterQuerier
 	storeGatewayQuerier *StoreGatewayQuerier
 
-	vcsv1connect.VCSServiceHandler
-
 	storageBucket        phlareobj.Bucket
 	tenantConfigProvider phlareobj.TenantConfigProvider
 
@@ -133,7 +129,6 @@ func New(params *NewQuerierParams) (*Querier, error) {
 			params.IngestersRing,
 		),
 		storeGatewayQuerier:  storeGatewayQuerier,
-		VCSServiceHandler:    vcs.New(params.Logger, params.Reg),
 		storageBucket:        params.StorageBucket,
 		tenantConfigProvider: params.CfgProvider,
 		limits:               params.Overrides,