Cleaning up stale flag: addonUsageMetrics and event emitting from addons

src/lib/addons/datadog.ts

@@ -116,12 +116,10 @@ export default class DatadogAddon extends Addon {
             this.logger.warn(failedMessage);
         }
 
-        if (this.flagResolver.isEnabled('addonUsageMetrics')) {
-            this.eventBus.emit(ADDON_EVENTS_HANDLED, {
-                result: state,
-                destination: 'datadog',
-            });
-        }
+        this.eventBus.emit(ADDON_EVENTS_HANDLED, {
+            result: state,
+            destination: 'datadog',
+        });
 
         this.registerEvent({
             integrationId,

src/lib/addons/new-relic.ts

@@ -120,12 +120,10 @@ export default class NewRelicAddon extends Addon {
             this.logger.warn(failedMessage);
         }
 
-        if (this.flagResolver.isEnabled('addonUsageMetrics')) {
-            this.eventBus.emit(ADDON_EVENTS_HANDLED, {
-                result: state,
-                destination: 'new-relic',
-            });
-        }
+        this.eventBus.emit(ADDON_EVENTS_HANDLED, {
+            result: state,
+            destination: 'new-relic',
+        });
 
         this.registerEvent({
             integrationId,

src/lib/addons/slack-app.ts

@@ -182,12 +182,10 @@ export default class SlackAppAddon extends Addon {
             stateDetails.push(errorMessage);
             this.logger.warn(errorMessage, error);
         } finally {
-            if (this.flagResolver.isEnabled('addonUsageMetrics')) {
-                this.eventBus.emit(ADDON_EVENTS_HANDLED, {
-                    result: state,
-                    destination: 'slack-app',
-                });
-            }
+            this.eventBus.emit(ADDON_EVENTS_HANDLED, {
+                result: state,
+                destination: 'slack-app',
+            });
 
             this.registerEvent({
                 integrationId,

src/lib/addons/slack.ts

@@ -134,12 +134,10 @@ export default class SlackAddon extends Addon {
             this.logger.warn(successWithErrorsMessage);
         }
 
-        if (this.flagResolver.isEnabled('addonUsageMetrics')) {
-            this.eventBus.emit(ADDON_EVENTS_HANDLED, {
-                result: state,
-                destination: 'slack',
-            });
-        }
+        this.eventBus.emit(ADDON_EVENTS_HANDLED, {
+            result: state,
+            destination: 'slack',
+        });
 
         this.registerEvent({
             integrationId,

src/lib/addons/teams.ts

@@ -110,12 +110,10 @@ export default class TeamsAddon extends Addon {
             this.logger.warn(failedMessage);
         }
 
-        if (this.flagResolver.isEnabled('addonUsageMetrics')) {
-            this.eventBus.emit(ADDON_EVENTS_HANDLED, {
-                result: state,
-                destination: 'teams',
-            });
-        }
+        this.eventBus.emit(ADDON_EVENTS_HANDLED, {
+            result: state,
+            destination: 'teams',
+        });
 
         this.registerEvent({
             integrationId,

src/lib/addons/webhook.ts

@@ -104,12 +104,10 @@ export default class Webhook extends Addon {
             this.logger.warn(failedMessage);
         }
 
-        if (this.flagResolver.isEnabled('addonUsageMetrics')) {
-            this.eventBus.emit(ADDON_EVENTS_HANDLED, {
-                result: state,
-                destination: 'webhook',
-            });
-        }
+        this.eventBus.emit(ADDON_EVENTS_HANDLED, {
+            result: state,
+            destination: 'webhook',
+        });
 
         const domain = new URL(url).hostname;
         this.logger.info(`Webhook invoked`, {

src/lib/types/experimental.ts

@@ -54,7 +54,6 @@ export type IFlagKey =
     | 'extendedMetrics'
     | 'removeUnsafeInlineStyleSrc'
     | 'originMiddleware'
-    | 'addonUsageMetrics'
     | 'onboardingMetrics'
     | 'onboardingUI'
     | 'projectRoleAssignment'
@@ -270,10 +269,6 @@ const flags: IFlags = {
         process.env.UNLEASH_EXPERIMENTAL_ORIGIN_MIDDLEWARE,
         false,
     ),
-    addonUsageMetrics: parseEnvVarBoolean(
-        process.env.UNLEASH_EXPERIMENTAL_ADDON_USAGE_METRICS,
-        false,
-    ),
     onboardingMetrics: parseEnvVarBoolean(
         process.env.UNLEASH_EXPERIMENTAL_ONBOARDING_METRICS,
         false,

src/server-dev.ts

@@ -51,7 +51,6 @@ process.nextTick(async () => {
                         enableLegacyVariants: false,
                         extendedMetrics: true,
                         originMiddleware: true,
-                        addonUsageMetrics: true,
                         onboardingMetrics: true,
                         onboardingUI: true,
                         personalDashboardUI: true,