From fa6973a599900a47713d020038f902d7e90566a3 Mon Sep 17 00:00:00 2001
From: crayon <42019787+ZhuoZhuoCrayon@users.noreply.github.com>
Date: Fri, 29 Nov 2024 16:31:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E6=A8=A1=E8=B0=83=E6=8C=87=E6=A0=87=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=8E=A2=E6=B5=8B=E5=81=B6=E7=8E=B0=E4=B8=8D=E5=87=86?=
 =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98=20--bug=3D134730191=20(#41?=
 =?UTF-8?q?36)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handlers/metric_group/groups/trpc.py      | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/bkmonitor/packages/apm_web/handlers/metric_group/groups/trpc.py b/bkmonitor/packages/apm_web/handlers/metric_group/groups/trpc.py
index bb1d13d2b5..f930bdec58 100644
--- a/bkmonitor/packages/apm_web/handlers/metric_group/groups/trpc.py
+++ b/bkmonitor/packages/apm_web/handlers/metric_group/groups/trpc.py
@@ -14,7 +14,7 @@
 from django.db.models import Q
 
 from apm_web.metric.constants import SeriesAliasType
-from bkmonitor.data_source import dict_to_q
+from bkmonitor.data_source import dict_to_q, q_to_dict
 from bkmonitor.data_source.unify_query.builder import QueryConfigBuilder, UnifyQuerySet
 from constants.apm import MetricTemporality, TRPCMetricTag
 
@@ -282,22 +282,18 @@ def get_server_config(
                 {
                     "metric_field": TRPCMetricField.RPC_CLIENT_HANDLED_TOTAL,
                     "field": TRPCMetricTag.APP,
-                    "filter_dict": {f"{TRPCMetricTag.CALLER_SERVER}__eq": server},
+                    "filter_dict": q_to_dict(
+                        Q(**{f"{TRPCMetricTag.CALLER_SERVER}__eq": server})
+                        | Q(**{f"{TRPCMetricTag.SERVICE_NAME}__eq": server})
+                    ),
                 },
                 {
                     "metric_field": TRPCMetricField.RPC_SERVER_HANDLED_TOTAL,
                     "field": TRPCMetricTag.APP,
-                    "filter_dict": {f"{TRPCMetricTag.CALLEE_SERVER}__eq": server},
-                },
-                {
-                    "metric_field": TRPCMetricField.RPC_CLIENT_HANDLED_TOTAL,
-                    "field": TRPCMetricTag.APP,
-                    "filter_dict": {f"{TRPCMetricTag.SERVICE_NAME}__eq": server},
-                },
-                {
-                    "metric_field": TRPCMetricField.RPC_SERVER_HANDLED_TOTAL,
-                    "field": TRPCMetricTag.APP,
-                    "filter_dict": {f"{TRPCMetricTag.SERVICE_NAME}__eq": server},
+                    "filter_dict": q_to_dict(
+                        Q(**{f"{TRPCMetricTag.CALLEE_SERVER}__eq": server})
+                        | Q(**{f"{TRPCMetricTag.SERVICE_NAME}__eq": server})
+                    ),
                 },
             ],
             start_time=start_time,