This is an automated email from the ASF dual-hosted git repository.
lynwee pushed a commit to branch release-v1.0
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/release-v1.0 by this push:
new f711103fa Fix errors in dora plugin (#7858) (#7859)
f711103fa is described below
commit f711103fab89936d72046f1ac929ba80a1b4247c
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Aug 7 15:34:35 2024 +0800
Fix errors in dora plugin (#7858) (#7859)
* fix(dora): add more log in task ConnectIncidentToDeployment
* fix(dora): add select clause in tasks
* fix(dora): add more log
* fix(dora): fix count errors
* fix(dora): fix count errors
* fix(dora): fix wrong subtasks orders
Co-authored-by: Lynwee <[email protected]>
---
backend/plugins/dora/impl/impl.go | 2 +-
.../plugins/dora/tasks/incident_deploy_connector.go | 21 ++++++++++++---------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/backend/plugins/dora/impl/impl.go
b/backend/plugins/dora/impl/impl.go
index bd464ee8b..246097398 100644
--- a/backend/plugins/dora/impl/impl.go
+++ b/backend/plugins/dora/impl/impl.go
@@ -94,8 +94,8 @@ func (p Dora) SubTaskMetas() []plugin.SubTaskMeta {
tasks.EnrichPrevSuccessDeploymentCommitMeta,
tasks.EnrichTaskEnvMeta,
tasks.CalculateChangeLeadTimeMeta,
- tasks.ConnectIncidentToDeploymentMeta,
tasks.IssuesToIncidentsMeta,
+ tasks.ConnectIncidentToDeploymentMeta,
}
}
diff --git a/backend/plugins/dora/tasks/incident_deploy_connector.go
b/backend/plugins/dora/tasks/incident_deploy_connector.go
index cc7e97aec..2b9ce4992 100644
--- a/backend/plugins/dora/tasks/incident_deploy_connector.go
+++ b/backend/plugins/dora/tasks/incident_deploy_connector.go
@@ -57,18 +57,21 @@ func ConnectIncidentToDeployment(taskCtx
plugin.SubTaskContext) errors.Error {
logger.Info("delete previous project_incident_deployment_relationships")
// select all issues belongs to the board
clauses := []dal.Clause{
- dal.Select(`i.*`),
dal.From(`incidents i`),
dal.Join(`left join project_mapping pm on pm.row_id =
i.scope_id and pm.table = i.table`),
dal.Where("pm.project_name = ?", data.Options.ProjectName),
}
- count, err := db.Count(clauses...)
- if err != nil {
- logger.Error(err, "count incidents")
- } else {
- logger.Info("incident count is %d", count)
- }
+ //count, err := db.Count(
+ // dal.From(`incidents i`),
+ // dal.Join(`left join project_mapping pm on pm.row_id =
i.scope_id and pm.table = i.table`),
+ // dal.Where("pm.project_name = ?", data.Options.ProjectName),
+ //)
+ //if err != nil {
+ // logger.Error(err, "count incidents")
+ //} else {
+ // logger.Info("incident count is %d", count)
+ //}
cursor, err := db.Cursor(clauses...)
if err != nil {
@@ -95,7 +98,7 @@ func ConnectIncidentToDeployment(taskCtx
plugin.SubTaskContext) errors.Error {
},
ProjectName: data.Options.ProjectName,
}
- logger.Info("get incident: %+v", incident.Id)
+ logger.Debug("get incident: %+v", incident.Id)
cicdDeploymentCommit := &devops.CicdDeploymentCommit{}
cicdDeploymentCommitClauses := []dal.Clause{
dal.Select("cicd_deployment_commits.cicd_deployment_id as id,
cicd_deployment_commits.finished_date as finished_date"),
@@ -128,7 +131,7 @@ func ConnectIncidentToDeployment(taskCtx
plugin.SubTaskContext) errors.Error {
projectIssueMetric.DeploymentId = scdc.Id
return []interface{}{projectIssueMetric}, nil
}
- logger.Info("scdc.id is empty, incident will be
ignored: %+v", incident.Id)
+ logger.Debug("scdc.id is empty, incident will be
ignored: %+v", incident.Id)
return nil, nil
},
})
