UBERF-4319: Performance changes (#4474)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>

dev/client-resources/src/connection.ts

@@ -34,7 +34,8 @@ import core, {
   TxResult,
   SearchQuery,
   SearchOptions,
-  SearchResult
+  SearchResult,
+  MeasureDoneOperation
 } from '@hcengineering/core'
 import { createInMemoryTxAdapter } from '@hcengineering/dev-storage'
 import devmodel from '@hcengineering/devmodel'
@@ -104,6 +105,10 @@ class ServerStorageWrapper implements ClientConnection {
   async upload (domain: Domain, docs: Doc[]): Promise<void> {}
 
   async clean (domain: Domain, docs: Ref<Doc>[]): Promise<void> {}
+
+  async measure (operationName: string): Promise<MeasureDoneOperation> {
+    return async () => ({ time: 0, serverTime: 0 })
+  }
 }
 
 async function createNullFullTextAdapter (): Promise<FullTextAdapter> {
@@ -152,7 +157,8 @@ export async function connect (handler: (tx: Tx) => void): Promise<ClientConnect
     defaultContentAdapter: 'default',
     workspace: getWorkspaceId('')
   }
-  const serverStorage = await createServerStorage(conf, {
+  const ctx = new MeasureMetricsContext('client', {})
+  const serverStorage = await createServerStorage(ctx, conf, {
     upgrade: false
   })
   setMetadata(devmodel.metadata.DevModel, serverStorage)

dev/tool/src/benchmark.ts

@@ -23,6 +23,7 @@ import core, {
   Doc,
   DocumentUpdate,
   MeasureMetricsContext,
+  Metrics,
   Ref,
   TxOperations,
   WorkspaceId,
@@ -170,13 +171,32 @@ export async function benchmark (
 
   let running = false
 
+  function extract (metrics: Metrics, ...path: string[]): Metrics | null {
+    let m = metrics
+    for (const p of path) {
+      let found = false
+      for (const [k, v] of Object.entries(m.measurements)) {
+        if (k.includes(p)) {
+          m = v
+          found = true
+          break
+        }
+      }
+      if (!found) {
+        return null
+      }
+    }
+    return m
+  }
+
   let timer: any
   if (isMainThread) {
     timer = setInterval(() => {
       const st = Date.now()
 
       try {
-        void fetch(transactorUrl.replace('ws:/', 'http:/') + '/' + token)
+        const fetchUrl = transactorUrl.replace('ws:/', 'http:/') + '/api/v1/statistics?token=' + token
+        void fetch(fetchUrl)
           .then((res) => {
             void res
               .json()
@@ -184,15 +204,17 @@ export async function benchmark (
                 memUsed = json.statistics.memoryUsed
                 memTotal = json.statistics.memoryTotal
                 cpu = json.statistics.cpuUsage
-                const r =
-                  json.metrics?.measurements?.client?.measurements?.handleRequest?.measurements?.call?.measurements?.[
-                    'find-all'
-                  ]
-                operations = r?.operations ?? 0
-                requestTime = (r?.value ?? 0) / (((r?.operations as number) ?? 0) + 1)
-                transfer =
-                  json.metrics?.measurements?.client?.measurements?.handleRequest?.measurements?.['#send-data']
-                    ?.value ?? 0
+                operations = 0
+                requestTime = 0
+                transfer = 0
+                for (const w of workspaceId) {
+                  const r = extract(json.metrics as Metrics, w.name, 'client', 'handleRequest', 'process', 'find-all')
+                  operations += r?.operations ?? 0
+                  requestTime += (r?.value ?? 0) / (((r?.operations as number) ?? 0) + 1)
+
+                  const tr = extract(json.metrics as Metrics, w.name, 'client', 'handleRequest', '#send-data')
+                  transfer += tr?.value ?? 0
+                }
               })
               .catch((err) => {
                 console.log(err)

dev/tool/src/index.ts

@@ -562,7 +562,7 @@ export function devTool (
 
   program
     .command('benchmark')
-    .description('clean archived spaces')
+    .description('benchmark')
     .option('--from <from>', 'Min client count', '10')
     .option('--steps <steps>', 'Step with client count', '10')
     .option('--sleep <sleep>', 'Random Delay max between operations', '0')