From eb513593a779c7b149a3b89751279d68887f47fb Mon Sep 17 00:00:00 2001 From: diaobisong Date: Fri, 22 Mar 2024 14:02:14 +0800 Subject: [PATCH] modify trace dara --- .../com/java3y/austin/common/domain/SimpleAnchorInfo.java | 5 +++++ .../handler/receiver/service/impl/ConsumeServiceImpl.java | 2 +- .../com/java3y/austin/web/service/impl/DataServiceImpl.java | 2 +- .../java/com/java3y/austin/web/utils/AnchorStateUtils.java | 6 +++--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/austin-common/src/main/java/com/java3y/austin/common/domain/SimpleAnchorInfo.java b/austin-common/src/main/java/com/java3y/austin/common/domain/SimpleAnchorInfo.java index 4faf775..63d6c46 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/domain/SimpleAnchorInfo.java +++ b/austin-common/src/main/java/com/java3y/austin/common/domain/SimpleAnchorInfo.java @@ -32,4 +32,9 @@ public class SimpleAnchorInfo { * 生成时间 */ private long timestamp; + + /** + * 消息id + */ + private String messageId; } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/service/impl/ConsumeServiceImpl.java b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/service/impl/ConsumeServiceImpl.java index 26b0509..c612f67 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/service/impl/ConsumeServiceImpl.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/service/impl/ConsumeServiceImpl.java @@ -95,7 +95,7 @@ public class ConsumeServiceImpl implements ConsumeService { * 1.构建userId维度的链路信息 数据结构list:{key,list} * key:userId,listValue:[{timestamp,state,businessId},{timestamp,state,businessId}] */ - SimpleAnchorInfo userAnchorInfo = SimpleAnchorInfo.builder().businessId(info.getBusinessId()).state(info.getState()).timestamp(info.getLogTimestamp()).build(); + SimpleAnchorInfo userAnchorInfo = SimpleAnchorInfo.builder().businessId(info.getBusinessId()).state(info.getState()).timestamp(info.getLogTimestamp()).messageId(info.getMessageId()).build(); for (String id : info.getIds()) { redisFutures.add(redisAsyncCommands.lpush(id.getBytes(), JSON.toJSONString(userAnchorInfo).getBytes())); redisFutures.add(redisAsyncCommands.expire(id.getBytes(), (DateUtil.endOfDay(new Date()).getTime() - DateUtil.current()) / 1000)); diff --git a/austin-web/src/main/java/com/java3y/austin/web/service/impl/DataServiceImpl.java b/austin-web/src/main/java/com/java3y/austin/web/service/impl/DataServiceImpl.java index 8057203..f438be1 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/service/impl/DataServiceImpl.java +++ b/austin-web/src/main/java/com/java3y/austin/web/service/impl/DataServiceImpl.java @@ -152,7 +152,7 @@ public class DataServiceImpl implements DataService { sb.append(StrPool.CRLF); } String startTime = DateUtil.format(new Date(simpleAnchorInfo.getTimestamp()), DatePattern.NORM_DATETIME_PATTERN); - String stateDescription = AnchorStateUtils.getDescriptionByState(messageTemplate.getSendChannel(), simpleAnchorInfo.getState()); + String stateDescription = AnchorStateUtils.getDescriptionByState(messageTemplate.getSendChannel(), simpleAnchorInfo.getState(), simpleAnchorInfo.getMessageId()); sb.append(startTime).append(StrPool.C_COLON).append(stateDescription).append("==>"); } diff --git a/austin-web/src/main/java/com/java3y/austin/web/utils/AnchorStateUtils.java b/austin-web/src/main/java/com/java3y/austin/web/utils/AnchorStateUtils.java index 336f310..62e4780 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/utils/AnchorStateUtils.java +++ b/austin-web/src/main/java/com/java3y/austin/web/utils/AnchorStateUtils.java @@ -8,10 +8,9 @@ import me.chanjar.weixin.common.error.WxCpErrorMsgEnum; import me.chanjar.weixin.common.error.WxMaErrorMsgEnum; import me.chanjar.weixin.common.error.WxMpErrorMsgEnum; - /** * @author 3y - * AnchorStateUtils + * AnchorStateUtils */ public class AnchorStateUtils { @@ -26,7 +25,7 @@ public class AnchorStateUtils { * @param state 点位状态码 * @return 点位描述 */ - public static String getDescriptionByState(Integer channel, Integer state) { + public static String getDescriptionByState(Integer channel, Integer state, String messageId) { String stateDescription = EnumUtil.getDescriptionByCode(state, AnchorState.class); // 如果 AnchorState 找不到对应的点位描述，那就是在对应渠道的点位信息 @@ -39,6 +38,7 @@ public class AnchorStateUtils { stateDescription = WxCpErrorMsgEnum.findMsgByCode(state); } } + stateDescription = String.join("", stateDescription, " [", messageId, "]"); return stateDescription; }