Skip to content

cherry-pick #7070 fix: empty dora data when run the tasks #7072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abeizn merged 1 commit into from
Feb 29, 2024
Merged

cherry-pick #7070 fix: empty dora data when run the tasks #7072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions backend/plugins/dora/tasks/change_lead_time_calculator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ limitations under the License.
package tasks

import (
"fmt"
"math"
"reflect"
"time"
Expand Down Expand Up @@ -47,6 +46,11 @@ func CalculateChangeLeadTime(taskCtx plugin.SubTaskContext) errors.Error {
db := taskCtx.GetDal()
logger := taskCtx.GetLogger()
data := taskCtx.GetData().(*DoraTaskData)
// Clear previous results from the project
err := db.Exec("DELETE FROM project_pr_metrics WHERE project_name = ? ", data.Options.ProjectName)
if err != nil {
return errors.Default.Wrap(err, "error deleting previous project_pr_metrics")
}

// Get pull requests by repo project_name
var clauses = []dal.Clause{
Expand All @@ -60,19 +64,6 @@ func CalculateChangeLeadTime(taskCtx plugin.SubTaskContext) errors.Error {
return err
}
defer cursor.Close()
count, err := db.Count(clauses...)
if err != nil {
return errors.Default.Wrap(err, "error getting count of clauses")
}
if count == 0 {
// Clear previous results from the project
deleteSql := fmt.Sprintf("DELETE FROM project_pr_metrics WHERE project_name = '%s'", data.Options.ProjectName)
err := db.Exec(deleteSql)
if err != nil {
return errors.Default.Wrap(err, "error deleting previous project_pr_metrics")
}
return nil
}

converter, err := api.NewDataConverter(api.DataConverterArgs{
RawDataSubTaskArgs: api.RawDataSubTaskArgs{
Expand Down
34 changes: 21 additions & 13 deletions backend/plugins/dora/tasks/deployment_commits_generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,30 +101,38 @@ func GenerateDeploymentCommits(taskCtx plugin.SubTaskContext) errors.Error {
}
if data.Options.ScopeId != nil {
clauses = append(clauses, dal.Where(`p.cicd_scope_id = ?`, data.Options.ScopeId))
// Clear previous results from the project
deleteSql := `DELETE FROM cicd_deployment_commits WHERE cicd_scope_id = ? ;`
err := db.Exec(deleteSql, data.Options.ScopeId)
if err != nil {
return errors.Default.Wrap(err, "error deleting previous cicd_deployment_commits")
}
} else {
clauses = append(clauses,
dal.Join("LEFT JOIN project_mapping pm ON (pm.table = 'cicd_scopes' AND pm.row_id = p.cicd_scope_id)"),
dal.Where(`pm.project_name = ?`, data.Options.ProjectName),
)
// Clear previous results from the project
deleteSql := `DELETE FROM cicd_deployment_commits
WHERE cicd_scope_id IN (
SELECT cicd_scope_id
FROM (
SELECT cdc.cicd_scope_id
FROM cicd_deployment_commits cdc
LEFT JOIN project_mapping pm ON (pm.table = 'cicd_scopes' AND pm.row_id = cdc.cicd_scope_id)
WHERE pm.project_name = ?
) AS subquery
);`
err := db.Exec(deleteSql, data.Options.ProjectName)
if err != nil {
return errors.Default.Wrap(err, "error deleting previous cicd_deployment_commits")
}
}
cursor, err := db.Cursor(clauses...)
if err != nil {
return err
}
defer cursor.Close()
count, err := db.Count(clauses...)
if err != nil {
return errors.Default.Wrap(err, "error getting count of clauses")
}
if count == 0 {
// Clear previous results from the project
deleteSql := fmt.Sprintf("DELETE cdc FROM cicd_deployment_commits cdc LEFT JOIN project_mapping pm ON (pm.table = 'cicd_scopes' AND pm.row_id = cdc.cicd_scope_id) WHERE pm.project_name = '%s'", data.Options.ProjectName)
err := db.Exec(deleteSql)
if err != nil {
return errors.Default.Wrap(err, "error deleting previous cicd_deployment_commits")
}
return nil
}

enricher, err := api.NewDataConverter(api.DataConverterArgs{
RawDataSubTaskArgs: api.RawDataSubTaskArgs{
Expand Down
36 changes: 22 additions & 14 deletions backend/plugins/dora/tasks/deployment_generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ limitations under the License.
package tasks

import (
"fmt"
"reflect"
"time"

Expand Down Expand Up @@ -80,30 +79,39 @@ func GenerateDeployment(taskCtx plugin.SubTaskContext) errors.Error {
clauses = append(clauses,
dal.Where("p.cicd_scope_id = ?", data.Options.ScopeId),
)
// Clear previous results from the cicd_scope_id
deleteSql := `DELETE FROM cicd_deployments WHERE cicd_scope_id = ?;`
err := db.Exec(deleteSql, data.Options.ScopeId)
if err != nil {
return errors.Default.Wrap(err, "error deleting previous deployments")
}
} else {
clauses = append(clauses,
dal.Join("LEFT JOIN project_mapping pm ON (pm.table = 'cicd_scopes' AND pm.row_id = p.cicd_scope_id)"),
dal.Where("pm.project_name = ?", data.Options.ProjectName),
)
// Clear previous results from the project
deleteSql := `DELETE FROM cicd_deployments
WHERE cicd_scope_id IN (
SELECT cicd_scope_id
FROM (
SELECT cd.cicd_scope_id
FROM cicd_deployments cd
LEFT JOIN project_mapping pm ON (pm.table = 'cicd_scopes' AND pm.row_id = cd.cicd_scope_id)
WHERE pm.project_name = ?
) AS subquery
);`
err := db.Exec(deleteSql, data.Options.ProjectName)
if err != nil {
return errors.Default.Wrap(err, "error deleting previous deployments")
}
}

cursor, err := db.Cursor(clauses...)
if err != nil {
return err
}
defer cursor.Close()
count, err := db.Count(clauses...)
if err != nil {
return errors.Default.Wrap(err, "error getting count of clauses")
}
if count == 0 {
// Clear previous results from the project
deleteSql := fmt.Sprintf("DELETE cd FROM cicd_deployments cd LEFT JOIN project_mapping pm ON (pm.table = 'cicd_scopes' AND pm.row_id = cd.cicd_scope_id) WHERE pm.project_name = '%s'", data.Options.ProjectName)
err := db.Exec(deleteSql)
if err != nil {
return errors.Default.Wrap(err, "error deleting previous deployments")
}
return nil
}

enricher, err := api.NewDataConverter(api.DataConverterArgs{
RawDataSubTaskArgs: api.RawDataSubTaskArgs{
Expand Down
19 changes: 5 additions & 14 deletions backend/plugins/dora/tasks/incident_deploy_connector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ limitations under the License.
package tasks

import (
"fmt"
"reflect"
"time"

Expand Down Expand Up @@ -48,6 +47,11 @@ type simpleCicdDeploymentCommit struct {
func ConnectIncidentToDeployment(taskCtx plugin.SubTaskContext) errors.Error {
db := taskCtx.GetDal()
data := taskCtx.GetData().(*DoraTaskData)
// Clear previous results from the project
err := db.Exec("DELETE FROM project_issue_metrics WHERE project_name = ?", data.Options.ProjectName)
if err != nil {
return errors.Default.Wrap(err, "error deleting previous project_issue_metrics")
}
// select all issues belongs to the board
clauses := []dal.Clause{
dal.From(`issues i`),
Expand All @@ -63,19 +67,6 @@ func ConnectIncidentToDeployment(taskCtx plugin.SubTaskContext) errors.Error {
return err
}
defer cursor.Close()
count, err := db.Count(clauses...)
if err != nil {
return errors.Default.Wrap(err, "error getting count of clauses")
}
if count == 0 {
// Clear previous results from the project
deleteSql := fmt.Sprintf("DELETE FROM project_issue_metrics WHERE project_name = '%s'", data.Options.ProjectName)
err := db.Exec(deleteSql)
if err != nil {
return errors.Default.Wrap(err, "error deleting previous project_issue_metrics")
}
return nil
}

enricher, err := api.NewDataConverter(api.DataConverterArgs{
RawDataSubTaskArgs: api.RawDataSubTaskArgs{
Expand Down