日志添加请求ID

This commit is contained in:
2025-07-23 10:18:45 +08:00
parent 9260dd9088
commit 14628f35fb
4 changed files with 26 additions and 31 deletions
@@ -1,5 +1,5 @@
package com.fangjia.core.util;
public enum ThreadLocalKey {
ServerArea, AnalyticsDetail, Ip, RequestUrl, DisableCache, RefererUrl, DaoExecuteCounter, FromSpider, UserId,FpkCity,FpkLat,FpkLng
ServerArea, AnalyticsDetail, Ip, RequestUrl, DisableCache, RefererUrl, DaoExecuteCounter, FromSpider, UserId,FpkCity,FpkLat,FpkLng,RequestId,
}
@@ -1,32 +1,7 @@
package com.fangjia.open.filters;
import java.io.IOException;
import java.util.Calendar;
import java.util.Date;
import java.util.Timer;
import java.util.TimerTask;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.fangjia.core.Constants;
import com.mongodb.*;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
import org.bson.types.ObjectId;
import org.slf4j.Logger;
import org.sothis.web.mvc.ActionContext;
import com.fangjia.core.util.AnalyticsUtil;
import com.fangjia.core.util.DateUtil;
import com.fangjia.core.util.ExecuteCounter;
import com.fangjia.core.util.LoggerFactory;
import com.fangjia.core.util.ThreadLocalData;
import com.fangjia.core.util.ThreadLocalKey;
@@ -35,6 +10,21 @@ import com.fangjia.open.util.OpenCookieContext;
import com.fangjia.service.cnAnalyzer.CnDictionary;
import com.fangjia.service.common.CookieName;
import com.fangjia.service.dbip.IPSeeker;
import com.mongodb.*;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
import org.bson.types.ObjectId;
import org.slf4j.Logger;
import org.apache.log4j.MDC;
import javax.servlet.*;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Calendar;
import java.util.Date;
import java.util.Timer;
import java.util.TimerTask;
public class AnalyticsFilter implements Filter {
private static final Logger LOGGER = LoggerFactory.getLogger(AnalyticsFilter.class);
@@ -57,6 +47,7 @@ public class AnalyticsFilter implements Filter {
realDoFilter(request, response, chain);
} finally {
ThreadLocalData.getInstance().clear();
MDC.remove("trace_id"); // ÇåÀí
}
}
@@ -72,11 +63,15 @@ public class AnalyticsFilter implements Filter {
final ThreadLocalData threadLocalData = ThreadLocalData.getInstance();
threadLocalData.put(ThreadLocalKey.RequestUrl, requestUrl + queryString);
threadLocalData.put(ThreadLocalKey.RefererUrl, request.getHeader("referer"));
if(StringUtils.isNotBlank(request.getHeader("X-Request-Id"))){
MDC.put("trace_id", request.getHeader("X-Request-Id"));
}else{
MDC.put("trace_id", "*");
}
if ("1".equals(request.getParameter("__refresh_cache"))) {
threadLocalData.put(ThreadLocalKey.DisableCache, "1");
}
//createUID(request, response);
//createSID(request, response);
response.addHeader("Access-Control-Allow-Origin", "*");
response.addHeader("Access-Control-Allow-Methods", "*");
chain.doFilter(request, response);
@@ -8,7 +8,7 @@
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="[%d{MMdd HH:mm:ss SSS\} %-5p] [%t] %c{3\} - %m%n" />
<param name="ConversionPattern" value="[%X{trace_id}] [%d{MMdd HH:mm:ss SSS\} %-5p] [%t] %c{3\} - %m%n" />
</layout>
</appender>
@@ -10,7 +10,7 @@
<param name="File" value="/home/goojia/logs/open.log" />
<param name="DatePattern" value="'.'yyyy-MM-dd'.log'" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="[%d{MMdd HH:mm:ss SSS\} %-5p] [%t] %c{3\} - %m%n" />
<param name="ConversionPattern" value="[%d{MMdd HH:mm:ss SSS\} %-5p] [%X{trace_id}] [%t] %c{3\} - %m%n" />
</layout>
</appender>
@@ -22,7 +22,7 @@
<param name="File" value="/home/goojia/logs/performance.open.log" />
<param name="DatePattern" value="'.'yyyy-MM-dd'.log'" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="[%d{MMdd HH:mm:ss SSS\} %-5p] [%t] %c{3\} - %m%n" />
<param name="ConversionPattern" value="[%d{MMdd HH:mm:ss SSS\} %-5p] [%X{trace_id}] [%t] %c{3\} - %m%n" />
</layout>
</appender>