@@ -208,12 +208,16 @@ class TKqpExecuterBase : public TActor<TDerived> {
208208 KqpTableResolverId = {};
209209
210210 if (reply.Status != Ydb::StatusIds::SUCCESS) {
211- ExecuterStateSpan.EndError (TStringBuilder () << Ydb::StatusIds_StatusCode_Name (reply.Status ));
211+ if (ExecuterStateSpan) {
212+ ExecuterStateSpan.EndError (TStringBuilder () << Ydb::StatusIds_StatusCode_Name (reply.Status ));
213+ }
212214 ReplyErrorAndDie (reply.Status , reply.Issues );
213215 return false ;
214216 }
215217
216- ExecuterStateSpan.EndOk ();
218+ if (ExecuterStateSpan) {
219+ ExecuterStateSpan.EndOk ();
220+ }
217221
218222 return true ;
219223 }
@@ -227,14 +231,18 @@ class TKqpExecuterBase : public TActor<TDerived> {
227231 // TODO: count resolve time in CpuTime
228232
229233 if (reply.Status != Ydb::StatusIds::SUCCESS) {
230- ExecuterStateSpan.EndError (Ydb::StatusIds_StatusCode_Name (reply.Status ));
234+ if (ExecuterStateSpan) {
235+ ExecuterStateSpan.EndError (Ydb::StatusIds_StatusCode_Name (reply.Status ));
236+ }
231237
232238 LOG_W (" Shards nodes resolve failed, status: " << Ydb::StatusIds_StatusCode_Name (reply.Status )
233239 << " , issues: " << reply.Issues .ToString ());
234240 ReplyErrorAndDie (reply.Status , reply.Issues );
235241 return false ;
236242 }
237- ExecuterStateSpan.EndOk ();
243+ if (ExecuterStateSpan) {
244+ ExecuterStateSpan.EndOk ();
245+ }
238246
239247 LOG_D (" Shards nodes resolved, success: " << reply.ShardNodes .size () << " , failed: " << reply.Unresolved );
240248
@@ -970,7 +978,7 @@ class TKqpExecuterBase : public TActor<TDerived> {
970978 settings.MutableMvccSnapshot ()->SetTxId (GetSnapshot ().TxId );
971979 }
972980 if (!settings.GetInconsistentTx () && TasksGraph.GetMeta ().LockMode ) {
973- settings.SetLockMode (*TasksGraph.GetMeta ().LockMode );
981+ settings.SetLockMode (*TasksGraph.GetMeta ().LockMode );
974982 }
975983
976984 output.SinkSettings .ConstructInPlace ();
@@ -1858,8 +1866,12 @@ class TKqpExecuterBase : public TActor<TDerived> {
18581866
18591867 LWTRACK (KqpBaseExecuterReplyErrorAndDie, ResponseEv->Orbit , TxId);
18601868
1861- ExecuterSpan.EndError (response.DebugString ());
1862- ExecuterStateSpan.EndError (response.DebugString ());
1869+ if (ExecuterSpan) {
1870+ ExecuterSpan.EndError (response.DebugString ());
1871+ }
1872+ if (ExecuterStateSpan) {
1873+ ExecuterStateSpan.EndError (response.DebugString ());
1874+ }
18631875
18641876 this ->Shutdown ();
18651877 }
0 commit comments