Intermediate changes

1 files changed, 10 insertions, 0 deletions

diff --git a/yt/yt/library/tracing/jaeger/tracer.cpp b/yt/yt/library/tracing/jaeger/tracer.cpp
index 0eab9a81f82..351ec787d45 100644
--- a/yt/yt/library/tracing/jaeger/tracer.cpp
+++ b/yt/yt/library/tracing/jaeger/tracer.cpp
@@ -550,6 +550,7 @@ void TJaegerTracer::Flush()
     DequeueAll(config);
 
     if (TInstant::Now() - LastSuccessfulFlushTime_ > config->QueueStallTimeout) {
+        YT_LOG_DEBUG("Queue stall timeout expired (QueueStallTimeout: %v)", config->QueueStallTimeout);
         DropFullQueue();
     }
 
@@ -571,6 +572,14 @@ void TJaegerTracer::Flush()
 
     std::stack<TString> toRemove;
     auto keys = ExtractKeys(BatchInfo_);
+
+    if (keys.empty()) {
+        YT_LOG_DEBUG("Span batch info is empty");
+        LastSuccessfulFlushTime_ = flushStartTime;
+        NotifyEmptyQueue();
+        return;
+    }
+
     for (const auto& endpoint : keys) {
         auto [batches, batchCount, spanCount] = PeekQueue(config, endpoint);
         if (batchCount <= 0) {
@@ -578,6 +587,7 @@ void TJaegerTracer::Flush()
                 toRemove.push(endpoint);
             }
             YT_LOG_DEBUG("Span queue is empty (Endpoint: %v)", endpoint);
+            LastSuccessfulFlushTime_ = flushStartTime;
             continue;
         }