From 6259166c380d443c7b03184452833121942cb148 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 20 二月 2022 14:48:58 +0800
Subject: [PATCH] 调用链加入 开关
---
java110-core/src/main/java/com/java110/core/trace/Java110TraceFactory.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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..1e782d9 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
@@ -6,8 +6,8 @@
import com.java110.dto.trace.TraceAnnotationsDto;
import com.java110.dto.trace.TraceDto;
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 +96,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 +111,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 +129,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"));
@@ -146,10 +150,6 @@
traceAnnotationsDtos.add(traceAnnotationsDto);
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());
--
Gitblit v1.8.0