Skip to content

feat: optimize debug log #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wardseptember wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: optimize debug log #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...container-default/src/main/java/com/tencent/trpc/container/config/system/Environment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ public Map<String, Object> 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;
Expand Down
11 changes: 8 additions & 3 deletions trpc-core/src/main/java/com/tencent/trpc/core/cluster/RpcClusterClientManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -107,8 +110,10 @@ private static ScheduledFuture<?> startRpcClientCleaner() {
public static void scanUnusedClient() {
Map<BackendConfig, List<RpcClient>> 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)) {
Expand Down
2 changes: 0 additions & 2 deletions trpc-core/src/main/java/com/tencent/trpc/core/cluster/def/DefClusterInvoker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}

Expand Down
4 changes: 3 additions & 1 deletion trpc-core/src/main/java/com/tencent/trpc/core/common/LifecycleBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 3 additions & 1 deletion trpc-core/src/main/java/com/tencent/trpc/core/common/config/BackendConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 4 additions & 2 deletions trpc-core/src/main/java/com/tencent/trpc/core/extension/ExtensionClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
13 changes: 8 additions & 5 deletions trpc-core/src/main/java/com/tencent/trpc/core/filter/ProviderFilterInvoker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
: Stream.of(new ProviderInvokerHeadFilter(), new ProviderInvokerTailFilter());
List<Filter> 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);
Expand All @@ -68,12 +67,16 @@
@Override
public CompletionStage<Response> 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={})",

Check warning on line 71 in trpc-core/src/main/java/com/tencent/trpc/core/filter/ProviderFilterInvoker.java

View workflow job for this annotation

GitHub Actions / checkstyle 

[checkstyle] reported by reviewdog 🐶
本行字符数 122个，最多：120个。

Raw Output:
/github/workspace/./trpc-core/src/main/java/com/tencent/trpc/core/filter/ProviderFilterInvoker.java:71:0: warning: 本行字符数 122个，最多：120个。 (com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck)
filter.getClass(), inv.getRpcServiceName(), inv.getRpcMethodName());
}

CompletionStage<Response> f = filter.filter(before, request);
logger.debug("<<<After Invoke provider filter(service={}, rpcServiceName={},rpcMehthodName={})",
filter.getClass(), inv.getRpcServiceName(), inv.getRpcMethodName());
if (logger.isDebugEnabled()) {
logger.debug("<<<After Invoke provider filter(service={}, rpcServiceName={},rpcMehthodName={})",
filter.getClass(), inv.getRpcServiceName(), inv.getRpcMethodName());
}

PreconditionUtils.checkArgument(f != null,
"Invoke provider filter(service=%s, rpcServiceName=%s,rpcMehthodName=%s) return Null",
Expand Down
8 changes: 6 additions & 2 deletions trpc-core/src/main/java/com/tencent/trpc/core/trace/TracerClientFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ public CompletionStage<Response> 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);
}
Expand All @@ -59,7 +61,9 @@ public CompletionStage<Response> 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);
}
Expand Down
18 changes: 13 additions & 5 deletions trpc-core/src/main/java/com/tencent/trpc/core/trace/TracerFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand All @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down
8 changes: 6 additions & 2 deletions trpc-core/src/main/java/com/tencent/trpc/core/trace/TracerServerFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ public CompletionStage<Response> 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);
}
Expand All @@ -74,7 +76,9 @@ public CompletionStage<Response> 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);
}
Expand Down
6 changes: 4 additions & 2 deletions trpc-core/src/main/java/com/tencent/trpc/core/transport/AbstractClientTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,10 @@ protected CompletionStage<Channel> 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
Expand Down
4 changes: 3 additions & 1 deletion trpc-core/src/main/java/com/tencent/trpc/core/transport/handler/ChannelHandlerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
4 changes: 3 additions & 1 deletion ...entinel/src/main/java/com/tencent/trpc/limiter/sentinel/filter/SentinelLimiterFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ...rpc-proto-http/src/main/java/com/tencent/trpc/proto/http/server/AbstractHttpExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}

/**
Expand Down
3 changes: 0 additions & 3 deletions ...trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/server/DefaultHttpExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 3 additions & 1 deletion ...to-standard/src/main/java/com/tencent/trpc/proto/standard/stream/TRpcStreamResponder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion ...rd/src/main/java/com/tencent/trpc/proto/standard/stream/client/StreamConsumerInvoker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,9 @@ private Object doInvoke(Request request, TRpcStreamRequester requester, RpcConne
AtomicInteger unFinished = new AtomicInteger(STREAM_CLOSE_COUNT_BOTH_DIRECTION);
Consumer<SignalType> 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();
}
};
Expand Down
10 changes: 7 additions & 3 deletions ...api/src/main/java/com/tencent/trpc/registry/center/AbstractFailedRetryRegistryCenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
}
Expand All @@ -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);
})
);
Expand Down
Loading