99import java .util .ArrayList ;
1010import java .util .List ;
1111import java .util .Map ;
12- import java .util .Set ;
1312import java .util .UUID ;
1413import java .util .concurrent .ConcurrentHashMap ;
1514
@@ -35,9 +34,6 @@ public class EventTraceContext {
3534 */
3635 private static final Object TRANSACTION_TRACE_KEY = new Object ();
3736
38- // trace key,异步事件由线程池线程并发读写,需使用并发容器
39- private final Set <String > traceKeys = ConcurrentHashMap .newKeySet ();
40-
4137 // 当前线程正在执行的事件 key(traceId#random)
4238 private final ThreadLocal <String > threadLocal = new ThreadLocal <>();
4339
@@ -54,9 +50,7 @@ private EventTraceContext() {
5450 * 创建一个全新的 traceId。
5551 */
5652 String newTrace () {
57- String traceId = UUID .randomUUID ().toString ().replaceAll ("-" , "" );
58- traceKeys .add (traceId );
59- return traceId ;
53+ return UUID .randomUUID ().toString ().replaceAll ("-" , "" );
6054 }
6155
6256 /**
@@ -71,7 +65,11 @@ String getOrCreateTrace() {
7165 if (batchTrace != null ) {
7266 return batchTrace ;
7367 }
74- if (TransactionSynchronizationManager .isActualTransactionActive ()) {
68+ // registerSynchronization 要求 synchronization 处于激活状态;
69+ // isActualTransactionActive() 为 true 但 synchronization 未激活时(如
70+ // SYNCHRONIZATION_NEVER 的事务管理器)必须回退,否则抛 IllegalStateException 打断业务。
71+ if (TransactionSynchronizationManager .isActualTransactionActive ()
72+ && TransactionSynchronizationManager .isSynchronizationActive ()) {
7573 return getOrCreateTransactionTrace ();
7674 }
7775 return newTrace ();
@@ -87,12 +85,18 @@ private String getOrCreateTransactionTrace() {
8785 }
8886 String traceId = newTrace ();
8987 TransactionSynchronizationManager .bindResource (TRANSACTION_TRACE_KEY , traceId );
90- TransactionSynchronizationManager .registerSynchronization (new TransactionSynchronization () {
91- @ Override
92- public void afterCompletion (int status ) {
93- TransactionSynchronizationManager .unbindResourceIfPossible (TRANSACTION_TRACE_KEY );
94- }
95- });
88+ try {
89+ TransactionSynchronizationManager .registerSynchronization (new TransactionSynchronization () {
90+ @ Override
91+ public void afterCompletion (int status ) {
92+ TransactionSynchronizationManager .unbindResourceIfPossible (TRANSACTION_TRACE_KEY );
93+ }
94+ });
95+ } catch (IllegalStateException e ) {
96+ // 防御:synchronization 在并发边界失效时解绑资源并回退为独立 trace,绝不影响业务操作
97+ TransactionSynchronizationManager .unbindResourceIfPossible (TRANSACTION_TRACE_KEY );
98+ return newTrace ();
99+ }
96100 return traceId ;
97101 }
98102
@@ -143,7 +147,6 @@ void checkEventState() {
143147 Boolean state = eventKeyState .get (eventKey );
144148 if (state != null && !state ) {
145149 String traceId = eventKey .split ("#" )[0 ];
146- traceKeys .remove (traceId );
147150 EventStackContext .getInstance ().remove (traceId );
148151 }
149152 eventKeyState .remove (eventKey );
@@ -160,7 +163,6 @@ void checkEventState() {
160163 void addEvent (String traceId , IEvent event ) {
161164 if (isNestedPush () && EventStackContext .getInstance ().checkEventLoop (traceId , event )) {
162165 List <Class <?>> stack = EventStackContext .getInstance ().getEventClasses (traceId );
163- traceKeys .remove (traceId );
164166 EventStackContext .getInstance ().remove (traceId );
165167 eventKeyState .remove (traceId );
166168 threadLocal .remove ();
@@ -176,7 +178,6 @@ public void clearTrace() {
176178 String eventKey = threadLocal .get ();
177179 if (eventKey != null ) {
178180 String traceId = eventKey .split ("#" )[0 ];
179- traceKeys .remove (traceId );
180181 EventStackContext .getInstance ().remove (traceId );
181182 eventKeyState .remove (eventKey );
182183 threadLocal .remove ();
0 commit comments