Merge branch 'bugfix/ZSTAC-82275' into '5.5.12'

PandaWuu · PandaWuu · commit 72ce6ef30802 · 2026-02-16T14:11:05.000Z
&lt;fix&gt;[thread]: guard Context.current() with telemetry check

See merge request zstackio/zstack!9202
diff --git a/core/src/main/java/org/zstack/core/thread/DispatchQueueImpl.java b/core/src/main/java/org/zstack/core/thread/DispatchQueueImpl.java
@@ -302,7 +302,7 @@ private class SyncTaskFuture<T> extends AbstractFuture<T> {
 
         public SyncTaskFuture(SyncTask<T> task) {
             super(task);
-            this.parentContext = Context.current();
+            this.parentContext = isTelemetryEnabled() ? Context.current() : null;
         }
 
         private SyncTask getTask() {

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ private class SyncTaskFuture<T> extends AbstractFuture<T> {`
`302`	`302`
`303`	`303`	`public SyncTaskFuture(SyncTask<T> task) {`
`304`	`304`	`super(task);`
`305`		`- this.parentContext = Context.current();`
	`305`	`+ this.parentContext = isTelemetryEnabled() ? Context.current() : null;`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`private SyncTask getTask() {`