[usage] wiring ListUsage through server

Author: svenefftinge

components/gitpod-protocol/src/gitpod-service.ts

@@ -60,7 +60,7 @@ import {
 import { RemotePageMessage, RemoteTrackMessage, RemoteIdentifyMessage } from "./analytics";
 import { IDEServer } from "./ide-protocol";
 import { InstallationAdminSettings, TelemetryData } from "./installation-admin-protocol";
-import { ListBilledUsageResponse, ListBilledUsageRequest } from "./usage";
+import { ListBilledUsageResponse, ListBilledUsageRequest, ListUsageRequest, ListUsageResponse } from "./usage";
 import { SupportedWorkspaceClass } from "./workspace-class";
 import { BillingMode } from "./billing-mode";
 
@@ -298,6 +298,7 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
     setSpendingLimitForTeam(teamId: string, spendingLimit: number): Promise<void>;
 
     listBilledUsage(req: ListBilledUsageRequest): Promise<ListBilledUsageResponse>;
+    listUsage(req: ListUsageRequest): Promise<ListUsageResponse>;
 
     setUsageAttribution(usageAttribution: string): Promise<void>;
 

components/gitpod-protocol/src/usage.ts

@@ -61,3 +61,68 @@ export interface ListBilledUsageResponse {
 }
 
 export type BillableWorkspaceType = WorkspaceType;
+
+// types below are copied over from components/usage-api/typescript/src/usage/v1/usage_pb.d.ts
+
+export interface ListUsageRequest {
+    attributionId: string;
+    from?: number;
+    to?: number;
+    order: Ordering;
+    pagination?: PaginationRequest;
+}
+
+export enum Ordering {
+    ORDERING_DESCENDING = 0,
+    ORDERING_ASCENDING = 1,
+}
+
+export interface PaginationRequest {
+    perPage: number;
+    page: number;
+}
+
+export interface ListUsageResponse {
+    usageEntriesList: Usage[];
+    pagination?: PaginationResponse;
+    creditBalanceAtStart: number;
+    creditBalanceAtEnd: number;
+}
+
+export interface PaginationResponse {
+    perPage: number;
+    totalPages: number;
+    total: number;
+    page: number;
+}
+
+export type UsageKind = "workspaceinstance" | "invoice";
+export interface Usage {
+    id: string;
+    attributionId: string;
+    description: string;
+    credits: number;
+    effectiveTime?: number;
+    kind: UsageKind;
+    workspaceInstanceId: string;
+    draft: boolean;
+    metadata: WorkspaceInstanceUsageData | InvoiceUsageData;
+}
+
+// the equivalent golang shape is maintained in `/workspace/gitpod/`components/usage/pkg/db/usage.go`
+export interface WorkspaceInstanceUsageData {
+    workspaceid: string;
+    workspaceType: WorkspaceType;
+    workspaceClass: string;
+    contextURL: string;
+    startTime: string;
+    endTime?: string;
+    userName: string;
+    userAvatarURL: string;
+}
+
+export interface InvoiceUsageData {
+    invoiceId: string;
+    startDate: string;
+    endDate: string;
+}

components/server/ee/src/workspace/gitpod-server-impl.ts

@@ -71,8 +71,13 @@ import { BlockedRepository } from "@gitpod/gitpod-protocol/lib/blocked-repositor
 import { EligibilityService } from "../user/eligibility-service";
 import { AccountStatementProvider } from "../user/account-statement-provider";
 import { GithubUpgradeURL, PlanCoupon } from "@gitpod/gitpod-protocol/lib/payment-protocol";
-import { ListBilledUsageRequest, ListBilledUsageResponse } from "@gitpod/gitpod-protocol/lib/usage";
-import { ListBilledUsageRequest as ListBilledUsage } from "@gitpod/usage-api/lib/usage/v1/usage_pb";
+import {
+    ListBilledUsageRequest,
+    ListBilledUsageResponse,
+    ListUsageRequest,
+    ListUsageResponse,
+} from "@gitpod/gitpod-protocol/lib/usage";
+import * as usage_grpc from "@gitpod/usage-api/lib/usage/v1/usage_pb";
 import {
     AssigneeIdentityIdentifier,
     TeamSubscription,
@@ -114,6 +119,7 @@ import { BillingMode } from "@gitpod/gitpod-protocol/lib/billing-mode";
 import { BillingModes } from "../billing/billing-mode";
 import { getExperimentsClientForBackend } from "@gitpod/gitpod-protocol/lib/experiments/configcat-server";
 import { BillingService } from "../billing/billing-service";
+import { restEndpointMethods } from "@octokit/plugin-rest-endpoint-methods";
 
 @injectable()
 export class GitpodServerEEImpl extends GitpodServerImpl {
@@ -2182,6 +2188,60 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
         return result;
     }
 
+    async listUsage(ctx: TraceContext, req: ListUsageRequest): Promise<ListUsageResponse> {
+        const { attributionId, from, to } = req;
+        traceAPIParams(ctx, { attributionId });
+        const user = this.checkAndBlockUser("listBilledUsage");
+
+        await this.guardCostCenterAccess(ctx, user.id, attributionId, "get");
+
+        const timestampFrom = from ? Timestamp.fromDate(new Date(from)) : undefined;
+        const timestampTo = to ? Timestamp.fromDate(new Date(to)) : undefined;
+
+        const usageClient = this.usageServiceClientProvider.getDefault();
+        const request = new usage_grpc.ListBilledUsageRequest();
+        request.setAttributionId(attributionId);
+        request.setFrom(timestampFrom);
+        if (to) {
+            request.setTo(timestampTo);
+        }
+        request.setOrder(req.order);
+        if (req.pagination) {
+            const paginatedRequest = new usage_grpc.PaginatedRequest();
+            paginatedRequest.setPage(req.pagination.page);
+            paginatedRequest.setPerPage(req.pagination.perPage);
+            request.setPagination(paginatedRequest);
+        }
+        const response = await usageClient.listUsage(ctx, request);
+        const pagination = response.getPagination();
+        return {
+            usageEntriesList: response.getUsageEntriesList().map((u) => {
+                return {
+                    id: u.getId(),
+                    attributionId: u.getAttributionId(),
+                    effectiveTime: u.getEffectiveTime()!.toDate().getTime(),
+                    credits: u.getCredits(),
+                    description: u.getDescription(),
+                    draft: u.getDraft(),
+                    workspaceInstanceId: u.getWorkspaceInstanceId(),
+                    kind:
+                        u.getKind() === usage_grpc.Usage.Kind.KIND_WORKSPACE_INSTANCE ? "workspaceinstance" : "invoice",
+                    metadata: JSON.parse(u.getMetadata()),
+                };
+            }),
+            pagination: pagination
+                ? {
+                      page: pagination.getPage(),
+                      perPage: pagination.getPerPage(),
+                      total: pagination.getTotal(),
+                      totalPages: pagination.getTotalPages(),
+                  }
+                : undefined,
+            creditBalanceAtEnd: response.getCreditBalanceAtEnd(),
+            creditBalanceAtStart: response.getCreditBalanceAtStart(),
+        };
+    }
+
     async listBilledUsage(ctx: TraceContext, req: ListBilledUsageRequest): Promise<ListBilledUsageResponse> {
         const { attributionId, fromDate, toDate, perPage, page } = req;
         traceAPIParams(ctx, { attributionId });
@@ -2201,7 +2261,7 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
         const response = await usageClient.listBilledUsage(
             ctx,
             attributionId,
-            ListBilledUsage.Ordering.ORDERING_DESCENDING,
+            usage_grpc.ListBilledUsageRequest.Ordering.ORDERING_DESCENDING,
             perPage,
             page,
             timestampFrom,

components/server/src/workspace/gitpod-server-impl.ts

@@ -172,7 +172,12 @@ import { InstallationAdminTelemetryDataProvider } from "../installation-admin/te
 import { LicenseEvaluator } from "@gitpod/licensor/lib";
 import { Feature } from "@gitpod/licensor/lib/api";
 import { getExperimentsClientForBackend } from "@gitpod/gitpod-protocol/lib/experiments/configcat-server";
-import { ListBilledUsageRequest, ListBilledUsageResponse } from "@gitpod/gitpod-protocol/lib/usage";
+import {
+    ListBilledUsageRequest,
+    ListBilledUsageResponse,
+    ListUsageRequest,
+    ListUsageResponse,
+} from "@gitpod/gitpod-protocol/lib/usage";
 import { WorkspaceClusterImagebuilderClientProvider } from "./workspace-cluster-imagebuilder-client-provider";
 import { VerificationService } from "../auth/verification-service";
 import { BillingMode } from "@gitpod/gitpod-protocol/lib/billing-mode";
@@ -3232,6 +3237,10 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
         throw new ResponseError(ErrorCodes.SAAS_FEATURE, `Not implemented in this version`);
     }
 
+    async listUsage(ctx: TraceContext, req: ListUsageRequest): Promise<ListUsageResponse> {
+        throw new ResponseError(ErrorCodes.SAAS_FEATURE, `Not implemented in this version`);
+    }
+
     async getSpendingLimitForTeam(ctx: TraceContext, teamId: string): Promise<number | undefined> {
         throw new ResponseError(ErrorCodes.SAAS_FEATURE, `Not implemented in this version`);
     }

components/usage/pkg/db/usage.go

@@ -35,6 +35,19 @@ type Usage struct {
 	Metadata            datatypes.JSON `gorm:"column:metadata;type:text;size:65535" json:"metadata"`
 }
 
+// WorkspaceInstanceUsageData represents the shape for usage entry of kind "workspaceinstance"
+// the equivalent TypeScript definition is maintained in `components/gitpod-protocol/src/usage.ts“
+type WorkspaceInstanceUsageData struct {
+	WorkspaceId    string
+	WorkspaceType  WorkspaceType
+	WorkspaceClass string
+	ContextURL     string
+	StartTime      string
+	EndTime        string
+	UserName       string
+	UserAvatarURL  string
+}
+
 type FindUsageResult struct {
 	UsageEntries []Usage
 }