diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogMdcConfiguration.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogMdcConfiguration.java index e8af576..a07a44c 100644 --- a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogMdcConfiguration.java +++ b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogMdcConfiguration.java @@ -81,15 +81,10 @@ public class LogMdcConfiguration { if(ctx.hasKey(Log4Constans.PRINT_LOG_ID)){ MDC.put(Log4Constans.PRINT_LOG_ID, ctx.get(Log4Constans.PRINT_LOG_ID)); - //String requestId = WebFluxSkyWalkingTraceContext.traceId(); - //Tracer.createLocalSpan(Log4Constans.PRINT_LOG_ID); - - // return; } WebFluxSkyWalkingOperators.continueTracing(ctx, () ->{ coreSubscriber.onNext(t); }); - //coreSubscriber.onNext(t); } diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogWebFilter.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogWebFilter.java index d6718ee..2bdc28a 100644 --- a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogWebFilter.java +++ b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogWebFilter.java @@ -42,11 +42,11 @@ import java.nio.charset.StandardCharsets; public class LogWebFilter implements WebFilter { @Override public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { - //Tracer.stopSpan(); - //Tracer.createEntrySpan(Log4Constans.PRINT_LOG_ID, null); + + long startTime = System.currentTimeMillis(); ServerHttpRequest request = exchange.getRequest(); - String requestId = WebFluxSkyWalkingTraceContext.traceId(exchange); + String requestId = WebFluxSkyWalkingTraceContext.segmentId(exchange); log.info("获取到的traceId:{}", requestId); //String pid = WebFluxSkyWalkingTraceContext.getCorrelation(exchange, Log4Constans.PRINT_LOG_ID).get(); //log.info("获取到的pid:{}", pid); @@ -87,41 +87,52 @@ public class LogWebFilter implements WebFilter { return contextTmp; }).doFinally(signalType -> { - long endTime = System.currentTimeMillis(); - MDC.put(Log4Constans.PRINT_LOG_ID, tracId); - log.info("api end time:{}, total time:{}", endTime, endTime - startTime); - //Tracer.stopSpan(); - MDC.remove(Log4Constans.PRINT_LOG_ID); - }).contextWrite(ctx -> { - Context contextTmp = ctx.put(Log4Constans.PRINT_LOG_ID, tracId); - return contextTmp; + WebFluxSkyWalkingOperators.continueTracing(newEx, () -> { + long endTime = System.currentTimeMillis(); + MDC.put(Log4Constans.PRINT_LOG_ID, tracId); + log.info("api end time:{}, total time:{}", endTime, endTime - startTime); + MDC.remove(Log4Constans.PRINT_LOG_ID); + }); + }); } private ServerHttpRequest getRequest(ServerWebExchange exchange){ ServerHttpRequest request = exchange.getRequest(); - return new ServerHttpRequestDecorator(request){ - @Override - public Flux getBody() { - Flux body = this.getDelegate().getBody(); - return body.map(dataBuffer -> { - if(!request.getMethod().equals(HttpMethod.GET) && !request.getMethod().equals(HttpMethod.DELETE)) { - log.info("request:{}", dataBuffer.toString(StandardCharsets.UTF_8)); - } - return dataBuffer; - }); - } + return WebFluxSkyWalkingOperators.continueTracing(exchange, () -> { + return new ServerHttpRequestDecorator(request) { + @Override + public Flux getBody() { + Flux body = this.getDelegate().getBody(); + return body.map(dataBuffer -> { + if (/*!request.getMethod().equals(HttpMethod.GET) && */!request.getMethod().equals(HttpMethod.DELETE)) { + log.info("request:{}", dataBuffer.toString(StandardCharsets.UTF_8)); + } + return dataBuffer; + }); + } +/* + @Override + public HttpHeaders getHeaders() { + HttpHeaders httpHeaders = new HttpHeaders(); + httpHeaders.putAll(super.getHeaders()); + //httpHeaders.set("sw8", "customerIp");//sklwaking传过来的 + //httpHeaders.set(Log4Constans.HEADER_TRACE_ID, tracId); + log.info("获取头信息"); + return httpHeaders; + } + + @Override + public String getMethodValue() { + log.info("获取方法"); + return super.getMethodValue(); + }; +*/ + + }; + }); - /*@Override - public HttpHeaders getHeaders(){ - HttpHeaders httpHeaders = new HttpHeaders(); - httpHeaders.putAll(super.getHeaders()); - httpHeaders.set("sw8", "customerIp");//sklwaking传过来的 - //httpHeaders.set(Log4Constans.HEADER_TRACE_ID, tracId); - return httpHeaders; - }*/ - }; } diff --git a/iot-modules/iot-box-websocket-api/src/main/resources/logback-dev.xml b/iot-modules/iot-box-websocket-api/src/main/resources/logback-dev.xml index 541b0e4..bf25967 100644 --- a/iot-modules/iot-box-websocket-api/src/main/resources/logback-dev.xml +++ b/iot-modules/iot-box-websocket-api/src/main/resources/logback-dev.xml @@ -41,7 +41,7 @@ - ${log.path}/wran.%d{yyyy-MM-dd}.log + ${log.path}/warn.%d{yyyy-MM-dd}.log 60 diff --git a/iot-modules/iot-box-websocket-api/src/main/resources/logback-prod.xml b/iot-modules/iot-box-websocket-api/src/main/resources/logback-prod.xml index 67ef861..6d38826 100644 --- a/iot-modules/iot-box-websocket-api/src/main/resources/logback-prod.xml +++ b/iot-modules/iot-box-websocket-api/src/main/resources/logback-prod.xml @@ -41,7 +41,7 @@ - ${log.path}/wran.%d{yyyy-MM-dd}.log + ${log.path}/warn.%d{yyyy-MM-dd}.log 60