From 225fa712204ccb8953998a0e4cc64ad828399dc3 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 22 二月 2022 15:52:16 +0800
Subject: [PATCH] 加入微信通知功能
---
java110-core/src/main/java/com/java110/core/trace/Java110TraceFactory.java | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/trace/Java110TraceFactory.java b/java110-core/src/main/java/com/java110/core/trace/Java110TraceFactory.java
index 19c2e42..57db2b3 100644
--- a/java110-core/src/main/java/com/java110/core/trace/Java110TraceFactory.java
+++ b/java110-core/src/main/java/com/java110/core/trace/Java110TraceFactory.java
@@ -8,6 +8,7 @@
import com.java110.dto.trace.TraceEndpointDto;
import com.java110.dto.trace.TraceParamDto;
import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.constant.EnvironmentConstant;
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.kafka.KafkaFactory;
import com.java110.utils.util.DateUtil;
@@ -96,7 +97,7 @@
return threadLocal.get();
}
- public static String createTrace(String name, Map<String, Object> headers, String reqData) {
+ public static String createTrace(String name, Map<String, Object> headers) {
String traceId = "";
String parentId = "";
if (headers.containsKey(CommonConstant.TRACE_ID)) { //鍏堝彇trace Id
@@ -111,11 +112,17 @@
} else {
parentId = "0";
}
- return createTrace(name, traceId, parentId, TraceAnnotationsDto.VALUE_CLIENT_SEND, JSONObject.toJSONString(headers), reqData);
+ return createTrace(name, traceId, parentId, TraceAnnotationsDto.VALUE_CLIENT_SEND);
}
- public static String createTrace(String name, String traceId, String parentId, String event, String reqHeader, String reqData) {
+ public static String createTrace(String name, String traceId, String parentId, String event) {
+ //鍒濆浜嬩欢
+ Environment environment = (Environment) ApplicationContextFactory.getBean(Environment.class);
+ //鍒ゆ柇璋冪敤閾炬槸鍚︽墦寮�
+ if (!EnvironmentConstant.TRACE_SWITCH_ON.equals(environment.getProperty(EnvironmentConstant.TRACE_SWITCH))) {
+ return "";
+ }
//鍏ㄥ眬浜嬪姟寮�鍚��
TraceDto traceDto = new TraceDto();
traceDto.setId(GenerateCodeFactory.getUUID());
@@ -123,8 +130,6 @@
traceDto.setParentSpanId(parentId);
traceDto.setTimestamp(DateUtil.getCurrentDate().getTime());
- //鍒濆浜嬩欢
- Environment environment = (Environment) ApplicationContextFactory.getBean(Environment.class);
TraceAnnotationsDto traceAnnotationsDto = new TraceAnnotationsDto();
TraceEndpointDto traceEndpointDto = new TraceEndpointDto();
traceEndpointDto.setServiceName(environment.getProperty("spring.application.name"));
@@ -147,16 +152,34 @@
traceDto.setAnnotations(traceAnnotationsDtos);
traceDto.setTraceId(traceId);
- TraceParamDto traceParamDto = new TraceParamDto();
- traceParamDto.setReqHeader(reqHeader);
- traceParamDto.setReqParam(reqData);
-
put(traceDto.getId(), traceDto);
putSpanId(SPAN_ID, traceDto.getId());
return traceDto.getId();
}
/**
+ * 娣诲姞鍙傛暟
+ *
+ * @param traceParamDto
+ */
+ public static void putParams(TraceParamDto traceParamDto) {
+ TraceDto traceDto = getTraceDto();
+
+ if (traceDto == null) {
+ return;
+ }
+
+ //濡傛灉瀛樺湪 鍒欒烦杩�
+ if (traceDto.getParam() != null) {
+ return;
+ }
+
+ traceDto.setParam(traceParamDto);
+ put(getSpanId(SPAN_ID), traceDto);
+
+ }
+
+ /**
* 娣诲姞鍔ㄤ綔鏃堕棿
*
* @param event
--
Gitblit v1.8.0