<!--IssueSummary start--> <details> <summary> Everyone can contribute. [Help move this issue forward](https://handbook.gitlab.com/handbook/marketing/developer-relations/engineering/community-contributors-workflows/#contributor-links) while earning points, leveling up and collecting rewards. </summary> - [Work on this issue](https://contributors.gitlab.com/manage-issue?action=work&projectId=278964&issueIid=637315) </details> <!--IssueSummary end--> ## Summary `Gitlab::SubscriptionPortal::SubscriptionUsageClient` carried three "remove after CustomersDot deploys X" compatibility fallbacks. GitLab (both GitLab.com and self-managed) talks to the one production CustomersDot, so once a CustomersDot change is deployed the fallback is dead code on every GitLab version. All three CustomersDot changes are in production: | Fallback in the client | CustomersDot MR | Status | |---|---|---| | `GET_CONSUMERS_WITHOUT_ENTITY_TYPE_QUERY` — retry `consumers` without `entityType` | https://gitlab.com/gitlab-org/customers-gitlab-com/-/merge_requests/15645 | merged 2026-05-19, deployed | | `GET_USERS_USAGE_WITHOUT_NON_BILLABLE_CREDITS_QUERY` / `NON_BILLABLE_CREDITS_USED_*` — retry `users`/`consumers` without `nonBillableCreditsUsed` | https://gitlab.com/gitlab-org/customers-gitlab-com/-/merge_requests/17683 | merged 2026-10-28; in the `deploy-production` job that succeeded 2026-10-30 00:10 UTC (`742fe57756`) | | `with_include_non_billable_fallback` / `INCLUDE_NON_BILLABLE_ARGUMENT` — retry `events`/`usedFlowTypes` without `includeNonBillable`, `billable`, `skipReason` | https://gitlab.com/gitlab-org/customers-gitlab-com/-/merge_requests/17693 | merged 2026-10-29; same deploy | While removing them it became clear that a lot more of the GitLab Credits chain only existed to feed the usage billing dashboard deleted in https://gitlab.com/gitlab-org/gitlab/-/commit/c79d0a39455a (2026-10-15). Parts 2 and 3 clean that up. ## Proposal ### 1. Remove the backend fallbacks Remove the three fallbacks, their constants, the `undefined_field_error?` / `undefined_argument_error?` helpers (no other callers), and the specs that exercised the retries. Each operation then runs its one query and reports errors against it. ### 2. Remove dead frontend surface - The per-user drill-down query (`usage_billing/users/show/graphql/get_user_subscription_usage.query.graphql`) selects `lastEventTransactionAt`, `subscriptionPortalUsageDashboardUrl`, `purchaseCreditsPath`, `paidTierTrial { isActive }` and six per-wallet `usage` columns that the page never renders. `paidTierTrial` costs a separate CustomersDot request per page load. - `fillUsageValues` defaults four wallet columns no caller reads. - `meta_app.vue` only wraps `FreeTierTrialApp`; `initUsageBillingDashboard` provides, and the Rails helpers emit, values nothing injects (`isSaas`, `isPaidBasePlan`, `userUsagePath` on the trial app). ### 3. Deprecate the GraphQL fields with no consumer, remove them in 20.0 `subscriptionUsage`, `trialUsage` and `currentUser.creditsUsage` are all `experiment` GraphQL fields, so unused fields could be removed outright. We follow the deprecation and breaking-change process instead: deprecate in 19.6 with one `data/deprecations/` announcement and remove on %"20.0". The formal deprecation issue (Deprecations template, affected customers, DRIs, removal plan) is https://gitlab.com/gitlab-org/gitlab/-/work_items/637330; this issue only tracks the deprecation MR as part 3. Fields deprecated in 19.6 (no consumer in `ee/app/assets`, `app/assets`, `qa/` or the Rails helpers): | Type | Fields | |---|---| | `GitlabSubscriptionUsage` | `monthlyWaiver`, `monthlyCommitment`, `overage`, `paidTierTrial`, `lastEventTransactionAt`, `purchaseCreditsPath`, `subscriptionPortalUsageDashboardUrl`, `overageTermsAccepted`, `canAcceptOverageTerms`, `dapPromoEnabled` | | `GitlabSubscriptionUsageUsersUsage` | `totalUsersUsingCredits`, `totalUsersUsingMonthlyCommitment`, `totalUsersUsingOverage`, `creditsUsed`, `dailyUsage` | | `GitlabSubscriptionUsageUserUsage` | `creditsUsed`, `totalCredits`, `monthlyCommitmentCreditsUsed`, `monthlyWaiverCreditsUsed`, `overageCreditsUsed`, `paidTierTrialCreditsUsed` (only `totalCreditsUsed` and `nonBillableCreditsUsed` are read) | | `GitlabSubscriptionUserCreditsUsage` | `usedFlowTypes` | The announcement entry also covers `GitlabSubscriptionUsageUserEvent.eventType`, deprecated earlier in 19.6 by https://gitlab.com/gitlab-org/gitlab/-/merge_requests/266591, so the 20.0 removal is announced once. Kept on purpose, as API capabilities rather than dashboard leftovers: `users(searchQuery:)`, `dailyUsage(sort:, limit:)`, `events(includeNonBillable:)` / `usedFlowTypes(includeNonBillable:)` (removing it would flip the default), and `GitlabSubscriptionUsageUserEvent.locationId`. The client queries, lib methods and types that only serve these fields (`GET_PAID_TIER_TRIAL_QUERY`, `GET_MONTHLY_WAIVER_QUERY`, `GET_OVERAGE_QUERY`, the wallet columns in `GET_USERS_USAGE_QUERY` / `GET_CONSUMERS_QUERY`, most of `GET_USERS_USAGE_STATS_QUERY` and `GET_METADATA_QUERY`, the `MonthlyWaiver` / `MonthlyCommitment` / `Overage` / `PaidTierTrial` structs and types) go with the 20.0 removal. `get_monthly_commitment` stays: `FetchMonthlyCommitmentService` uses it for the billing pages. ## Status | Part | MR | Status | |---|---|---| | 1. Backend fallbacks | https://gitlab.com/gitlab-org/gitlab/-/merge_requests/266561 | Merged 2026-11-03 | | 2. Frontend surface | https://gitlab.com/gitlab-org/gitlab/-/merge_requests/267846 | In review | | 3. GraphQL deprecations (19.6) | https://gitlab.com/gitlab-org/gitlab/-/merge_requests/267872 | In review | | 3. GraphQL removal (20.0) | https://gitlab.com/gitlab-org/gitlab/-/work_items/637330 (removal plan) | Scheduled for %"20.0" | Close this issue once parts 2 and 3 have merged. Neither MR closes it automatically, so that whichever merges first does not close it early.