From c6eb18e839cb6321aeaf8c2ef128b1dcc3896063 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Wed, 22 Nov 2023 18:34:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96skywalking?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/api/filter/LogMdcConfiguration.java  | 19 +++++++++++++------
 .../src/main/resources/bootstrap-dev.yml      |  4 +++-
 2 files changed, 16 insertions(+), 7 deletions(-)

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 d46f8fe..519af33 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
@@ -6,6 +6,7 @@ import org.apache.skywalking.apm.toolkit.trace.Trace;
 import org.apache.skywalking.apm.toolkit.trace.TraceContext;
 import org.apache.skywalking.apm.toolkit.trace.Tracer;
 import org.apache.skywalking.apm.toolkit.webflux.WebFluxSkyWalkingOperators;
+import org.apache.skywalking.apm.toolkit.webflux.WebFluxSkyWalkingTraceContext;
 import org.reactivestreams.Subscription;
 import org.slf4j.MDC;
 import org.springframework.context.annotation.Configuration;
@@ -30,12 +31,7 @@ public class LogMdcConfiguration {
     @PostConstruct
     public void contextOperatorHook() {
         Hooks.onEachOperator(Log4Constans.PRINT_LOG_ID, Operators.lift((r, c) ->{
-            Context ctx = c.currentContext();
 
-            if(ctx.hasKey(Log4Constans.PRINT_LOG_ID)){
-                MDC.put(Log4Constans.PRINT_LOG_ID, ctx.get(Log4Constans.PRINT_LOG_ID));
-                //Tracer.createLocalSpan(Log4Constans.PRINT_LOG_ID);
-            }
             return new MdcContextSubscriber(c);
 
         }));
@@ -81,8 +77,19 @@ public class LogMdcConfiguration {
 
         @Override
         public void onNext(T t) {
+            Context ctx = currentContext();
 
-            coreSubscriber.onNext(t);
+            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/resources/bootstrap-dev.yml b/iot-modules/iot-box-user-api/src/main/resources/bootstrap-dev.yml
index 8d8e33d..7ca5694 100644
--- a/iot-modules/iot-box-user-api/src/main/resources/bootstrap-dev.yml
+++ b/iot-modules/iot-box-user-api/src/main/resources/bootstrap-dev.yml
@@ -39,4 +39,6 @@ spring:
     host: 192.168.8.146
     port: 32030
     password: 123456
-    timeout: 5000
\ No newline at end of file
+    timeout: 5000
+logging:
+  config: classpath:logback-spring.xml
\ No newline at end of file