chore:origin middleware flag cleanup (#8402)

src/lib/metrics.ts

@@ -781,9 +781,7 @@ export default class MetricsMonitor {
             eventBus,
             events.REQUEST_ORIGIN,
             ({ type, method, source }) => {
-                if (flagResolver.isEnabled('originMiddleware')) {
                 requestOriginCounter.increment({ type, method, source });
-                }
             },
         );
 

src/lib/middleware/origin-middleware.test.ts

@@ -31,7 +31,7 @@ describe('originMiddleware', () => {
                 getLogger,
                 experimental: {
                     flags: {
-                        originMiddleware: true,
+                        originMiddlewareRequestLogging: true,
                     },
                 },
             }),

src/lib/middleware/origin-middleware.ts

@@ -13,12 +13,7 @@ export const originMiddleware = ({
 }: Pick<IUnleashConfig, 'getLogger' | 'eventBus' | 'flagResolver'>) => {
     const logger = getLogger('/middleware/origin-middleware.ts');
     logger.debug('Enabling origin middleware');
-
     return (req: Request, _: Response, next: NextFunction) => {
-        if (!flagResolver.isEnabled('originMiddleware')) {
-            return next();
-        }
-
         const isUI = !req.headers.authorization;
 
         if (isUI) {
@@ -31,11 +26,15 @@ export const originMiddleware = ({
             const uaLabel = userAgent
                 ? determineIntegrationSource(userAgent)
                 : 'Other';
+
+            if (flagResolver.isEnabled('originMiddlewareRequestLogging')) {
                 logger.info('API request', {
                     method: req.method,
                     userAgent: req.headers['user-agent'],
                     origin: getFilteredOrigin(req),
                 });
+            }
+
             emitMetricEvent(eventBus, REQUEST_ORIGIN, {
                 type: 'API',
                 method: req.method,

src/lib/types/experimental.ts

@@ -53,7 +53,6 @@ export type IFlagKey =
     | 'navigationSidebar'
     | 'extendedMetrics'
     | 'removeUnsafeInlineStyleSrc'
-    | 'originMiddleware'
     | 'addonUsageMetrics'
     | 'onboardingMetrics'
     | 'onboardingUI'
@@ -62,6 +61,7 @@ export type IFlagKey =
     | 'personalDashboardUI'
     | 'trackLifecycleMetrics'
     | 'purchaseAdditionalEnvironments'
+    | 'originMiddlewareRequestLogging'
     | 'unleashAI'
     | 'webhookDomainLogging';
 
@@ -268,10 +268,6 @@ const flags: IFlags = {
         process.env.UNLEASH_EXPERIMENTAL_REMOVE_UNSAFE_INLINE_STYLE_SRC,
         false,
     ),
-    originMiddleware: parseEnvVarBoolean(
-        process.env.UNLEASH_EXPERIMENTAL_ORIGIN_MIDDLEWARE,
-        false,
-    ),
     addonUsageMetrics: parseEnvVarBoolean(
         process.env.UNLEASH_EXPERIMENTAL_ADDON_USAGE_METRICS,
         false,
@@ -304,6 +300,10 @@ const flags: IFlags = {
         process.env.UNLEASH_EXPERIMENTAL_PURCHASE_ADDITIONAL_ENVIRONMENTS,
         false,
     ),
+    originMiddlewareRequestLogging: parseEnvVarBoolean(
+        process.env.UNLEASH_ORIGIN_MIDDLEWARE_REQUEST_LOGGING,
+        false,
+    ),
     unleashAI: parseEnvVarBoolean(
         process.env.UNLEASH_EXPERIMENTAL_UNLEASH_AI,
         false,

src/server-dev.ts

@@ -50,12 +50,12 @@ process.nextTick(async () => {
                         manyStrategiesPagination: true,
                         enableLegacyVariants: false,
                         extendedMetrics: true,
-                        originMiddleware: true,
                         addonUsageMetrics: true,
                         onboardingMetrics: true,
                         onboardingUI: true,
                         personalDashboardUI: true,
                         purchaseAdditionalEnvironments: true,
+                        originMiddlewareRequestLogging: true,
                         unleashAI: true,
                         webhookDomainLogging: true,
                     },