added a new flow/flag to use git cli only in analytics

Author: ayu-devtron

internals/Configuration.go

@@ -19,15 +19,16 @@ package internals
 import "github.com/caarlos0/env"
 
 type Configuration struct {
-	CommitStatsTimeoutInSec int    `env:"COMMIT_STATS_TIMEOUT_IN_SEC" envDefault:"2"`
-	EnableFileStats         bool   `env:"ENABLE_FILE_STATS" envDefault:"false"`
-	GitHistoryCount         int    `env:"GIT_HISTORY_COUNT" envDefault:"15"`
-	MinLimit                int    `env:"MIN_LIMIT_FOR_PVC" envDefault:"1"` // in MB
-	UseGitCli               bool   `env:"USE_GIT_CLI" envDefault:"false"`
-	AnalyticsDebug          bool   `env:"ANALYTICS_DEBUG" envDefault:"false"`
-	CliCmdTimeoutGlobal     int    `env:"CLI_CMD_TIMEOUT_GLOBAL_SECONDS" envDefault:"0"`
-	CliCmdTimeoutJson       string `env:"CLI_CMD_TIMEOUT_JSON" envDefault:""`
-	GoGitTimeout            int    `env:"GOGIT_TIMEOUT_SECONDS" envDefault:"10"`
+	CommitStatsTimeoutInSec      int    `env:"COMMIT_STATS_TIMEOUT_IN_SEC" envDefault:"2"`
+	EnableFileStats              bool   `env:"ENABLE_FILE_STATS" envDefault:"false"`
+	GitHistoryCount              int    `env:"GIT_HISTORY_COUNT" envDefault:"15"`
+	MinLimit                     int    `env:"MIN_LIMIT_FOR_PVC" envDefault:"1"` // in MB
+	UseGitCli                    bool   `env:"USE_GIT_CLI" envDefault:"false"`
+	UseAnalyticsCommitDiffGitCli bool   `env:"USE_ANALYTICS_COMMIT_DIFF_GIT_CLI" envDefault:"false"`
+	AnalyticsDebug               bool   `env:"ANALYTICS_DEBUG" envDefault:"false"`
+	CliCmdTimeoutGlobal          int    `env:"CLI_CMD_TIMEOUT_GLOBAL_SECONDS" envDefault:"0"`
+	CliCmdTimeoutJson            string `env:"CLI_CMD_TIMEOUT_JSON" envDefault:""`
+	GoGitTimeout                 int    `env:"GOGIT_TIMEOUT_SECONDS" envDefault:"10"`
 }
 
 func ParseConfiguration() (*Configuration, error) {

pkg/git/RepositoryManagerAnalytics.go

@@ -243,14 +243,16 @@ func (impl RepositoryManagerAnalyticsImpl) ChangesSinceByRepositoryForAnalytics(
 func (impl RepositoryManagerAnalyticsImpl) computeCommitDiff(gitCtx GitContext, checkoutPath string, oldHash plumbing.Hash, newHash plumbing.Hash, repository *GitRepository) ([]*Commit, error) {
 	var commitsCli, commitsGoGit []*Commit
 	var err error
-	if impl.configuration.UseGitCli || impl.configuration.AnalyticsDebug {
+	if impl.configuration.UseGitCli || impl.configuration.UseAnalyticsCommitDiffGitCli || impl.configuration.AnalyticsDebug {
+		impl.logger.Infow("Computing commit diff using cli ", "checkoutPath", checkoutPath)
 		commitsCli, err = impl.gitManager.LogMergeBase(gitCtx, checkoutPath, oldHash.String(), newHash.String())
 		if err != nil {
 			impl.logger.Errorw("error in fetching commits for analytics through CLI: ", "err", err)
 			return nil, err
 		}
 	}
-	if !impl.configuration.UseGitCli || impl.configuration.AnalyticsDebug {
+	if !(impl.configuration.UseGitCli || impl.configuration.UseAnalyticsCommitDiffGitCli) || impl.configuration.AnalyticsDebug {
+		impl.logger.Infow("Computing commit diff using go-git ", "checkoutPath", checkoutPath)
 		ctx, cancel := gitCtx.WithTimeout(impl.configuration.GoGitTimeout)
 		defer cancel()
 		commitsGoGit, err = RunWithTimeout(ctx, func() ([]*Commit, error) {