Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-10-27 11:02:16 +01:00
Code Issues Projects Releases Wiki Activity

chore:origin middleware flag cleanup (#8402)

Browse Source
This commit is contained in:
David Leek 2024-10-10 14:26:35 +02:00 committed by GitHub
parent f0dc7fa0ae
commit 24b9e4987b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/metrics.ts
View File

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

2
src/lib/middleware/origin-middleware.test.ts
View File

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

19
src/lib/middleware/origin-middleware.ts
View File

@ -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';
logger.info('API request', {
method: req.method,
userAgent: req.headers['user-agent'],
origin: getFilteredOrigin(req),
});
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,

10
src/lib/types/experimental.ts
View File

@ -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,

2
src/server-dev.ts
View File

@ -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,
},