From 9d238757bae74ffa33757bcedfaec9d8b90b0749 Mon Sep 17 00:00:00 2001 From: Alberto Rojas Date: Wed, 24 May 2023 03:04:30 +0200 Subject: [PATCH] fixbug: Update commandName in RunAndEmitStats (#3437) --- .../events/instrumented_project_command_runner.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/server/events/instrumented_project_command_runner.go b/server/events/instrumented_project_command_runner.go index 3d44ed8767..1356cbbfb7 100644 --- a/server/events/instrumented_project_command_runner.go +++ b/server/events/instrumented_project_command_runner.go @@ -35,30 +35,31 @@ func NewInstrumentedProjectCommandRunner(scope tally.Scope, projectCommandRunner } func (p *InstrumentedProjectCommandRunner) Plan(ctx command.ProjectContext) command.ProjectResult { - return RunAndEmitStats("plan", ctx, p.projectCommandRunner.Plan, p.scope) + return RunAndEmitStats(ctx, p.projectCommandRunner.Plan, p.scope) } func (p *InstrumentedProjectCommandRunner) PolicyCheck(ctx command.ProjectContext) command.ProjectResult { - return RunAndEmitStats("policy check", ctx, p.projectCommandRunner.PolicyCheck, p.scope) + return RunAndEmitStats(ctx, p.projectCommandRunner.PolicyCheck, p.scope) } func (p *InstrumentedProjectCommandRunner) Apply(ctx command.ProjectContext) command.ProjectResult { - return RunAndEmitStats("apply", ctx, p.projectCommandRunner.Apply, p.scope) + return RunAndEmitStats(ctx, p.projectCommandRunner.Apply, p.scope) } func (p *InstrumentedProjectCommandRunner) ApprovePolicies(ctx command.ProjectContext) command.ProjectResult { - return RunAndEmitStats("approve policies", ctx, p.projectCommandRunner.ApprovePolicies, p.scope) + return RunAndEmitStats(ctx, p.projectCommandRunner.ApprovePolicies, p.scope) } func (p *InstrumentedProjectCommandRunner) Import(ctx command.ProjectContext) command.ProjectResult { - return RunAndEmitStats("import", ctx, p.projectCommandRunner.Import, p.scope) + return RunAndEmitStats(ctx, p.projectCommandRunner.Import, p.scope) } func (p *InstrumentedProjectCommandRunner) StateRm(ctx command.ProjectContext) command.ProjectResult { - return RunAndEmitStats("state rm", ctx, p.projectCommandRunner.StateRm, p.scope) + return RunAndEmitStats(ctx, p.projectCommandRunner.StateRm, p.scope) } -func RunAndEmitStats(commandName string, ctx command.ProjectContext, execute func(ctx command.ProjectContext) command.ProjectResult, scope tally.Scope) command.ProjectResult { +func RunAndEmitStats(ctx command.ProjectContext, execute func(ctx command.ProjectContext) command.ProjectResult, scope tally.Scope) command.ProjectResult { + commandName := ctx.CommandName.String() // ensures we are differentiating between project level command and overall command scope = ctx.SetProjectScopeTags(scope).SubScope(commandName) logger := ctx.Log