From 2224b715be6877f528a7c4ffe8da2d281b786e41 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Thu, 29 Sep 2022 20:28:44 +0300
Subject: [PATCH] Improve logging for delayed message updates.

---
 telegram-bot-api/Client.cpp | 33 +++++++++++++++++++++++++++++----
 telegram-bot-api/Client.h   |  7 +++++++
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/telegram-bot-api/Client.cpp b/telegram-bot-api/Client.cpp
index 5877149..04da384 100644
--- a/telegram-bot-api/Client.cpp
+++ b/telegram-bot-api/Client.cpp
@@ -6750,7 +6750,8 @@ td::Result<td::vector<td_api::object_ptr<td_api::InputMessageContent>>> Client::
   return std::move(contents);
 }
 
-td::Result<td_api::object_ptr<td_api::inputMessageInvoice>> Client::get_input_message_invoice(const Query *query) const {
+td::Result<td_api::object_ptr<td_api::inputMessageInvoice>> Client::get_input_message_invoice(
+    const Query *query) const {
   TRY_RESULT(title, get_required_string_arg(query, "title"));
   TRY_RESULT(description, get_required_string_arg(query, "description"));
   TRY_RESULT(payload, get_required_string_arg(query, "payload"));
@@ -10114,12 +10115,36 @@ void Client::process_new_message_queue(int64 chat_id) {
     }
 
     int32 message_date = message->edit_date_ == 0 ? message->date_ : message->edit_date_;
+    if (delayed_update_count_ > 0 && (update_type != delayed_update_type_ || chat_id != delayed_chat_id_)) {
+      if (delayed_update_count_ == 1) {
+        LOG(ERROR) << "Receive very old update " << get_update_type_name(delayed_update_type_) << " sent at "
+                   << delayed_min_date_ << " in chat " << delayed_chat_id_ << " with a delay of " << delayed_max_time_
+                   << " seconds";
+      } else {
+        LOG(ERROR) << "Receive " << delayed_update_count_ << " very old updates "
+                   << get_update_type_name(delayed_update_type_) << " sent from " << delayed_min_date_ << " to "
+                   << delayed_max_date_ << " in chat " << delayed_chat_id_ << " with a delay up to "
+                   << delayed_max_time_ << " seconds";
+      }
+      delayed_update_count_ = 0;
+    }
     auto now = get_unix_time();
     auto update_delay_time = now - td::max(message_date, parameters_->shared_data_->get_unix_time(webhook_set_time_));
     const auto UPDATE_DELAY_WARNING_TIME = 10 * 60;
-    LOG_IF(ERROR, update_delay_time > UPDATE_DELAY_WARNING_TIME)
-        << "Receive very old update " << get_update_type_name(update_type) << " sent at " << message_date << " to chat "
-        << chat_id << " with a delay of " << update_delay_time << " seconds: " << to_string(message);
+    if (update_delay_time > UPDATE_DELAY_WARNING_TIME && message_date > last_synchronization_error_date_ + 60) {
+      if (delayed_update_count_ == 0) {
+        delayed_update_type_ = update_type;
+        delayed_chat_id_ = chat_id;
+        delayed_min_date_ = message_date;
+        delayed_max_date_ = message_date;
+        delayed_max_time_ = update_delay_time;
+      } else {
+        delayed_min_date_ = td::min(message_date, delayed_min_date_);
+        delayed_max_date_ = td::max(message_date, delayed_max_date_);
+        delayed_max_time_ = td::max(update_delay_time, delayed_max_time_);
+      }
+      delayed_update_count_++;
+    }
     auto left_time = message_date + 86400 - now;
     add_message(std::move(message));
 
diff --git a/telegram-bot-api/Client.h b/telegram-bot-api/Client.h
index cc0fa4c..1e31abc 100644
--- a/telegram-bot-api/Client.h
+++ b/telegram-bot-api/Client.h
@@ -1059,6 +1059,13 @@ class Client final : public WebhookActor::Callback {
 
   td::uint64 webhook_generation_ = 1;
 
+  UpdateType delayed_update_type_ = UpdateType::Size;
+  int64 delayed_chat_id_ = 0;
+  int32 delayed_min_date_ = 0;
+  int32 delayed_max_date_ = 0;
+  int32 delayed_max_time_ = 0;
+  size_t delayed_update_count_ = 0;
+
   std::shared_ptr<const ClientParameters> parameters_;
 
   td::ActorId<BotStatActor> stat_actor_;