diff --git a/config/src/main/java/com/alibaba/nacos/config/server/monitor/MetricsMonitor.java b/config/src/main/java/com/alibaba/nacos/config/server/monitor/MetricsMonitor.java index aca6c68e9f1..33842db2616 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/monitor/MetricsMonitor.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/monitor/MetricsMonitor.java @@ -194,6 +194,10 @@ public static Timer getNotifyRtTimer() { return NacosMeterRegistryCenter.timer(METER_REGISTRY, "nacos_timer", "module", "config", "name", "notifyRt"); } + public static Timer getDumpRtTimer() { + return NacosMeterRegistryCenter.timer(METER_REGISTRY, "nacos_timer", "module", "config", "name", "dumpRt"); + } + public static Counter getIllegalArgumentException() { return NacosMeterRegistryCenter .counter(METER_REGISTRY, "nacos_exception", "module", "config", "name", "illegalArgument"); diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/trace/ConfigTraceService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/trace/ConfigTraceService.java index 8b720c2b463..ec9b4a58fcc 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/trace/ConfigTraceService.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/trace/ConfigTraceService.java @@ -142,7 +142,6 @@ public static void logPersistenceEvent(String dataId, String group, String tenan //localIp | dataid | group | tenant | requestIpAppName | ts | client ip | event | type | [delayed = -1] | ext // (md5) String md5 = content == null ? null : MD5Utils.md5Hex(content, Constants.PERSIST_ENCODE); - LogUtil.TRACE_LOG.info("{}|{}|{}|{}|{}|{}|{}|{}|{}|{}|{}", InetUtils.getSelfIP(), dataId, group, tenant, requestIpAppName, ts, handleIp, event, type, -1, md5); } @@ -165,17 +164,14 @@ public static void logNotifyEvent(String dataId, String group, String tenant, St if (!LogUtil.TRACE_LOG.isInfoEnabled()) { return; } - if (delayed < 0) { delayed = 0; } - MetricsMonitor.getNotifyRtTimer().record(delayed, TimeUnit.MILLISECONDS); // Convenient tlog segmentation if (StringUtils.isBlank(tenant)) { tenant = null; } - //localIp | dataid | group | tenant | requestIpAppName | ts | handleIp | event | type | [delayed] | ext // (targetIp) LogUtil.TRACE_LOG.info("{}|{}|{}|{}|{}|{}|{}|{}|{}|{}|{}", InetUtils.getSelfIP(), dataId, group, tenant, @@ -227,6 +223,7 @@ private static void logDumpEventInner(String dataId, String group, String tenant if (delayed < 0) { delayed = 0; } + MetricsMonitor.getDumpRtTimer().record(delayed, TimeUnit.MILLISECONDS); // Convenient tlog segmentation if (StringUtils.isBlank(tenant)) { tenant = null; @@ -284,11 +281,9 @@ public static void logPullEvent(String dataId, String group, String tenant, Stri if (StringUtils.isBlank(tenant)) { tenant = null; } - if (isNotify && delayed < 0) { delayed = 0; } - // localIp | dataid | group | tenant| requestIpAppName| ts | event | type | [delayed] |clientIp| isNotify | mode(http/grpc) LogUtil.TRACE_LOG.info("{}|{}|{}|{}|{}|{}|{}|{}|{}|{}|{}|{}", InetUtils.getSelfIP(), dataId, group, tenant, requestIpAppName, ts, event, type, delayed, clientIp, isNotify, model);