Skip to content

Commit 922c076

Browse files
fsaminfsamin
authored
feat(api): improve tracing (#5286)
Signed-off-by: francois samin <[email protected]>
1 parent 8211112 commit 922c076

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+190
-169
lines changed

‎engine/api/action.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func (api *API) getActionsForProjectHandler() service.Handler {
5555
vars := mux.Vars(r)
5656
key := vars[permProjectKey]
5757

58-
proj, err := project.Load(api.mustDB(), key, project.LoadOptions.WithGroups)
58+
proj, err := project.Load(ctx, api.mustDB(), key, project.LoadOptions.WithGroups)
5959
if err != nil {
6060
return sdk.WrapError(err, "unable to load projet %s", key)
6161
}

‎engine/api/api_routes.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var (
2424
func (api *API) InitRouter() {
2525
api.Router.URL = api.Config.URL.API
2626
api.Router.SetHeaderFunc = DefaultHeaders
27-
api.Router.Middlewares = append(api.Router.Middlewares, api.authMiddleware, api.tracingMiddleware, api.maintenanceMiddleware)
27+
api.Router.Middlewares = append(api.Router.Middlewares, api.tracingMiddleware, api.authMiddleware, api.maintenanceMiddleware)
2828
api.Router.PostMiddlewares = append(api.Router.PostMiddlewares, TracingPostMiddleware)
2929

3030
r := api.Router

‎engine/api/application.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ func (api *API) getApplicationHandler() service.Handler {
151151
}
152152

153153
if app.FromRepository != "" {
154-
proj, err := project.Load(api.mustDB(), projectKey,
154+
proj, err := project.Load(ctx, api.mustDB(), projectKey,
155155
project.LoadOptions.WithApplicationWithDeploymentStrategies,
156156
project.LoadOptions.WithPipelines,
157157
project.LoadOptions.WithEnvironments,
@@ -255,7 +255,7 @@ func (api *API) addApplicationHandler() service.Handler {
255255
vars := mux.Vars(r)
256256
key := vars[permProjectKey]
257257

258-
proj, errl := project.Load(api.mustDB(), key)
258+
proj, errl := project.Load(ctx, api.mustDB(), key)
259259
if errl != nil {
260260
return sdk.WrapError(errl, "addApplicationHandler> Cannot load %s", key)
261261
}
@@ -299,7 +299,7 @@ func (api *API) deleteApplicationHandler() service.Handler {
299299
projectKey := vars[permProjectKey]
300300
applicationName := vars["applicationName"]
301301

302-
proj, errP := project.Load(api.mustDB(), projectKey)
302+
proj, errP := project.Load(ctx, api.mustDB(), projectKey)
303303
if errP != nil {
304304
return sdk.WrapError(errP, "deleteApplicationHandler> Cannot laod project")
305305
}
@@ -337,7 +337,7 @@ func (api *API) cloneApplicationHandler() service.Handler {
337337
projectKey := vars[permProjectKey]
338338
applicationName := vars["applicationName"]
339339

340-
proj, errProj := project.Load(api.mustDB(), projectKey)
340+
proj, errProj := project.Load(ctx, api.mustDB(), projectKey)
341341
if errProj != nil {
342342
return sdk.WrapError(sdk.ErrNoProject, "cloneApplicationHandler> Cannot load %s", projectKey)
343343
}
@@ -441,7 +441,7 @@ func (api *API) updateAsCodeApplicationHandler() service.Handler {
441441
return sdk.WrapError(sdk.ErrInvalidApplicationPattern, "Application name %s do not respect pattern", a.Name)
442442
}
443443

444-
proj, err := project.Load(api.mustDB(), key, project.LoadOptions.WithClearKeys)
444+
proj, err := project.Load(ctx, api.mustDB(), key, project.LoadOptions.WithClearKeys)
445445
if err != nil {
446446
return err
447447
}
@@ -527,7 +527,7 @@ func (api *API) updateApplicationHandler() service.Handler {
527527
projectKey := vars[permProjectKey]
528528
applicationName := vars["applicationName"]
529529

530-
p, err := project.Load(api.mustDB(), projectKey, project.LoadOptions.Default)
530+
p, err := project.Load(ctx, api.mustDB(), projectKey, project.LoadOptions.Default)
531531
if err != nil {
532532
return sdk.WrapError(err, "cannot load project %s", projectKey)
533533
}

‎engine/api/application_deployment.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func (api *API) postApplicationDeploymentStrategyConfigHandler() service.Handler
4747
}
4848
defer tx.Rollback() // nolint
4949

50-
proj, err := project.Load(tx, key, project.LoadOptions.WithIntegrations)
50+
proj, err := project.Load(ctx, tx, key, project.LoadOptions.WithIntegrations)
5151
if err != nil {
5252
return sdk.WrapError(err, "unable to load project")
5353
}
@@ -116,7 +116,7 @@ func (api *API) deleteApplicationDeploymentStrategyConfigHandler() service.Handl
116116
}
117117
defer tx.Rollback() // nolint
118118

119-
proj, err := project.Load(tx, key, project.LoadOptions.WithIntegrations)
119+
proj, err := project.Load(ctx, tx, key, project.LoadOptions.WithIntegrations)
120120
if err != nil {
121121
return sdk.WrapError(err, "unable to load project")
122122
}

‎engine/api/application_import.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func (api *API) postApplicationImportHandler() service.Handler {
2525
key := vars[permProjectKey]
2626
force := FormBool(r, "force")
2727

28-
proj, err := project.Load(api.mustDB(), key, project.LoadOptions.WithGroups, project.LoadOptions.WithIntegrations)
28+
proj, err := project.Load(ctx, api.mustDB(), key, project.LoadOptions.WithGroups, project.LoadOptions.WithIntegrations)
2929
if err != nil {
3030
return sdk.WrapError(err, "unable load project")
3131
}

‎engine/api/ascode.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func (api *API) postImportAsCodeHandler() service.Handler {
4747
return sdk.WithStack(sdk.ErrWrongRequest)
4848
}
4949

50-
p, err := project.Load(api.mustDB(), key, project.LoadOptions.WithClearKeys)
50+
p, err := project.Load(ctx, api.mustDB(), key, project.LoadOptions.WithClearKeys)
5151
if err != nil {
5252
return sdk.WrapError(err, "cannot load project")
5353
}
@@ -113,7 +113,7 @@ func (api *API) postPerformImportAsCodeHandler() service.Handler {
113113
uuid := vars["uuid"]
114114

115115
//Load project
116-
proj, errp := project.Load(api.mustDB(), key,
116+
proj, errp := project.Load(ctx, api.mustDB(), key,
117117
project.LoadOptions.WithGroups,
118118
project.LoadOptions.WithApplications,
119119
project.LoadOptions.WithEnvironments,
@@ -215,7 +215,7 @@ func (api *API) postWorkflowAsCodeEventsResyncHandler() service.Handler {
215215
projectKey := vars["key"]
216216
workflowName := vars["permWorkflowName"]
217217

218-
proj, err := project.Load(api.mustDB(), projectKey,
218+
proj, err := project.Load(ctx, api.mustDB(), projectKey,
219219
project.LoadOptions.WithApplicationWithDeploymentStrategies,
220220
project.LoadOptions.WithPipelines,
221221
project.LoadOptions.WithEnvironments,

‎engine/api/ascode_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ vcs_ssh_key: proj-blabla
399399
},
400400
},
401401
}
402-
proj2, errP := project.Load(api.mustDB(), p.Key, project.LoadOptions.WithPipelines, project.LoadOptions.WithGroups, project.LoadOptions.WithIntegrations)
402+
proj2, errP := project.Load(context.TODO(), api.mustDB(), p.Key, project.LoadOptions.WithPipelines, project.LoadOptions.WithGroups, project.LoadOptions.WithIntegrations)
403403
require.NoError(t, errP)
404404
require.NoError(t, workflow.Insert(context.TODO(), db, api.Cache, *proj2, &wf))
405405

‎engine/api/broadcast.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func (api *API) addBroadcastHandler() service.Handler {
2727
bc.Updated = now
2828

2929
if bc.ProjectKey != "" {
30-
proj, errProj := project.Load(api.mustDB(), bc.ProjectKey)
30+
proj, errProj := project.Load(ctx, api.mustDB(), bc.ProjectKey)
3131
if errProj != nil {
3232
return sdk.WrapError(sdk.ErrNoProject, "Cannot load %s", bc.ProjectKey)
3333
}
@@ -63,7 +63,7 @@ func (api *API) updateBroadcastHandler() service.Handler {
6363
}
6464

6565
if bc.ProjectKey != "" {
66-
proj, errProj := project.Load(api.mustDB(), bc.ProjectKey)
66+
proj, errProj := project.Load(ctx, api.mustDB(), bc.ProjectKey)
6767
if errProj != nil {
6868
return sdk.WrapError(sdk.ErrNoProject, "Cannot load %s", bc.ProjectKey)
6969
}

‎engine/api/environment.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func (api *API) getEnvironmentHandler() service.Handler {
8080
}
8181

8282
if env.FromRepository != "" {
83-
proj, err := project.Load(api.mustDB(), projectKey,
83+
proj, err := project.Load(ctx, api.mustDB(), projectKey,
8484
project.LoadOptions.WithApplicationWithDeploymentStrategies,
8585
project.LoadOptions.WithPipelines,
8686
project.LoadOptions.WithEnvironments,
@@ -141,7 +141,7 @@ func (api *API) addEnvironmentHandler() service.Handler {
141141
vars := mux.Vars(r)
142142
key := vars[permProjectKey]
143143

144-
proj, errProj := project.Load(api.mustDB(), key, project.LoadOptions.Default)
144+
proj, errProj := project.Load(ctx, api.mustDB(), key, project.LoadOptions.Default)
145145
if errProj != nil {
146146
return sdk.WrapError(errProj, "addEnvironmentHandler> Cannot load %s", key)
147147
}
@@ -186,7 +186,7 @@ func (api *API) deleteEnvironmentHandler() service.Handler {
186186
projectKey := vars[permProjectKey]
187187
environmentName := vars["environmentName"]
188188

189-
p, errProj := project.Load(api.mustDB(), projectKey, project.LoadOptions.Default)
189+
p, errProj := project.Load(ctx, api.mustDB(), projectKey, project.LoadOptions.Default)
190190
if errProj != nil {
191191
return sdk.WrapError(errProj, "deleteEnvironmentHandler> Cannot load project %s", projectKey)
192192
}
@@ -249,7 +249,7 @@ func (api *API) updateAsCodeEnvironmentHandler() service.Handler {
249249
return sdk.WrapError(sdk.ErrInvalidApplicationPattern, "Environment name %s do not respect pattern", env.Name)
250250
}
251251

252-
proj, err := project.Load(api.mustDB(), key, project.LoadOptions.WithClearKeys)
252+
proj, err := project.Load(ctx, api.mustDB(), key, project.LoadOptions.WithClearKeys)
253253
if err != nil {
254254
return err
255255
}
@@ -345,7 +345,7 @@ func (api *API) updateEnvironmentHandler() service.Handler {
345345
return sdk.WithStack(sdk.ErrForbidden)
346346
}
347347

348-
p, errProj := project.Load(api.mustDB(), projectKey)
348+
p, errProj := project.Load(ctx, api.mustDB(), projectKey)
349349
if errProj != nil {
350350
return sdk.WrapError(errProj, "updateEnvironmentHandler> Cannot load project %s", projectKey)
351351
}
@@ -396,7 +396,7 @@ func (api *API) cloneEnvironmentHandler() service.Handler {
396396
return sdk.WrapError(err, "cannot load environment %s", environmentName)
397397
}
398398

399-
p, err := project.Load(api.mustDB(), projectKey)
399+
p, err := project.Load(ctx, api.mustDB(), projectKey)
400400
if err != nil {
401401
return sdk.WrapError(err, "cannot load project %s", projectKey)
402402
}

‎engine/api/environment_import.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func (api *API) postEnvironmentImportHandler() service.Handler {
2727
key := vars[permProjectKey]
2828
force := FormBool(r, "force")
2929

30-
proj, err := project.Load(api.mustDB(), key, project.LoadOptions.WithGroups)
30+
proj, err := project.Load(ctx, api.mustDB(), key, project.LoadOptions.WithGroups)
3131
if err != nil {
3232
return sdk.WrapError(err, "unable load project")
3333
}
@@ -82,7 +82,7 @@ func (api *API) importNewEnvironmentHandler() service.Handler {
8282
vars := mux.Vars(r)
8383
key := vars[permProjectKey]
8484

85-
proj, err := project.Load(api.mustDB(), key, project.LoadOptions.Default,
85+
proj, err := project.Load(ctx, api.mustDB(), key, project.LoadOptions.Default,
8686
project.LoadOptions.WithGroups, project.LoadOptions.WithPermission)
8787
if err != nil {
8888
return sdk.WrapError(err, "cannot load %s", key)

0 commit comments

Comments
 (0)