Full MVC of gitlab-zoekt-indexer

cmd/gitlab-zoekt-indexer/main.go

@@ -18,7 +18,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	// "gitlab.com/gitlab-org/labkit/correlation"
+	"gitlab.com/gitlab-org/search-team/gitlab-zoekt-indexer/correlation"
 	"gitlab.com/gitlab-org/search-team/gitlab-zoekt-indexer/indexer"
 )
 
@@ -43,11 +43,36 @@ type gitalyConnectionInfo struct {
 type indexRequest struct {
 	Timeout              string
 	RepoID               uint32
-	CorrelationID        string
 	GitalyConnectionInfo *gitalyConnectionInfo
 	FileSizeLimit        int
 }
 
+func (s *indexServer) indexRepository(req indexRequest, ctx context.Context) error {
+	timeout, err := time.ParseDuration(req.Timeout)
+	if err != nil {
+		return fmt.Errorf("failed to parse Timeout: %v with error %v", req.Timeout, err)
+	}
+
+	ctx, cancel := context.WithTimeout(ctx, timeout)
+	defer cancel()
+
+	idx := &indexer.Indexer{
+		IndexDir:           s.indexDir,
+		ProjectID:          req.RepoID,
+		CorrelationID:      correlation.GetCorrelationID(ctx),
+		GitalyAddress:      req.GitalyConnectionInfo.Address,
+		GitalyStorageName:  req.GitalyConnectionInfo.Storage,
+		GitalyRelativePath: req.GitalyConnectionInfo.Path,
+		LimitFileSize:      req.FileSizeLimit,
+	}
+
+	if err := idx.IndexRepository(ctx); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func (s *indexServer) createIndexDir() {
 	if err := os.MkdirAll(s.indexDir, 0o755); err != nil {
 		log.Fatalf("createIndexDir %s: %v", s.indexDir, err)
@@ -142,7 +167,7 @@ func (s *indexServer) handleIndex() http.HandlerFunc {
 			return
 		}
 
-		err = s.indexRepository(req)
+		err = s.indexRepository(req, r.Context())
 		if err != nil {
 			s.respondWithError(w, r, route, err)
 			return
@@ -156,32 +181,6 @@ func (s *indexServer) handleIndex() http.HandlerFunc {
 	}
 }
 
-func (s *indexServer) indexRepository(req indexRequest) error {
-	timeout, err := time.ParseDuration(req.Timeout)
-	if err != nil {
-		return fmt.Errorf("failed to parse Timeout: %v with error %v", req.Timeout, err)
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), timeout)
-	defer cancel()
-
-	idx := &indexer.Indexer{
-		IndexDir:           s.indexDir,
-		ProjectID:          req.RepoID,
-		CorrelationID:      req.CorrelationID,
-		GitalyAddress:      req.GitalyConnectionInfo.Address,
-		GitalyStorageName:  req.GitalyConnectionInfo.Storage,
-		GitalyRelativePath: req.GitalyConnectionInfo.Path,
-		LimitFileSize:      req.FileSizeLimit,
-	}
-
-	if err := idx.IndexRepository(ctx); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func (s *indexServer) handleTruncate() http.HandlerFunc {
 	route := "truncate"
 
@@ -230,6 +229,7 @@ func (s *indexServer) respondWith(w http.ResponseWriter, r *http.Request, route
 
 	if err := json.NewEncoder(w).Encode(data); err != nil {
 		s.respondWithError(w, r, route, err)
+		return
 	}
 
 	s.incrementRequestsTotal(r.Method, route, http.StatusOK)