From 28690315fd92e5225b5b371ac19164c08a8eb876 Mon Sep 17 00:00:00 2001 From: kwasniew Date: Wed, 18 Jun 2025 14:11:32 +0200 Subject: [PATCH] chore: remove registerFrontendClient flag --- .../application/ApplicationChart.tsx | 23 ++----------------- frontend/src/interfaces/uiConfig.ts | 1 - .../frontend-api/frontend-api-service.ts | 6 +---- .../features/metrics/instance/metrics.test.ts | 4 +--- src/lib/features/metrics/instance/metrics.ts | 22 +++++++----------- src/lib/types/experimental.ts | 5 ---- src/server-dev.ts | 1 - .../e2e/api/admin/applications.e2e.test.ts | 1 - 8 files changed, 12 insertions(+), 51 deletions(-) diff --git a/frontend/src/component/application/ApplicationChart.tsx b/frontend/src/component/application/ApplicationChart.tsx index 3e2ee9323c..e66aba2046 100644 --- a/frontend/src/component/application/ApplicationChart.tsx +++ b/frontend/src/component/application/ApplicationChart.tsx @@ -16,7 +16,6 @@ import WarningAmberRounded from '@mui/icons-material/WarningAmberRounded'; import { TimeAgo } from 'component/common/TimeAgo/TimeAgo'; import { usePlausibleTracker } from 'hooks/usePlausibleTracker'; import { getApplicationIssues } from './ApplicationIssues/ApplicationIssues.tsx'; -import { useUiFlag } from 'hooks/useUiFlag'; const StyledTable = styled('table')(({ theme }) => ({ fontSize: theme.fontSizes.smallerBody, @@ -197,7 +196,6 @@ export const ApplicationChart = ({ data }: IApplicationChartProps) => { const { elementRef, width } = useElementWidth(); const navigate = useNavigate(); const theme = useTheme(); - const registerFrontendClientEnabled = useUiFlag('registerFrontendClient'); const mode = getApplicationIssues(data); @@ -296,23 +294,7 @@ export const ApplicationChart = ({ data }: IApplicationChartProps) => { {environment.instanceCount} - {!registerFrontendClientEnabled ? ( - - SDK: - - {environment.sdks.map( - (sdk) => ( -
- {sdk} -
- ), - )} - - - ) : null} - - {registerFrontendClientEnabled && - environment.backendSdks.length > 0 ? ( + {environment.backendSdks.length > 0 ? ( Backend SDK: @@ -329,8 +311,7 @@ export const ApplicationChart = ({ data }: IApplicationChartProps) => { ) : null} - {registerFrontendClientEnabled && - environment.frontendSdks.length > 0 ? ( + {environment.frontendSdks.length > 0 ? ( Frontend SDK: diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index a96e647889..7017a35bf8 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -85,7 +85,6 @@ export type UiFlags = { showUserDeviceCount?: boolean; consumptionModel?: boolean; edgeObservability?: boolean; - registerFrontendClient?: boolean; customMetrics?: boolean; lifecycleMetrics?: boolean; createFlagDialogCache?: boolean; diff --git a/src/lib/features/frontend-api/frontend-api-service.ts b/src/lib/features/frontend-api/frontend-api-service.ts index cc17714ff6..2bb51f1d93 100644 --- a/src/lib/features/frontend-api/frontend-api-service.ts +++ b/src/lib/features/frontend-api/frontend-api-service.ts @@ -135,11 +135,7 @@ export class FrontendApiService { ip, ); - if ( - metrics.instanceId && - typeof sdkVersion === 'string' && - this.flagResolver.isEnabled('registerFrontendClient') - ) { + if (metrics.instanceId && typeof sdkVersion === 'string') { const client = { appName: metrics.appName, instanceId: metrics.instanceId, diff --git a/src/lib/features/metrics/instance/metrics.test.ts b/src/lib/features/metrics/instance/metrics.test.ts index 0f729d9cb8..3bab2d127f 100644 --- a/src/lib/features/metrics/instance/metrics.test.ts +++ b/src/lib/features/metrics/instance/metrics.test.ts @@ -47,9 +47,7 @@ let destroy: () => Promise; beforeAll(async () => { const setup = await getSetup({ experimental: { - flags: { - registerFrontendClient: true, - }, + flags: {}, }, }); request = setup.request; diff --git a/src/lib/features/metrics/instance/metrics.ts b/src/lib/features/metrics/instance/metrics.ts index 649bdd12e8..9330e5a8aa 100644 --- a/src/lib/features/metrics/instance/metrics.ts +++ b/src/lib/features/metrics/instance/metrics.ts @@ -226,20 +226,14 @@ export default class ClientMetricsController extends Controller { app.sdkType === 'frontend' && typeof app.sdkVersion === 'string' ) { - if ( - this.flagResolver.isEnabled( - 'registerFrontendClient', - ) - ) { - this.clientInstanceService.registerFrontendClient({ - appName: app.appName, - instanceId: app.instanceId, - environment: app.environment, - sdkType: app.sdkType, - sdkVersion: app.sdkVersion, - projects: app.projects, - }); - } + this.clientInstanceService.registerFrontendClient({ + appName: app.appName, + instanceId: app.instanceId, + environment: app.environment, + sdkType: app.sdkType, + sdkVersion: app.sdkVersion, + projects: app.projects, + }); } else { promises.push( this.clientInstanceService.registerBackendClient( diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index 41111f6c4a..86a4002305 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -55,7 +55,6 @@ export type IFlagKey = | 'uniqueSdkTracking' | 'consumptionModel' | 'edgeObservability' - | 'registerFrontendClient' | 'reportUnknownFlags' | 'lastSeenBulkQuery' | 'lifecycleMetrics' @@ -264,10 +263,6 @@ const flags: IFlags = { process.env.EXPERIMENTAL_EDGE_OBSERVABILITY, false, ), - registerFrontendClient: parseEnvVarBoolean( - process.env.UNLEASH_EXPERIMENTAL_REGISTER_FRONTEND_CLIENT, - false, - ), reportUnknownFlags: parseEnvVarBoolean( process.env.UNLEASH_EXPERIMENTAL_REPORT_UNKNOWN_FLAGS, false, diff --git a/src/server-dev.ts b/src/server-dev.ts index 2d12dba8e5..84b49a608b 100644 --- a/src/server-dev.ts +++ b/src/server-dev.ts @@ -51,7 +51,6 @@ process.nextTick(async () => { deltaApi: true, uniqueSdkTracking: true, strictSchemaValidation: true, - registerFrontendClient: true, reportUnknownFlags: true, customMetrics: true, lifecycleMetrics: true, diff --git a/src/test/e2e/api/admin/applications.e2e.test.ts b/src/test/e2e/api/admin/applications.e2e.test.ts index 78e34a38da..12a70452a2 100644 --- a/src/test/e2e/api/admin/applications.e2e.test.ts +++ b/src/test/e2e/api/admin/applications.e2e.test.ts @@ -55,7 +55,6 @@ beforeAll(async () => { experimental: { flags: { strictSchemaValidation: true, - registerFrontendClient: true, }, }, },