wangli/pokonyan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-1359' into dev

Browse Source
This commit is contained in:
zhansihu 2023-11-13 10:13:18 +08:00
commit d1e0060ffa
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/cn/axzo/pokonyan/filter/TraceIdFilter.java
View File

@ -3,11 +3,8 @@ package cn.axzo.pokonyan.filter;
import cn.axzo.pokonyan.util.ExceptionUtil;
import cn.axzo.pokonyan.wrapper.BodyReaderHttpServletRequestWrapper;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import com.google.common.base.Strings;
import lombok.extern.slf4j.Slf4j;
import org.apache.skywalking.apm.toolkit.trace.TraceContext;
import org.slf4j.MDC;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.core.annotation.Order;
@ -19,7 +16,6 @@ import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.UUID;
@ -69,10 +65,8 @@ public class TraceIdFilter extends OncePerRequestFilter {
String traceId = StrUtil.blankToDefault(request.getHeader(CTX_LOG_ID),
StrUtil.blankToDefault(request.getHeader(TRACE_ID),
request.getHeader(X_REQUEST_ID)));
//skywalking or new
traceId = StrUtil.blankToDefault(traceId,
StrUtil.blankToDefault(TraceContext.traceId(),
UUID.randomUUID().toString().replaceAll("-", "") ));
// blank to new
traceId = StrUtil.blankToDefault(traceId, UUID.randomUUID().toString().replaceAll("-", ""));
//set
MDC.put(TRACE_ID, traceId);
MDC.put(CTX_LOG_ID, traceId);