From 8685cabe224bbb2779b2da8b6f7645f18fa80378 Mon Sep 17 00:00:00 2001 From: pmckl Date: Tue, 8 Apr 2025 15:14:48 +0200 Subject: [PATCH 1/2] feat: Added labels to scaffolder histogram metrics Signed-off-by: pmckl --- .changeset/legal-loops-push.md | 5 +++++ .../src/scaffolder/tasks/NunjucksWorkflowRunner.ts | 11 +++++++++++ 2 files changed, 16 insertions(+) create mode 100644 .changeset/legal-loops-push.md diff --git a/.changeset/legal-loops-push.md b/.changeset/legal-loops-push.md new file mode 100644 index 0000000000..956b91f364 --- /dev/null +++ b/.changeset/legal-loops-push.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder-backend': patch +--- + +Added `template` and `step` labels for scaffolder historgam metrics: scaffolder_task_duration and scaffolder_step_duration diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts index c352714d9d..80e9517fd6 100644 --- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts +++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts @@ -634,6 +634,7 @@ function scaffoldingTracker() { taskCount.add(1, { template, user, result: 'ok' }); taskDuration.record(endTime(), { + template, result: 'ok', }); } @@ -652,6 +653,7 @@ function scaffoldingTracker() { taskCount.add(1, { template, user, result: 'failed' }); taskDuration.record(endTime(), { + template, result: 'failed', }); } @@ -670,6 +672,7 @@ function scaffoldingTracker() { taskCount.add(1, { template, user, result: 'cancelled' }); taskDuration.record(endTime(), { + template, result: 'cancelled', }); } @@ -714,6 +717,8 @@ function scaffoldingTracker() { stepCount.add(1, { template, step: step.name, result: 'ok' }); stepDuration.record(endTime(), { + template, + step: step.name, result: 'ok', }); } @@ -728,6 +733,8 @@ function scaffoldingTracker() { stepCount.add(1, { template, step: step.name, result: 'cancelled' }); stepDuration.record(endTime(), { + template, + step: step.name, result: 'cancelled', }); } @@ -742,6 +749,8 @@ function scaffoldingTracker() { stepCount.add(1, { template, step: step.name, result: 'failed' }); stepDuration.record(endTime(), { + template, + step: step.name, result: 'failed', }); } @@ -755,6 +764,8 @@ function scaffoldingTracker() { stepCount.add(1, { template, step: step.name, result: 'skipped' }); stepDuration.record(endTime(), { + template, + step: step.name, result: 'skipped', }); } From c48322734ddf5ac47734229e2ed2a49b3a747263 Mon Sep 17 00:00:00 2001 From: pmckl Date: Tue, 8 Apr 2025 16:00:55 +0200 Subject: [PATCH 2/2] fix: typo Signed-off-by: pmckl --- .changeset/legal-loops-push.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/legal-loops-push.md b/.changeset/legal-loops-push.md index 956b91f364..b21e1c146c 100644 --- a/.changeset/legal-loops-push.md +++ b/.changeset/legal-loops-push.md @@ -2,4 +2,4 @@ '@backstage/plugin-scaffolder-backend': patch --- -Added `template` and `step` labels for scaffolder historgam metrics: scaffolder_task_duration and scaffolder_step_duration +Added `template` and `step` labels for scaffolder histogram metrics: `scaffolder_task_duration` and `scaffolder_step_duration`