From 659f2aca5b4683c2b67904792de4e865249451b9 Mon Sep 17 00:00:00 2001
From: kwasniew <kwasniewski.mateusz@gmail.com>
Date: Tue, 20 Aug 2024 09:03:41 +0200
Subject: [PATCH 1/2] feat: project actions count metric

---
 .../DeleteProject/DeleteProjectDialogue.tsx   |  2 +-
 src/lib/metrics.ts                            | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/frontend/src/component/project/Project/DeleteProject/DeleteProjectDialogue.tsx b/frontend/src/component/project/Project/DeleteProject/DeleteProjectDialogue.tsx
index 6ab5dabcf95a..e60ab000b642 100644
--- a/frontend/src/component/project/Project/DeleteProject/DeleteProjectDialogue.tsx
+++ b/frontend/src/component/project/Project/DeleteProject/DeleteProjectDialogue.tsx
@@ -66,7 +66,7 @@ export const DeleteProjectDialogue = ({
                 <ul>
                     <li>project with all of its settings</li>
                     <li>all feature flags archived in it</li>
-                    <li>all API keys scoped to only to this project</li>
+                    <li>all API keys scoped only to this project</li>
                     <ConditionallyRender
                         condition={isEnterprise() && automatedActionsEnabled}
                         show={<li>all actions configured for it</li>}
diff --git a/src/lib/metrics.ts b/src/lib/metrics.ts
index d958d071ef18..babd5e85fb51 100644
--- a/src/lib/metrics.ts
+++ b/src/lib/metrics.ts
@@ -19,6 +19,10 @@ import {
     CLIENT_METRICS,
     CLIENT_REGISTER,
     PROJECT_ENVIRONMENT_REMOVED,
+    PROJECT_CREATED,
+    PROJECT_ARCHIVED,
+    PROJECT_REVIVED,
+    PROJECT_DELETED,
 } from './types/events';
 import type { IUnleashConfig } from './types/option';
 import type { ISettingStore, IUnleashStores } from './types/stores';
@@ -315,6 +319,12 @@ export default class MetricsMonitor {
             labelNames: ['stage'],
         });
 
+        const projectActionsCounter = createCounter({
+            name: 'project_actions_count',
+            help: 'Count project actions',
+            labelNames: ['project_id', 'action'],
+        });
+
         const projectEnvironmentsDisabled = createCounter({
             name: 'project_environments_disabled',
             help: 'How many "environment disabled" events we have received for each project',
@@ -845,6 +855,26 @@ export default class MetricsMonitor {
                 environmentType: 'n/a',
             });
         });
+        eventStore.on(PROJECT_CREATED, ({ project }: { project: string }) => {
+            projectActionsCounter
+                .labels({ project_id: project, action: PROJECT_CREATED })
+                .inc();
+        });
+        eventStore.on(PROJECT_ARCHIVED, ({ project }: { project: string }) => {
+            projectActionsCounter
+                .labels({ project_id: project, action: PROJECT_ARCHIVED })
+                .inc();
+        });
+        eventStore.on(PROJECT_REVIVED, ({ project }: { project: string }) => {
+            projectActionsCounter
+                .labels({ project_id: project, action: PROJECT_REVIVED })
+                .inc();
+        });
+        eventStore.on(PROJECT_DELETED, ({ project }: { project: string }) => {
+            projectActionsCounter
+                .labels({ project_id: project, action: PROJECT_DELETED })
+                .inc();
+        });
 
         const logger = config.getLogger('metrics.ts');
         eventBus.on(CLIENT_METRICS, (metrics: IClientMetricsEnv[]) => {

From ce03a14e6a9959cddbefc5e241b5e3fdbba37c44 Mon Sep 17 00:00:00 2001
From: kwasniew <kwasniewski.mateusz@gmail.com>
Date: Tue, 20 Aug 2024 09:34:45 +0200
Subject: [PATCH 2/2] feat: project actions count metric

---
 src/lib/metrics.ts | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/lib/metrics.ts b/src/lib/metrics.ts
index babd5e85fb51..61a515c7d17f 100644
--- a/src/lib/metrics.ts
+++ b/src/lib/metrics.ts
@@ -322,7 +322,7 @@ export default class MetricsMonitor {
         const projectActionsCounter = createCounter({
             name: 'project_actions_count',
             help: 'Count project actions',
-            labelNames: ['project_id', 'action'],
+            labelNames: ['action'],
         });
 
         const projectEnvironmentsDisabled = createCounter({
@@ -855,25 +855,17 @@ export default class MetricsMonitor {
                 environmentType: 'n/a',
             });
         });
-        eventStore.on(PROJECT_CREATED, ({ project }: { project: string }) => {
-            projectActionsCounter
-                .labels({ project_id: project, action: PROJECT_CREATED })
-                .inc();
-        });
-        eventStore.on(PROJECT_ARCHIVED, ({ project }: { project: string }) => {
-            projectActionsCounter
-                .labels({ project_id: project, action: PROJECT_ARCHIVED })
-                .inc();
-        });
-        eventStore.on(PROJECT_REVIVED, ({ project }: { project: string }) => {
-            projectActionsCounter
-                .labels({ project_id: project, action: PROJECT_REVIVED })
-                .inc();
-        });
-        eventStore.on(PROJECT_DELETED, ({ project }: { project: string }) => {
-            projectActionsCounter
-                .labels({ project_id: project, action: PROJECT_DELETED })
-                .inc();
+        eventStore.on(PROJECT_CREATED, () => {
+            projectActionsCounter.labels({ action: PROJECT_CREATED }).inc();
+        });
+        eventStore.on(PROJECT_ARCHIVED, () => {
+            projectActionsCounter.labels({ action: PROJECT_ARCHIVED }).inc();
+        });
+        eventStore.on(PROJECT_REVIVED, () => {
+            projectActionsCounter.labels({ action: PROJECT_REVIVED }).inc();
+        });
+        eventStore.on(PROJECT_DELETED, () => {
+            projectActionsCounter.labels({ action: PROJECT_DELETED }).inc();
         });
 
         const logger = config.getLogger('metrics.ts');