From 325cd34c0c84c2ff5fde2d0cf8aa1735db9b95b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivar=20Conradi=20=C3=98sthus?= <ivarconr@gmail.com>
Date: Wed, 9 Nov 2022 22:45:07 +0100
Subject: [PATCH] fix: remove 'fixHourMetrics' flag

---
 .../__snapshots__/create-config.test.ts.snap  |  2 -
 .../client-metrics/metrics-service-v2.ts      | 67 +++++++++----------
 src/lib/types/experimental.ts                 |  4 --
 src/server-dev.ts                             |  1 -
 src/test/config/test-config.ts                |  1 -
 5 files changed, 30 insertions(+), 45 deletions(-)

diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap
index af39a6df66..7d16e8f53e 100644
--- a/src/lib/__snapshots__/create-config.test.ts.snap
+++ b/src/lib/__snapshots__/create-config.test.ts.snap
@@ -73,7 +73,6 @@ exports[`should create default config 1`] = `
       "cloneEnvironment": false,
       "embedProxy": false,
       "embedProxyFrontend": false,
-      "fixHourMetrics": false,
       "publicSignup": false,
       "responseTimeWithAppName": false,
       "syncSSOGroups": false,
@@ -88,7 +87,6 @@ exports[`should create default config 1`] = `
       "cloneEnvironment": false,
       "embedProxy": false,
       "embedProxyFrontend": false,
-      "fixHourMetrics": false,
       "publicSignup": false,
       "responseTimeWithAppName": false,
       "syncSSOGroups": false,
diff --git a/src/lib/services/client-metrics/metrics-service-v2.ts b/src/lib/services/client-metrics/metrics-service-v2.ts
index 2e52f31640..c315f7da80 100644
--- a/src/lib/services/client-metrics/metrics-service-v2.ts
+++ b/src/lib/services/client-metrics/metrics-service-v2.ts
@@ -167,47 +167,40 @@ export default class ClientMetricsServiceV2 {
                 hoursBack,
             );
 
-        if (this.flagResolver.isEnabled('fixHourMetrics')) {
-            const hours = generateHourBuckets(hoursBack);
+        const hours = generateHourBuckets(hoursBack);
 
-            const environments = [
-                ...new Set(metrics.map((x) => x.environment)),
-            ];
+        const environments = [...new Set(metrics.map((x) => x.environment))];
 
-            const applications = [
-                ...new Set(metrics.map((x) => x.appName)),
-            ].slice(0, 100);
+        const applications = [...new Set(metrics.map((x) => x.appName))].slice(
+            0,
+            100,
+        );
 
-            const result = environments.flatMap((environment) =>
-                applications.flatMap((appName) =>
-                    hours.flatMap((hourBucket) => {
-                        const metric = metrics.find(
-                            (item) =>
-                                compareAsc(
-                                    hourBucket.timestamp,
-                                    item.timestamp,
-                                ) === 0 &&
-                                item.appName === appName &&
-                                item.environment === environment,
-                        );
-                        return (
-                            metric || {
-                                timestamp: hourBucket.timestamp,
-                                no: 0,
-                                yes: 0,
-                                appName,
-                                environment,
-                                featureName,
-                            }
-                        );
-                    }),
-                ),
-            );
+        const result = environments.flatMap((environment) =>
+            applications.flatMap((appName) =>
+                hours.flatMap((hourBucket) => {
+                    const metric = metrics.find(
+                        (item) =>
+                            compareAsc(hourBucket.timestamp, item.timestamp) ===
+                                0 &&
+                            item.appName === appName &&
+                            item.environment === environment,
+                    );
+                    return (
+                        metric || {
+                            timestamp: hourBucket.timestamp,
+                            no: 0,
+                            yes: 0,
+                            appName,
+                            environment,
+                            featureName,
+                        }
+                    );
+                }),
+            ),
+        );
 
-            return result.sort((a, b) => compareAsc(a.timestamp, b.timestamp));
-        } else {
-            return metrics;
-        }
+        return result.sort((a, b) => compareAsc(a.timestamp, b.timestamp));
     }
 
     resolveMetricsEnvironment(user: User | ApiUser, data: IClientApp): string {
diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts
index e2975af151..a2c26b0ea7 100644
--- a/src/lib/types/experimental.ts
+++ b/src/lib/types/experimental.ts
@@ -38,10 +38,6 @@ export const defaultExperimentalOptions = {
             process.env.UNLEASH_EXPERIMENTAL_CLONE_ENVIRONMENT,
             false,
         ),
-        fixHourMetrics: parseEnvVarBoolean(
-            process.env.UNLEASH_EXPERIMENTAL_FIX_HOUR_METRICS,
-            false,
-        ),
     },
     externalResolver: { isEnabled: (): boolean => false },
 };
diff --git a/src/server-dev.ts b/src/server-dev.ts
index 7be97a81de..d94bd6b73b 100644
--- a/src/server-dev.ts
+++ b/src/server-dev.ts
@@ -41,7 +41,6 @@ process.nextTick(async () => {
                         syncSSOGroups: true,
                         changeRequests: true,
                         cloneEnvironment: true,
-                        fixHourMetrics: true,
                     },
                 },
                 authentication: {
diff --git a/src/test/config/test-config.ts b/src/test/config/test-config.ts
index 5c792a31d8..79029869e3 100644
--- a/src/test/config/test-config.ts
+++ b/src/test/config/test-config.ts
@@ -30,7 +30,6 @@ export function createTestConfig(config?: IUnleashOptions): IUnleashConfig {
                 syncSSOGroups: true,
                 changeRequests: true,
                 cloneEnvironment: true,
-                fixHourMetrics: true,
             },
         },
     };