From 5af2adac83921a0faf2b32cd1260e2cbe717aac6 Mon Sep 17 00:00:00 2001
From: Konstantinos Feretos <konferetos@tutanota.com>
Date: Fri, 7 Oct 2022 10:22:26 +0300
Subject: [PATCH] fix(grpc-sdk): admin_grpc_requests_total metric (#372)

---
 libraries/grpc-sdk/src/routing/RoutingManager.ts   | 2 +-
 libraries/grpc-sdk/src/routing/RoutingUtilities.ts | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libraries/grpc-sdk/src/routing/RoutingManager.ts b/libraries/grpc-sdk/src/routing/RoutingManager.ts
index 7a6b8ab34..1a428e34e 100644
--- a/libraries/grpc-sdk/src/routing/RoutingManager.ts
+++ b/libraries/grpc-sdk/src/routing/RoutingManager.ts
@@ -121,7 +121,7 @@ export class RoutingManager {
     if (Object.keys(this._routeHandlers).length === 0) return;
     const modifiedFunctions: {
       [name: string]: (call: any, callback: any) => void;
-    } = wrapFunctionsAsync(this._routeHandlers);
+    } = wrapFunctionsAsync(this._routeHandlers, this.isAdmin ? 'admin' : 'client');
     const protoDescriptions = constructProtoFile(
       this._router.moduleName,
       Object.values(this._moduleRoutes),
diff --git a/libraries/grpc-sdk/src/routing/RoutingUtilities.ts b/libraries/grpc-sdk/src/routing/RoutingUtilities.ts
index 0cf05e03e..ca1ba83fd 100644
--- a/libraries/grpc-sdk/src/routing/RoutingUtilities.ts
+++ b/libraries/grpc-sdk/src/routing/RoutingUtilities.ts
@@ -134,14 +134,17 @@ function getFormattedModuleName(moduleName: string) {
   return moduleName.replace('-', '_');
 }
 
-export function wrapFunctionsAsync(functions: { [name: string]: RequestHandlers }): {
+export function wrapFunctionsAsync(
+  functions: { [name: string]: RequestHandlers },
+  routerType: 'admin' | 'client',
+): {
   [name: string]: (call: Indexable, callback?: Indexable) => void;
 } {
   const modifiedFunctions: {
     [name: string]: (call: Indexable, callback?: Indexable) => void;
   } = {};
   Object.keys(functions).forEach(key => {
-    modifiedFunctions[key] = wrapRouterGrpcFunction(functions[key], 'client');
+    modifiedFunctions[key] = wrapRouterGrpcFunction(functions[key], routerType);
   });
   return modifiedFunctions;
 }