From 4940418a6c2bd1f40644b91c399ee7312dcfcff6 Mon Sep 17 00:00:00 2001 From: wardseptember Date: Mon, 8 Dec 2025 16:50:33 +0800 Subject: [PATCH] feat: optimize debug log --- .../container/config/system/Environment.java | 1 - .../core/cluster/RpcClusterClientManager.java | 11 +++-- .../core/cluster/def/DefClusterInvoker.java | 2 - .../trpc/core/common/LifecycleBase.java | 4 +- .../core/common/config/BackendConfig.java | 4 +- .../trpc/core/extension/ExtensionClass.java | 6 ++- .../core/filter/ProviderFilterInvoker.java | 13 +++--- .../trpc/core/trace/TracerClientFilter.java | 8 +++- .../tencent/trpc/core/trace/TracerFilter.java | 18 +++++--- .../trpc/core/trace/TracerServerFilter.java | 8 +++- .../transport/AbstractClientTransport.java | 6 ++- .../handler/ChannelHandlerAdapter.java | 4 +- .../filter/SentinelLimiterFilter.java | 4 +- .../http/server/AbstractHttpExecutor.java | 1 - .../http/server/DefaultHttpExecutor.java | 3 -- .../standard/stream/TRpcStreamResponder.java | 4 +- .../stream/client/StreamConsumerInvoker.java | 4 +- .../AbstractFailedRetryRegistryCenter.java | 10 +++-- .../center/AbstractRegistryCenter.java | 42 +++++++++++++------ .../trpc/registry/task/AbstractRetryTask.java | 4 +- .../curator/CuratorZookeeperClient.java | 8 +++- .../trpc/polaris/common/PolarisTrans.java | 5 ++- .../selector/polaris/PolarisSelector.java | 28 +++++++++---- 23 files changed, 135 insertions(+), 63 deletions(-) diff --git a/trpc-container/trpc-container-default/src/main/java/com/tencent/trpc/container/config/system/Environment.java b/trpc-container/trpc-container-default/src/main/java/com/tencent/trpc/container/config/system/Environment.java index fc2ab0e3f..f83fa1a80 100644 --- a/trpc-container/trpc-container-default/src/main/java/com/tencent/trpc/container/config/system/Environment.java +++ b/trpc-container/trpc-container-default/src/main/java/com/tencent/trpc/container/config/system/Environment.java @@ -93,7 +93,6 @@ public Map parseMap(String configPath) { this.localConfigMap = this.applicationConfigParser.parseMap(configPath); this.overrideConfig(); if (override) { - logger.debug("use part of system config instead of local yaml config."); return this.propertySourceParser.parseFlattableMap(this.localFlattableConfigMap); } return this.localConfigMap; diff --git a/trpc-core/src/main/java/com/tencent/trpc/core/cluster/RpcClusterClientManager.java b/trpc-core/src/main/java/com/tencent/trpc/core/cluster/RpcClusterClientManager.java index 8fbdbf2f4..320b8b0f5 100644 --- a/trpc-core/src/main/java/com/tencent/trpc/core/cluster/RpcClusterClientManager.java +++ b/trpc-core/src/main/java/com/tencent/trpc/core/cluster/RpcClusterClientManager.java @@ -71,7 +71,10 @@ public static void shutdownBackendConfig(BackendConfig backendConfig) { .ifPresent(proxyMap -> proxyMap.forEach((k, v) -> { try { v.close(); - logger.debug("Shutdown client:{} backendConfig:{} success", k, backendConfig.toSimpleString()); + if (logger.isDebugEnabled()) { + logger.debug("Shutdown client:{} backendConfig:{} success", k, + backendConfig.toSimpleString()); + } } catch (Exception ex) { logger.error("Shutdown client:{} backendConfig:{},exception", k, backendConfig.toSimpleString(), ex); @@ -107,8 +110,10 @@ private static ScheduledFuture startRpcClientCleaner() { public static void scanUnusedClient() { Map> unusedClientMap = Maps.newHashMap(); CLUSTER_MAP.forEach((bConfig, clusterMap) -> { - logger.debug("RpcClusterClient scheduler report clusterName={}, naming={}, num of client is {}", - bConfig.getName(), bConfig.getNamingOptions().getServiceNaming(), clusterMap.keySet().size()); + if (logger.isDebugEnabled()) { + logger.debug("RpcClusterClient scheduler report clusterName={}, naming={}, num of client is {}", + bConfig.getName(), bConfig.getNamingOptions().getServiceNaming(), clusterMap.keySet().size()); + } clusterMap.forEach((clientKey, clientValue) -> { try { if (isIdleTimeout(bConfig, clientValue)) { diff --git a/trpc-core/src/main/java/com/tencent/trpc/core/cluster/def/DefClusterInvoker.java b/trpc-core/src/main/java/com/tencent/trpc/core/cluster/def/DefClusterInvoker.java index f4c614558..653559b98 100644 --- a/trpc-core/src/main/java/com/tencent/trpc/core/cluster/def/DefClusterInvoker.java +++ b/trpc-core/src/main/java/com/tencent/trpc/core/cluster/def/DefClusterInvoker.java @@ -210,8 +210,6 @@ private void fillCallInfo(Request request, ServiceInstance serviceInstance) { Constants.CONTAINER_NAME)); request.getMeta().getCallInfo().setCalleeSetName(serviceInstance.getParameter( Constants.SET_DIVISION)); - logger.debug("[invoke] container:{},set:{}", serviceInstance.getParameter( - Constants.CONTAINER_NAME), serviceInstance.getParameter(Constants.SET_DIVISION)); } } diff --git a/trpc-core/src/main/java/com/tencent/trpc/core/common/LifecycleBase.java b/trpc-core/src/main/java/com/tencent/trpc/core/common/LifecycleBase.java index 21f275cd4..acc7b7d51 100644 --- a/trpc-core/src/main/java/com/tencent/trpc/core/common/LifecycleBase.java +++ b/trpc-core/src/main/java/com/tencent/trpc/core/common/LifecycleBase.java @@ -306,7 +306,9 @@ private synchronized void setStateInternal(LifecycleState state) { } private synchronized void setStateInternal(LifecycleState state, Throwable ex) { - logger.debug(">>>Lifecycle state transfer,{obj={}, state({} -> {})}", this, getState(), state); + if (logger.isDebugEnabled()) { + logger.debug(">>>Lifecycle state transfer,{obj={}, state({} -> {})}", this, getState(), state); + } this.state = state; fireLifecycleEvent(state, ex); } diff --git a/trpc-core/src/main/java/com/tencent/trpc/core/common/config/BackendConfig.java b/trpc-core/src/main/java/com/tencent/trpc/core/common/config/BackendConfig.java index 07cb9accb..e350af6b0 100644 --- a/trpc-core/src/main/java/com/tencent/trpc/core/common/config/BackendConfig.java +++ b/trpc-core/src/main/java/com/tencent/trpc/core/common/config/BackendConfig.java @@ -334,7 +334,9 @@ public synchronized void init() { validateInterceptor(); namingServiceId = toNamingServiceId(); simpleString = "BackendConfig[name=" + name + ", naming=" + namingOptions.getServiceNaming() + "]"; - logger.debug("ConsumerConfig initialized:{}", toString()); + if (logger.isDebugEnabled()) { + logger.debug("ConsumerConfig initialized:{}", toString()); + } SelectorManager.getManager().validate(namingOptions.getSelectorId()); initRpcClusterClient(); inited = true; diff --git a/trpc-core/src/main/java/com/tencent/trpc/core/extension/ExtensionClass.java b/trpc-core/src/main/java/com/tencent/trpc/core/extension/ExtensionClass.java index b0525e080..0260ec119 100644 --- a/trpc-core/src/main/java/com/tencent/trpc/core/extension/ExtensionClass.java +++ b/trpc-core/src/main/java/com/tencent/trpc/core/extension/ExtensionClass.java @@ -90,8 +90,10 @@ private T createInstance() { T t = clazz.newInstance(); injectExtension(t, pluginConfig); initExtension(t); - logger.debug("Create plugin instance (name={}, type={}), config={}) success", name, - extensionType, ExtensionLoader.getPluginConfigMap(extensionType)); + if (logger.isDebugEnabled()) { + logger.debug("Create plugin instance (name={}, type={}), config={}) success", name, + extensionType, ExtensionLoader.getPluginConfigMap(extensionType)); + } return t; } catch (Exception e) { throw new TRpcExtensionException( diff --git a/trpc-core/src/main/java/com/tencent/trpc/core/filter/ProviderFilterInvoker.java b/trpc-core/src/main/java/com/tencent/trpc/core/filter/ProviderFilterInvoker.java index 19d1f283b..edb9094fc 100644 --- a/trpc-core/src/main/java/com/tencent/trpc/core/filter/ProviderFilterInvoker.java +++ b/trpc-core/src/main/java/com/tencent/trpc/core/filter/ProviderFilterInvoker.java @@ -49,7 +49,6 @@ private static ProviderInvoker buildProviderChain(boolean disableDefaultF : Stream.of(new ProviderInvokerHeadFilter(), new ProviderInvokerTailFilter()); List filters = Stream.concat(filterNames.stream().map(FilterManager::get), defaultFilters) .sorted(Comparator.comparing(Filter::getOrder)).collect(Collectors.toList()); - logger.debug("===Build invoke provider filter size: {}", filters.size()); for (int i = filters.size() - 1; i >= 0; i--) { final Filter filter = filters.get(i); @@ -68,12 +67,16 @@ public Class getInterface() { @Override public CompletionStage invoke(Request request) { RpcInvocation inv = request.getInvocation(); - logger.debug(">>>Before Invoke provider filter(service={}, rpcServiceName={}, rpcMehthodName={})", - filter.getClass(), inv.getRpcServiceName(), inv.getRpcMethodName()); + if (logger.isDebugEnabled()) { + logger.debug(">>>Before Invoke provider filter(service={}, rpcServiceName={}, rpcMehthodName={})", + filter.getClass(), inv.getRpcServiceName(), inv.getRpcMethodName()); + } CompletionStage f = filter.filter(before, request); - logger.debug("<< filter(Invoker invoker, Request request) Span span = null; try { span = buildSpan(invoker, request, context, meta, tracer, parentSpan); - logger.debug("before tjg TraceClientFilter reporting, span: {}", span); + if (logger.isDebugEnabled()) { + logger.debug("before tjg TraceClientFilter reporting, span: {}", span); + } } catch (Exception e) { logger.error("create trace client span error: ", e); } @@ -59,7 +61,9 @@ public CompletionStage filter(Invoker invoker, Request request) updateUpstreamSpanFlag(parentSpan, tempSpan); finish(tempSpan, request, r, t); } - logger.debug("after tjg TraceClientFilter reporting, span: {}", tempSpan); + if (logger.isDebugEnabled()) { + logger.debug("after tjg TraceClientFilter reporting, span: {}", tempSpan); + } } catch (Exception e) { logger.error("finish span error: ", e); } diff --git a/trpc-core/src/main/java/com/tencent/trpc/core/trace/TracerFilter.java b/trpc-core/src/main/java/com/tencent/trpc/core/trace/TracerFilter.java index 911d34fa5..3c79478f1 100644 --- a/trpc-core/src/main/java/com/tencent/trpc/core/trace/TracerFilter.java +++ b/trpc-core/src/main/java/com/tencent/trpc/core/trace/TracerFilter.java @@ -91,7 +91,9 @@ public abstract Span start(SpanBuilder spanBuilder, RpcContext context, Invoker< */ public Tracer getTracer(RpcContext context, RequestMeta meta) throws TRpcException { try { - logger.debug("c context:{},meta:{}", context, meta); + if (logger.isDebugEnabled()) { + logger.debug("c context:{},meta:{}", context, meta); + } Tracer tracer = RpcContextUtils.getTracer(context); if (tracer != null) { return tracer; @@ -114,7 +116,9 @@ public Tracer getTracer(RpcContext context, RequestMeta meta) throws TRpcExcepti logger.error("tracer is null,this self server name is null"); } } - logger.debug("getTracer tracer:{}}", tracer); + if (logger.isDebugEnabled()) { + logger.debug("getTracer tracer:{}}", tracer); + } return tracer; } catch (Exception e) { logger.error("getTracer error", e); @@ -133,8 +137,10 @@ public Tracer getTracer(RpcContext context, RequestMeta meta) throws TRpcExcepti public SpanBuilder createSpanBuilder(Tracer tracer, SpanContext parentSpanContext, RequestMeta meta) { try { - logger.debug("createSpanBuilder tracer:{},parentSpanContext:{},meta:{}", tracer, - parentSpanContext, meta); + if (logger.isDebugEnabled()) { + logger.debug("createSpanBuilder tracer:{},parentSpanContext:{},meta:{}", tracer, + parentSpanContext, meta); + } if (tracer == null) { return null; } @@ -164,7 +170,9 @@ public SpanBuilder createSpanBuilder(Tracer tracer, SpanContext parentSpanContex */ public void updateSpanErrorFlag(Response response, Throwable throwable, Span span) { try { - logger.debug("updateSpanErrorFlag response:{},throwable:{},span:{}", response, throwable, span); + if (logger.isDebugEnabled()) { + logger.debug("updateSpanErrorFlag response:{},throwable:{},span:{}", response, throwable, span); + } if (span == null) { return; } diff --git a/trpc-core/src/main/java/com/tencent/trpc/core/trace/TracerServerFilter.java b/trpc-core/src/main/java/com/tencent/trpc/core/trace/TracerServerFilter.java index 0a693f922..5f33019d8 100644 --- a/trpc-core/src/main/java/com/tencent/trpc/core/trace/TracerServerFilter.java +++ b/trpc-core/src/main/java/com/tencent/trpc/core/trace/TracerServerFilter.java @@ -54,7 +54,9 @@ public CompletionStage filter(Invoker invoker, Request request) RpcContextUtils.putValueMapValue(context, RpcContextValueKeys.CTX_TRACE_SPAN, span); } } - logger.debug("before tjg TraceServerFilter reporting,span: {}", span); + if (logger.isDebugEnabled()) { + logger.debug("before tjg TraceServerFilter reporting,span: {}", span); + } } catch (Exception e) { logger.error("create trace server span error", e); } @@ -74,7 +76,9 @@ public CompletionStage filter(Invoker invoker, Request request) } finish(tempSpan, request, r, t); } - logger.debug("after tjg TraceClientFilter reporting,span:{}", tempSpan); + if (logger.isDebugEnabled()) { + logger.debug("after tjg TraceClientFilter reporting,span:{}", tempSpan); + } } catch (Exception e) { logger.error("finish span error", e); } diff --git a/trpc-core/src/main/java/com/tencent/trpc/core/transport/AbstractClientTransport.java b/trpc-core/src/main/java/com/tencent/trpc/core/transport/AbstractClientTransport.java index 31638c552..d73a12267 100644 --- a/trpc-core/src/main/java/com/tencent/trpc/core/transport/AbstractClientTransport.java +++ b/trpc-core/src/main/java/com/tencent/trpc/core/transport/AbstractClientTransport.java @@ -229,8 +229,10 @@ protected CompletionStage createChannel() throws TransportException { if (t != null) { logger.error("Client transport({}) create connection exception", this.toString(), t); } else { - logger.debug("Client transport(remote addr={}, network={}) create connection success", - rAddr, config.getNetwork()); + if (logger.isDebugEnabled()) { + logger.debug("Client transport(remote addr={}, network={}) create connection success", + rAddr, config.getNetwork()); + } } // to prevent connection leakage, do one more check: when the connection is successfully established, if diff --git a/trpc-core/src/main/java/com/tencent/trpc/core/transport/handler/ChannelHandlerAdapter.java b/trpc-core/src/main/java/com/tencent/trpc/core/transport/handler/ChannelHandlerAdapter.java index c900b24e3..9272c4327 100644 --- a/trpc-core/src/main/java/com/tencent/trpc/core/transport/handler/ChannelHandlerAdapter.java +++ b/trpc-core/src/main/java/com/tencent/trpc/core/transport/handler/ChannelHandlerAdapter.java @@ -30,7 +30,9 @@ public void connected(com.tencent.trpc.core.transport.Channel channel) { @Override public void disconnected(com.tencent.trpc.core.transport.Channel channel) { - logger.debug("disconnected channel|{}", channel); + if (logger.isDebugEnabled()) { + logger.debug("disconnected channel|{}", channel); + } disconnectedCnt.incrementAndGet(); } diff --git a/trpc-limiter/trpc-limiter-sentinel/src/main/java/com/tencent/trpc/limiter/sentinel/filter/SentinelLimiterFilter.java b/trpc-limiter/trpc-limiter-sentinel/src/main/java/com/tencent/trpc/limiter/sentinel/filter/SentinelLimiterFilter.java index 9aeffb118..373f75614 100644 --- a/trpc-limiter/trpc-limiter-sentinel/src/main/java/com/tencent/trpc/limiter/sentinel/filter/SentinelLimiterFilter.java +++ b/trpc-limiter/trpc-limiter-sentinel/src/main/java/com/tencent/trpc/limiter/sentinel/filter/SentinelLimiterFilter.java @@ -44,7 +44,9 @@ public class SentinelLimiterFilter implements Filter, InitializingExtension { @Override public void init() throws TRpcExtensionException { sentinelLimiter = (SentinelLimiter) ExtensionLoader.getExtensionLoader(Limiter.class).getExtension(NAME); - logger.debug("init sentinel limiter success, sentinelLimiter:{}", sentinelLimiter); + if (logger.isDebugEnabled()) { + logger.debug("init sentinel limiter success, sentinelLimiter:{}", sentinelLimiter); + } } @Override diff --git a/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/server/AbstractHttpExecutor.java b/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/server/AbstractHttpExecutor.java index 2ab588049..35070cc61 100644 --- a/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/server/AbstractHttpExecutor.java +++ b/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/server/AbstractHttpExecutor.java @@ -423,7 +423,6 @@ private void setRpcServerContext(HttpServletRequest request, HttpServletResponse // to maintain consistency. rpcRequest.getAttachments().put(header, value.getBytes(StandardCharsets.UTF_8)); } - logger.debug("request attachment: {}", JsonUtils.toJson(rpcRequest.getAttachments())); } /** diff --git a/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/server/DefaultHttpExecutor.java b/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/server/DefaultHttpExecutor.java index 68faf223e..7a834cc16 100644 --- a/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/server/DefaultHttpExecutor.java +++ b/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/server/DefaultHttpExecutor.java @@ -68,9 +68,6 @@ protected RpcMethodInfoAndInvoker getRpcMethodInfoAndInvoker(Object object) { if (object instanceof HttpServletRequest) { HttpServletRequest request = (HttpServletRequest) object; String func = methodRegister.getNativeHttpFunc(request.getPathInfo()); - - logger.debug("got http trpc request, func: {}", func); - RpcMethodInfoAndInvoker methodAndInvoker = methodRegister.route(func); if (null == methodAndInvoker) { String serviceName = request.getParameter(HttpConstants.RPC_CALL_PARAM_SERVICE); diff --git a/trpc-proto/trpc-proto-standard/src/main/java/com/tencent/trpc/proto/standard/stream/TRpcStreamResponder.java b/trpc-proto/trpc-proto-standard/src/main/java/com/tencent/trpc/proto/standard/stream/TRpcStreamResponder.java index 2bf09f1dc..c4b3ee3bc 100644 --- a/trpc-proto/trpc-proto-standard/src/main/java/com/tencent/trpc/proto/standard/stream/TRpcStreamResponder.java +++ b/trpc-proto/trpc-proto-standard/src/main/java/com/tencent/trpc/proto/standard/stream/TRpcStreamResponder.java @@ -59,7 +59,9 @@ public TRpcStreamResponder(ProtocolConfig protocolConfig, RpcConnection connecti DefMethodInfoRegister methodInfoRegister) { super(protocolConfig, connection); this.methodInfoRegister = Objects.requireNonNull(methodInfoRegister, "methodInfoRegister is null"); - logger.debug("created new rpcResponder for {}", protocolConfig); + if (logger.isDebugEnabled()) { + logger.debug("created new rpcResponder for {}", protocolConfig); + } } @Override diff --git a/trpc-proto/trpc-proto-standard/src/main/java/com/tencent/trpc/proto/standard/stream/client/StreamConsumerInvoker.java b/trpc-proto/trpc-proto-standard/src/main/java/com/tencent/trpc/proto/standard/stream/client/StreamConsumerInvoker.java index f7367e97e..a8f188548 100644 --- a/trpc-proto/trpc-proto-standard/src/main/java/com/tencent/trpc/proto/standard/stream/client/StreamConsumerInvoker.java +++ b/trpc-proto/trpc-proto-standard/src/main/java/com/tencent/trpc/proto/standard/stream/client/StreamConsumerInvoker.java @@ -144,7 +144,9 @@ private Object doInvoke(Request request, TRpcStreamRequester requester, RpcConne AtomicInteger unFinished = new AtomicInteger(STREAM_CLOSE_COUNT_BOTH_DIRECTION); Consumer onFinally = s -> { if (unFinished.decrementAndGet() == 0) { - logger.debug("close stream invoker connection: {}", connection); + if (logger.isDebugEnabled()) { + logger.debug("close stream invoker connection: {}", connection); + } connection.dispose(); } }; diff --git a/trpc-registry/trpc-registry-api/src/main/java/com/tencent/trpc/registry/center/AbstractFailedRetryRegistryCenter.java b/trpc-registry/trpc-registry-api/src/main/java/com/tencent/trpc/registry/center/AbstractFailedRetryRegistryCenter.java index e39759603..6fa69b348 100644 --- a/trpc-registry/trpc-registry-api/src/main/java/com/tencent/trpc/registry/center/AbstractFailedRetryRegistryCenter.java +++ b/trpc-registry/trpc-registry-api/src/main/java/com/tencent/trpc/registry/center/AbstractFailedRetryRegistryCenter.java @@ -387,7 +387,9 @@ protected void recoverRegistered() { return; } recoverRegistered.forEach(registerInfo -> { - logger.debug("[Recover] Register registerInfo: {}", registerInfo); + if (logger.isDebugEnabled()) { + logger.debug("[Recover] Register registerInfo: {}", registerInfo); + } addFailedRegisteredTask(registerInfo); }); } @@ -403,8 +405,10 @@ protected void recoverSubscribed() { } recoverSubscribed.forEach((registerInfo, registryCenterListenerSet) -> registryCenterListenerSet.getNotifyListeners().forEach(notifyListener -> { - logger.debug("[Recover] Subscribe registerInfo: {}, listener: {}", - registerInfo, notifyListener); + if (logger.isDebugEnabled()) { + logger.debug("[Recover] Subscribe registerInfo: {}, listener: {}", + registerInfo, notifyListener); + } addFailedSubscribedTask(registerInfo, notifyListener); }) ); diff --git a/trpc-registry/trpc-registry-api/src/main/java/com/tencent/trpc/registry/center/AbstractRegistryCenter.java b/trpc-registry/trpc-registry-api/src/main/java/com/tencent/trpc/registry/center/AbstractRegistryCenter.java index 8cc01421f..5cd15e044 100644 --- a/trpc-registry/trpc-registry-api/src/main/java/com/tencent/trpc/registry/center/AbstractRegistryCenter.java +++ b/trpc-registry/trpc-registry-api/src/main/java/com/tencent/trpc/registry/center/AbstractRegistryCenter.java @@ -110,8 +110,9 @@ public void setPluginConfig(PluginConfig pluginConfig) throws TRpcExtensionExcep @Override public void register(RegisterInfo registerInfo) { Objects.requireNonNull(registerInfo, "registerInfo can not be null"); - logger.debug("[register] registerInfo: {}", registerInfo); - + if (logger.isDebugEnabled()) { + logger.debug("[register] registerInfo: {}", registerInfo); + } registeredRegisterInfos.add(registerInfo); } @@ -123,8 +124,9 @@ public void register(RegisterInfo registerInfo) { @Override public void unregister(RegisterInfo registerInfo) { Objects.requireNonNull(registerInfo, "registerInfo can not be null"); - logger.debug("[unregister] registerInfo: {}", registerInfo); - + if (logger.isDebugEnabled()) { + logger.debug("[unregister] registerInfo: {}", registerInfo); + } registeredRegisterInfos.remove(registerInfo); } @@ -139,7 +141,9 @@ public void unregister(RegisterInfo registerInfo) { public void subscribe(RegisterInfo registerInfo, NotifyListener notifyListener) { Objects.requireNonNull(registerInfo, "registerInfo can not be null"); Objects.requireNonNull(notifyListener, "notifyListener can not be null"); - logger.debug("[subscribe] registerInfo: {}, notifyListener: {}", registerInfo, notifyListener); + if (logger.isDebugEnabled()) { + logger.debug("[subscribe] registerInfo: {}, notifyListener: {}", registerInfo, notifyListener); + } synchronized (this) { RegistryCenterListenerSet registryCenterListenerSet = subscribedRegisterInfos @@ -160,7 +164,9 @@ public void subscribe(RegisterInfo registerInfo, NotifyListener notifyListener) public void unsubscribe(RegisterInfo registerInfo, NotifyListener notifyListener) { Objects.requireNonNull(registerInfo, "registerInfo can not be null"); Objects.requireNonNull(notifyListener, "notifyListener can not be null"); - logger.debug("[unsubscribe] registerInfo: {}, notifyListener: {}", registerInfo, notifyListener); + if (logger.isDebugEnabled()) { + logger.debug("[unsubscribe] registerInfo: {}, notifyListener: {}", registerInfo, notifyListener); + } synchronized (this) { RegistryCenterListenerSet registryCenterListenerSet = subscribedRegisterInfos.get(registerInfo); @@ -209,7 +215,9 @@ public void notify(RegisterInfo registerInfo, NotifyListener notifyListener, */ @Override public void destroy() { - logger.debug("[Destroy] registry center: {}", config); + if (logger.isDebugEnabled()) { + logger.debug("[Destroy] registry center: {}", config); + } destroyRegistered(); destroySubscribed(); AbstractRegistryFactory.removeDestroyedRegistry(this); @@ -252,7 +260,9 @@ protected void recoverRegistered() { recoverRegistered.forEach(registerInfo -> { try { - logger.debug("[Recover] Register registerInfo: {}", registerInfo); + if (logger.isDebugEnabled()) { + logger.debug("[Recover] Register registerInfo: {}", registerInfo); + } register(registerInfo); } catch (Exception e) { logger.warn("[Recover] Failed to register registerInfo: {}, cause: ", registerInfo, e); @@ -272,8 +282,10 @@ protected void recoverSubscribed() { recoverSubscribed.forEach((registerInfo, registryCenterListenerSet) -> registryCenterListenerSet.getNotifyListeners().forEach(notifyListener -> { try { - logger.debug("[Recover] Subscribe registerInfo: {}, listener: {}", - registerInfo, notifyListener); + if (logger.isDebugEnabled()) { + logger.debug("[Recover] Subscribe registerInfo: {}, listener: {}", + registerInfo, notifyListener); + } subscribe(registerInfo, notifyListener); } catch (Exception e) { logger.warn("[Recover] Failed to subscribe registerInfo: {}, cause: ", registerInfo, e); @@ -306,7 +318,9 @@ private void destroyRegistered() { } destroyRegistered.forEach(registerInfo -> { try { - logger.debug("[Destroy] Unregister registerInfo: {}", registerInfo); + if (logger.isDebugEnabled()) { + logger.debug("[Destroy] Unregister registerInfo: {}", registerInfo); + } unregister(registerInfo); } catch (Exception e) { logger.warn("[Destroy] Failed to unregister registerInfo: {}, cause: ", registerInfo, e); @@ -325,8 +339,10 @@ private void destroySubscribed() { destroySubscribed.forEach((registerInfo, registryCenterListenerSet) -> registryCenterListenerSet.getNotifyListeners().forEach(notifyListener -> { try { - logger.debug("[Destroy] Unsubscribe registerInfo: {}, listener: {}", - registerInfo, notifyListener); + if (logger.isDebugEnabled()) { + logger.debug("[Destroy] Unsubscribe registerInfo: {}, listener: {}", + registerInfo, notifyListener); + } unsubscribe(registerInfo, notifyListener); } catch (Exception e) { logger.warn("[Destroy] Failed to unsubscribe registerInfo: {}, cause: ", registerInfo, e); diff --git a/trpc-registry/trpc-registry-api/src/main/java/com/tencent/trpc/registry/task/AbstractRetryTask.java b/trpc-registry/trpc-registry-api/src/main/java/com/tencent/trpc/registry/task/AbstractRetryTask.java index 5db23b2c3..67c743c37 100644 --- a/trpc-registry/trpc-registry-api/src/main/java/com/tencent/trpc/registry/task/AbstractRetryTask.java +++ b/trpc-registry/trpc-registry-api/src/main/java/com/tencent/trpc/registry/task/AbstractRetryTask.java @@ -107,7 +107,9 @@ protected void retryAgain(Timeout timeout) { */ @Override public void run(Timeout timeout) throws Exception { - logger.debug("taskName: {}, registerInfo: {}", taskName, registerInfo); + if (logger.isDebugEnabled()) { + logger.debug("taskName: {}, registerInfo: {}", taskName, registerInfo); + } if (timeout.isCancelled() || isCancelled()) { return; } diff --git a/trpc-registry/trpc-registry-zookeeper/src/main/java/com/tencent/trpc/registry/transporter/curator/CuratorZookeeperClient.java b/trpc-registry/trpc-registry-zookeeper/src/main/java/com/tencent/trpc/registry/transporter/curator/CuratorZookeeperClient.java index 8fd18f579..b36dd51ad 100644 --- a/trpc-registry/trpc-registry-zookeeper/src/main/java/com/tencent/trpc/registry/transporter/curator/CuratorZookeeperClient.java +++ b/trpc-registry/trpc-registry-zookeeper/src/main/java/com/tencent/trpc/registry/transporter/curator/CuratorZookeeperClient.java @@ -409,7 +409,9 @@ public void unwatch() { */ @Override public void process(WatchedEvent event) throws Exception { - logger.debug("curator watcher process. event: {}", event); + if (logger.isDebugEnabled()) { + logger.debug("curator watcher process. event: {}", event); + } if (childListener == null) { return; @@ -454,7 +456,9 @@ public void setDataListener(DataListener dataListener) { */ @Override public void event(Type type, ChildData oldData, ChildData data) { - logger.debug("zookeeper data changed. type: {}, oldData: {}, newData: {}", type, oldData, data); + if (logger.isDebugEnabled()) { + logger.debug("zookeeper data changed. type: {}, oldData: {}, newData: {}", type, oldData, data); + } if (dataListener == null) { return; diff --git a/trpc-selector/trpc-selector-open-polaris/src/main/java/com/tencent/trpc/polaris/common/PolarisTrans.java b/trpc-selector/trpc-selector-open-polaris/src/main/java/com/tencent/trpc/polaris/common/PolarisTrans.java index c39dcda74..3d034d2dc 100644 --- a/trpc-selector/trpc-selector-open-polaris/src/main/java/com/tencent/trpc/polaris/common/PolarisTrans.java +++ b/trpc-selector/trpc-selector-open-polaris/src/main/java/com/tencent/trpc/polaris/common/PolarisTrans.java @@ -63,7 +63,9 @@ public static ServiceInstance toServiceInstance(InstancesResponse response, Instance polarisInstance) { String containerName = getContainerName(polarisInstance); String setName = getSetName(polarisInstance); - LOGGER.debug("[PolarisTrans] containerName:{},setName:{}", containerName, setName); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("[PolarisTrans] containerName:{},setName:{}", containerName, setName); + } ServiceInstance serviceInstance = new ServiceInstance(polarisInstance.getHost(), polarisInstance.getPort(), polarisInstance.isHealthy()); @@ -161,7 +163,6 @@ public static String getPolarisInstanceId(ServiceInstance serviceInstance) { public static Map trans2PolarisMetadata(Map originMap) { Object metadataObj = originMap.get(Constants.METADATA); if (metadataObj == null || !(metadataObj instanceof Map)) { - LOGGER.debug("metadata is empty or param error metadata:{}", metadataObj); return Maps.newHashMap(); } Map metadata = (Map) metadataObj; diff --git a/trpc-selector/trpc-selector-open-polaris/src/main/java/com/tencent/trpc/selector/polaris/PolarisSelector.java b/trpc-selector/trpc-selector-open-polaris/src/main/java/com/tencent/trpc/selector/polaris/PolarisSelector.java index bb37defea..82bfd31df 100644 --- a/trpc-selector/trpc-selector-open-polaris/src/main/java/com/tencent/trpc/selector/polaris/PolarisSelector.java +++ b/trpc-selector/trpc-selector-open-polaris/src/main/java/com/tencent/trpc/selector/polaris/PolarisSelector.java @@ -145,8 +145,10 @@ public void warmup(ServiceId serviceId) { PolarisFutureUtil.toCompletableFuture(polarisAPI.asyncGetInstances(req), selectorConfig.getWorkerPool().toExecutor()) .thenApply(res -> { - logger.debug("[selector] warmup polaris asyncSelectAll return success:{}", - res); + if (logger.isDebugEnabled()) { + logger.debug("[selector] warmup polaris asyncSelectAll return success:{}", + res); + } if (res == null || res.getInstances() == null || res.getInstances().length == 0) { return Collections.emptyList(); @@ -181,7 +183,9 @@ public CompletionStage asyncSelectOne(ServiceId serviceId, Requ ConfigurationLoader loader = ConfigurationManager.getConfigurationLoader(configCenter); return Optional.ofNullable(loader.getValue(key, ConfigManager.getInstance().getServerConfig().getApp())); }); - logger.debug("[asyncSelectOne] GetOneInstanceRequest:{}", req); + if (logger.isDebugEnabled()) { + logger.debug("[asyncSelectOne] GetOneInstanceRequest:{}", req); + } try { MetadataContext metadataContext = buildCalleeMetadataManager(request); @@ -193,8 +197,10 @@ public CompletionStage asyncSelectOne(ServiceId serviceId, Requ () -> polarisAPI.getOneInstance(req), executor); return future.thenCompose(res -> { if (res != null && res.getInstances() != null && res.getInstances().length > 0) { - logger.debug("[selector] selector asyncSelectOne ServiceId:{} return success:{}", - serviceId, res.getInstances()[0]); + if (logger.isDebugEnabled()) { + logger.debug("[selector] selector asyncSelectOne ServiceId:{} return success:{}", + serviceId, res.getInstances()[0]); + } return CompletableFuture.completedFuture( PolarisTrans.toServiceInstance(res, res.getInstances()[0])); } @@ -214,12 +220,16 @@ public CompletionStage asyncSelectOne(ServiceId serviceId, Requ public CompletionStage> asyncSelectAll(ServiceId serviceId, Request request) { GetInstancesRequest req = createSelectAllReq(serviceId, request, false); - logger.debug("[asyncSelectAll] GetInstancesRequest:{}", req); + if (logger.isDebugEnabled()) { + logger.debug("[asyncSelectAll] GetInstancesRequest:{}", req); + } try { return PolarisFutureUtil.toCompletableFuture(polarisAPI.asyncGetInstances(req), selectorConfig.getWorkerPool().toExecutor()) .thenApply(res -> { - logger.debug("[selector] polaris asyncSelectAll return success:{}", res); + if (logger.isDebugEnabled()) { + logger.debug("[selector] polaris asyncSelectAll return success:{}", res); + } if (res == null || res.getInstances() == null || res.getInstances().length == 0) { return Collections.emptyList(); @@ -249,7 +259,9 @@ public void report(ServiceInstance serviceInstance, int code, long costMs) */ private CompletableFuture selectOneFallback(ServiceId serviceId, Request request) { - logger.debug("[selector] selectOneFallback call for ServiceId:{}", serviceId); + if (logger.isDebugEnabled()) { + logger.debug("[selector] selectOneFallback call for ServiceId:{}", serviceId); + } GetInstancesRequest req = createSelectAllReq(serviceId, request, true); try { return PolarisFutureUtil.toCompletableFuture(polarisAPI.asyncGetInstances(req),