This is an automated email from the ASF dual-hosted git repository.

zhangliang2022 pushed a commit to branch release-v0.14
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/release-v0.14 by this push:
     new 53ad7699 fix: most PRs don't have deploy time (#3399)
53ad7699 is described below

commit 53ad7699ef7acc2b4eddd1f6366888d31e74e45c
Author: Klesh Wong <[email protected]>
AuthorDate: Wed Oct 12 21:30:22 2022 +0800

    fix: most PRs don't have deploy time (#3399)
---
 plugins/dora/tasks/change_lead_time_calculator.go | 39 +++++++++++++----------
 plugins/github/github.go                          | 30 +++++++++--------
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/plugins/dora/tasks/change_lead_time_calculator.go 
b/plugins/dora/tasks/change_lead_time_calculator.go
index ceffd02d..d6bcdb4b 100644
--- a/plugins/dora/tasks/change_lead_time_calculator.go
+++ b/plugins/dora/tasks/change_lead_time_calculator.go
@@ -33,15 +33,10 @@ import (
 
 func CalculateChangeLeadTime(taskCtx core.SubTaskContext) errors.Error {
        db := taskCtx.GetDal()
-       repoIdList := make([]string, 0)
-       repoClause := dal.From(&code.Repo{})
-       err := db.Pluck("id", &repoIdList, repoClause)
-       if err != nil {
-               return err
-       }
+       log := taskCtx.GetLogger()
        clauses := []dal.Clause{
                dal.From(&code.PullRequest{}),
-               dal.Where("merged_date IS NOT NULL and head_repo_id in ?", 
repoIdList),
+               dal.Where("merged_date IS NOT NULL"),
        }
        cursor, err := db.Cursor(clauses...)
        if err != nil {
@@ -83,12 +78,15 @@ func CalculateChangeLeadTime(taskCtx core.SubTaskContext) 
errors.Error {
                                pr.OrigReviewLag = 
int64(firstReviewTime.Sub(pr.CreatedDate).Minutes())
                                pr.OrigReviewTimespan = 
int64(pr.MergedDate.Sub(*firstReviewTime).Minutes())
                        }
-                       deployTime, err := getDeployTime(devops.PRODUCTION, 
*pr.MergedDate, db)
+                       deployment, err := getDeployment(devops.PRODUCTION, 
*pr.MergedDate, db)
                        if err != nil {
                                return nil, err
                        }
-                       if deployTime != nil {
-                               pr.OrigDeployTimespan = 
int64(deployTime.Sub(*pr.MergedDate).Minutes())
+                       if deployment != nil && deployment.FinishedDate != nil {
+                               timespan := 
deployment.FinishedDate.Sub(*pr.MergedDate)
+                               pr.OrigDeployTimespan = 
int64(timespan.Minutes())
+                       } else {
+                               log.Debug("deploy time of pr %v is nil\n", 
pr.PullRequestKey)
                        }
                        processNegativeValue(pr)
                        pr.ChangeTimespan = nil
@@ -153,16 +151,23 @@ func getFirstReviewTime(prId string, prCreator string, db 
dal.Dal) (*time.Time,
        return &review.CreatedDate, nil
 }
 
-func getDeployTime(environment string, mergeDate time.Time, db dal.Dal) 
(*time.Time, errors.Error) {
+func getDeployment(environment string, mergeDate time.Time, db dal.Dal) 
(*devops.CICDTask, errors.Error) {
+       // ignore environment at this point because detecting it by name is 
obviously not engouh
+       // take 
https://github.com/apache/incubator-devlake/actions/workflows/build.yml for 
example
+       // one can not distingush testing/production by looking at the job name 
solely.
        cicdTask := &devops.CICDTask{}
        cicdTaskClauses := []dal.Clause{
                dal.From(&devops.CICDTask{}),
-               dal.Join("left join cicd_pipeline_commits on 
cicd_tasks.pipeline_id = cicd_pipeline_commits.pipeline_id"),
-               dal.Where(`cicd_tasks.environment = ? 
-                       and cicd_tasks.result = ?
-                       and cicd_tasks.started_date > ?`,
-                       environment, "SUCCESS", mergeDate),
+               dal.Where(`
+                       type = ?
+                       AND cicd_tasks.result = ?
+                       AND cicd_tasks.started_date > ?`,
+                       "DEPLOYMENT",
+                       "SUCCESS",
+                       mergeDate,
+               ),
                dal.Orderby("cicd_tasks.started_date ASC"),
+               dal.Limit(1),
        }
        err := db.First(cicdTask, cicdTaskClauses...)
        if goerror.Is(err, gorm.ErrRecordNotFound) {
@@ -171,7 +176,7 @@ func getDeployTime(environment string, mergeDate time.Time, 
db dal.Dal) (*time.T
        if err != nil {
                return nil, err
        }
-       return cicdTask.FinishedDate, nil
+       return cicdTask, nil
 }
 
 func processNegativeValue(pr *code.PullRequest) {
diff --git a/plugins/github/github.go b/plugins/github/github.go
index aeb637f5..8e335e22 100644
--- a/plugins/github/github.go
+++ b/plugins/github/github.go
@@ -45,23 +45,25 @@ func main() {
        issueTypeBug := cmd.Flags().String("issueTypeBug", 
"^(bug|failure|error)$", "issue type bug")
        issueTypeIncident := cmd.Flags().String("issueTypeIncident", "", "issue 
type incident")
        issueTypeRequirement := cmd.Flags().String("issueTypeRequirement", 
"^(feat|feature|proposal|requirement)$", "issue type requirement")
-       deployTagPattern := cmd.Flags().String("deployTagPattern", 
"(?i)deploy", "deploy tag name")
+       deploymentPattern := cmd.Flags().String("deploymentPattern", 
"(?i)deploy", "deploy tag name")
 
        cmd.Run = func(cmd *cobra.Command, args []string) {
                runner.DirectRun(cmd, args, PluginEntry, map[string]interface{}{
-                       "connectionId":         *connectionId,
-                       "owner":                *owner,
-                       "repo":                 *repo,
-                       "prType":               *prType,
-                       "prComponent":          *prComponent,
-                       "prBodyClosePattern":   *prBodyClosePattern,
-                       "issueSeverity":        *issueSeverity,
-                       "issuePriority":        *issuePriority,
-                       "issueComponent":       *issueComponent,
-                       "issueTypeBug":         *issueTypeBug,
-                       "issueTypeIncident":    *issueTypeIncident,
-                       "issueTypeRequirement": *issueTypeRequirement,
-                       "deployTagPattern":     *deployTagPattern,
+                       "connectionId": *connectionId,
+                       "owner":        *owner,
+                       "repo":         *repo,
+                       "transformationRules": map[string]interface{}{
+                               "prType":               *prType,
+                               "prComponent":          *prComponent,
+                               "prBodyClosePattern":   *prBodyClosePattern,
+                               "issueSeverity":        *issueSeverity,
+                               "issuePriority":        *issuePriority,
+                               "issueComponent":       *issueComponent,
+                               "issueTypeBug":         *issueTypeBug,
+                               "issueTypeIncident":    *issueTypeIncident,
+                               "issueTypeRequirement": *issueTypeRequirement,
+                               "deploymentPattern":    *deploymentPattern,
+                       },
                })
        }
        runner.RunCmd(cmd)

Reply via email to