[server] Remove gitpod_server_api_calls_user_total metric

Author: easyCZ

components/server/src/code-sync/code-sync-service.ts

@@ -31,7 +31,6 @@ import {
 import { log } from "@gitpod/gitpod-protocol/lib/util/logging";
 import { v4 as uuidv4 } from "uuid";
 import { accessCodeSyncStorage, UserRateLimiter } from "../auth/rate-limiter";
-import { increaseApiCallUserCounter } from "../prometheus-metrics";
 import { Config } from "../config";
 import { CachingBlobServiceClientProvider } from "@gitpod/content-service/lib/sugar";
 
@@ -106,7 +105,6 @@ export class CodeSyncService {
             }
 
             const id = req.user.id;
-            increaseApiCallUserCounter(accessCodeSyncStorage, id);
             try {
                 await UserRateLimiter.instance(this.config.rateLimiter).consume(id, accessCodeSyncStorage);
             } catch (e) {

components/server/src/prometheus-metrics.ts

@@ -12,7 +12,6 @@ export function registerServerMetrics(registry: prometheusClient.Registry) {
     registry.registerMetric(apiConnectionClosedCounter);
     registry.registerMetric(apiCallCounter);
     registry.registerMetric(apiCallDurationHistogram);
-    registry.registerMetric(apiCallUserCounter);
     registry.registerMetric(httpRequestTotal);
     registry.registerMetric(httpRequestDuration);
     registry.registerMetric(messagebusTopicReads);
@@ -75,16 +74,6 @@ export function observeAPICallsDuration(method: string, statusCode: number, dura
     apiCallDurationHistogram.observe({ method, statusCode }, duration);
 }
 
-const apiCallUserCounter = new prometheusClient.Counter({
-    name: "gitpod_server_api_calls_user_total",
-    help: "Total amount of API calls per user",
-    labelNames: ["method", "user"],
-});
-
-export function increaseApiCallUserCounter(method: string, user: string) {
-    apiCallUserCounter.inc({ method, user });
-}
-
 const httpRequestTotal = new prometheusClient.Counter({
     name: "gitpod_server_http_requests_total",
     help: "Total amount of HTTP requests per express route",

components/server/src/websocket/websocket-connection-manager.ts

@@ -40,7 +40,6 @@ import {
     increaseApiCallCounter,
     increaseApiConnectionClosedCounter,
     increaseApiConnectionCounter,
-    increaseApiCallUserCounter,
     observeAPICallsDuration,
     apiCallDurationHistogram,
 } from "../prometheus-metrics";
@@ -377,12 +376,6 @@ class GitpodJsonRpcProxyFactory<T extends object> extends JsonRpcProxyFactory<T>
     }
 
     protected async onRequest(method: string, ...args: any[]): Promise<any> {
-        if (!this.rateLimiter.user.startsWith("session-")) {
-            increaseApiCallUserCounter(method, this.rateLimiter.user);
-        } else {
-            increaseApiCallUserCounter(method, "anonymous");
-        }
-
         const span = TraceContext.startSpan(method, undefined);
         const ctx = { span };
         const userId = this.clientMetadata.userId;

operations/observability/mixins/meta/dashboards/components/meta-overview.json

@@ -430,7 +430,7 @@
             "uid": "P4169E866C3094E38"
           },
           "exemplar": true,
-          "expr": "sum(rate(gitpod_server_api_calls_user_total{cluster=~\"$cluster\", method=~\"ts.*\"}[5m])) by (cluster, method) * 60",
+          "expr": "sum(rate(gitpod_server_api_calls_total{cluster=~\"$cluster\", method=~\"ts.*\"}[5m])) by (cluster, method) * 60",
           "interval": "",
           "legendFormat": "{{cluster}} {{method}}",
           "refId": "A"

operations/observability/mixins/meta/dashboards/components/server.json

@@ -1134,7 +1134,7 @@
             "uid": "$datasource"
           },
           "exemplar": true,
-          "expr": "sum(rate(gitpod_server_api_calls_user_total{cluster=~\"$cluster\", method=~\"ts.*\"}[5m])) by (cluster, method) * 60",
+          "expr": "sum(rate(gitpod_server_api_calls_total{cluster=~\"$cluster\", method=~\"ts.*\"}[5m])) by (cluster, method) * 60",
           "interval": "",
           "legendFormat": "{{cluster}} {{method}}",
           "refId": "A"