From e069b52edfd223bf824067d031e4fc4b798164ea Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@gmail.com>
Date: Thu, 2 Oct 2025 14:24:43 +0700
Subject: [PATCH] Remove a lot of ping spans

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 plugins/client-resources/src/connection.ts | 6 +++---
 server/middleware/src/domainFind.ts        | 3 ++-
 server/server/src/sessionManager.ts        | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/plugins/client-resources/src/connection.ts b/plugins/client-resources/src/connection.ts
index fd4b2bcd08a..b692c2ccc7a 100644
--- a/plugins/client-resources/src/connection.ts
+++ b/plugins/client-resources/src/connection.ts
@@ -686,7 +686,7 @@ class Connection implements ClientConnection {
     overrideId?: number
   }): Promise<any> {
     return this.ctx.with(
-      'connection-' + data.method,
+      'send-request',
       {},
       async (ctx) => {
         if (this.closed) {
@@ -757,9 +757,9 @@ class Connection implements ClientConnection {
           return await promise.promise
         }
       },
-      undefined,
+      { method: data.method },
       {
-        span: 'inherit'
+        span: 'skip'
       }
     )
   }
diff --git a/server/middleware/src/domainFind.ts b/server/middleware/src/domainFind.ts
index 155d07067ae..e70920448f2 100644
--- a/server/middleware/src/domainFind.ts
+++ b/server/middleware/src/domainFind.ts
@@ -72,7 +72,8 @@ export class DomainFindMiddleware extends BaseMiddleware implements Middleware {
       (ctx) => {
         return this.adapterManager.getAdapter(domain, false).findAll(ctx, _class, query, options)
       },
-      { _class, query, options: this.toPrintableOptions(options) }
+      { _class, query, options: this.toPrintableOptions(options) },
+      { span: 'skip' }
     )
   }
 
diff --git a/server/server/src/sessionManager.ts b/server/server/src/sessionManager.ts
index 7f0ced36167..a35acae40f0 100644
--- a/server/server/src/sessionManager.ts
+++ b/server/server/src/sessionManager.ts
@@ -1406,6 +1406,11 @@ export class TSessionManager implements SessionManager {
           await ws.backpressure(requestCtx)
         }
 
+        if (request.method === 'ping') {
+          service.lastRequest = Date.now()
+          ws.sendPong()
+          return
+        }
         await workspace.with(async (pipeline) => {
           await requestCtx.with(
             '🧨' + request.method,