feat: support millisecond in HttpRequest for lastSendTime (#1755)

alibaba · Sep 13, 2024 · 1c42ebd · 1c42ebd
1 parent 7a04991
commit 1c42ebd
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 12 deletions.
diff --git a/core/common/http/AsynCurlRunner.cpp b/core/common/http/AsynCurlRunner.cpp
@@ -14,11 +14,12 @@
 
 #include "common/http/AsynCurlRunner.h"
 
+#include <chrono>
+
 #include "app_config/AppConfig.h"
 #include "common/StringTools.h"
 #include "common/http/Curl.h"
 #include "logger/Logger.h"
-#include "monitor/LogtailAlarm.h"
 
 using namespace std;
 
@@ -95,7 +96,7 @@ bool AsynCurlRunner::AddRequestToClient(unique_ptr<AsynHttpRequest>&& request) {
 
     request->mPrivateData = headers;
     curl_easy_setopt(curl, CURLOPT_PRIVATE, request.get());
-    request->mLastSendTime = time(nullptr);
+    request->mLastSendTime = std::chrono::system_clock::now();
     auto res = curl_multi_add_handle(mClient, curl);
     if (res != CURLM_OK) {
         LOG_ERROR(sLogger,
@@ -182,8 +183,8 @@ void AsynCurlRunner::HandleCompletedRequests() {
             curl_easy_getinfo(handler, CURLINFO_PRIVATE, &request);
             LOG_DEBUG(sLogger,
                       ("send http request completed, request address",
-                       request)("response time", ToString(time(nullptr) - request->mLastSendTime))(
-                          "try cnt", ToString(request->mTryCnt)));
+                       request)("response time",ToString(chrono::duration_cast<chrono::milliseconds>(chrono::system_clock::now()- request->mLastSendTime).count()) + "ms")
+                      ("try cnt", ToString(request->mTryCnt)));
             switch (msg->data.result) {
                 case CURLE_OK: {
                     long statusCode = 0;

diff --git a/core/common/http/HttpRequest.h b/core/common/http/HttpRequest.h
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <chrono>
 #include <cstdint>
 #include <map>
 #include <string>
@@ -43,7 +44,7 @@ struct HttpRequest {
     uint32_t mMaxTryCnt = sDefaultMaxTryCnt;
 
     uint32_t mTryCnt = 1;
-    time_t mLastSendTime = 0;
+    std::chrono::system_clock::time_point mLastSendTime;
 
     HttpRequest(const std::string& method,
                 bool httpsFlag,

diff --git a/core/prometheus/async/PromHttpRequest.cpp b/core/prometheus/async/PromHttpRequest.cpp
@@ -1,5 +1,6 @@
 #include "prometheus/async/PromHttpRequest.h"
 
+#include <chrono>
 #include <cstdint>
 #include <string>
 
@@ -23,7 +24,8 @@ PromHttpRequest::PromHttpRequest(const std::string& method,
 }
 
 void PromHttpRequest::OnSendDone(const HttpResponse& response) {
-    mFuture->Process(response, mLastSendTime * 1000);
+    mFuture->Process(response,
+                     std::chrono::duration_cast<std::chrono::milliseconds>(mLastSendTime.time_since_epoch()).count());
 }
 
 [[nodiscard]] bool PromHttpRequest::IsContextValid() const {

diff --git a/core/runner/sink/http/HttpSink.cpp b/core/runner/sink/http/HttpSink.cpp
@@ -18,7 +18,6 @@
 #include "common/StringTools.h"
 #include "common/http/Curl.h"
 #include "logger/Logger.h"
-#include "monitor/LogtailAlarm.h"
 #include "pipeline/plugin/interface/HttpFlusher.h"
 #include "pipeline/queue/QueueKeyManager.h"
 #include "pipeline/queue/SenderQueueItem.h"
@@ -100,7 +99,8 @@ bool HttpSink::AddRequestToClient(std::unique_ptr<HttpSinkRequest>&& request) {
 
     request->mPrivateData = headers;
     curl_easy_setopt(curl, CURLOPT_PRIVATE, request.get());
-    request->mLastSendTime = time(nullptr);
+    request->mLastSendTime = std::chrono::system_clock::now();
+
     auto res = curl_multi_add_handle(mClient, curl);
     if (res != CURLM_OK) {
         request->mItem->mStatus = SendingStatus::IDLE;
@@ -191,10 +191,10 @@ void HttpSink::HandleCompletedRequests() {
             HttpSinkRequest* request = nullptr;
             curl_easy_getinfo(handler, CURLINFO_PRIVATE, &request);
             LOG_DEBUG(sLogger,
-                      ("send http request completed, item address", request->mItem)(
-                          "config-flusher-dst", QueueKeyManager::GetInstance()->GetName(request->mItem->mQueueKey))(
-                          "response time",
-                          ToString(time(nullptr) - request->mLastSendTime))("try cnt", ToString(request->mTryCnt)));
+                      ("send http request completed, item address", request->mItem)
+                      ("config-flusher-dst", QueueKeyManager::GetInstance()->GetName(request->mItem->mQueueKey))
+                      ("response time",ToString(chrono::duration_cast<chrono::milliseconds>(chrono::system_clock::now()- request->mLastSendTime).count()) + "ms")
+                      ("try cnt", ToString(request->mTryCnt)));
             switch (msg->data.result) {
                 case CURLE_OK: {
                     long statusCode = 0;

diff --git a/core/unittest/prometheus/CMakeLists.txt b/core/unittest/prometheus/CMakeLists.txt
@@ -43,6 +43,9 @@ target_link_libraries(scrape_config_unittest ${UT_BASE_TARGET})
 add_executable(prom_utils_unittest UtilsUnittest.cpp)
 target_link_libraries(prom_utils_unittest ${UT_BASE_TARGET})
 
+add_executable(prom_asyn_unittest PromAsynUnittest.cpp)
+target_link_libraries(prom_asyn_unittest ${UT_BASE_TARGET})
+
 include(GoogleTest)
 
 gtest_discover_tests(labels_unittest)
@@ -54,3 +57,4 @@ gtest_discover_tests(textparser_unittest)
 gtest_discover_tests(textparser_benchmark)
 gtest_discover_tests(scrape_config_unittest)
 gtest_discover_tests(prom_utils_unittest)
+gtest_discover_tests(prom_asyn_unittest)
diff --git a/core/unittest/prometheus/PromAsynUnittest.cpp b/core/unittest/prometheus/PromAsynUnittest.cpp
@@ -0,0 +1,38 @@
+
+#include "common/http/HttpResponse.h"
+#include "prometheus/async/PromFuture.h"
+#include "prometheus/async/PromHttpRequest.h"
+#include "unittest/Unittest.h"
+
+using namespace std;
+
+namespace logtail {
+class PromAsynUnittest : public testing::Test {
+public:
+    void TestExecTime();
+};
+
+void PromAsynUnittest::TestExecTime() {
+    auto future = std::make_shared<PromFuture>();
+    auto now = std::chrono::system_clock::now();
+    bool exec = false;
+    future->AddDoneCallback([&exec, now](const HttpResponse&, uint64_t timestampMilliSec) {
+        APSARA_TEST_EQUAL(timestampMilliSec,
+                          std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count());
+
+        APSARA_TEST_TRUE(exec);
+    });
+    auto request = std::make_shared<PromHttpRequest>(
+        "http", false, "127.0.0.1", 8080, "/", "", map<string, string>(), "", 10, 3, future);
+    auto asynRequest = std::dynamic_pointer_cast<AsynHttpRequest>(request);
+    asynRequest->mLastSendTime = now;
+    auto response = HttpResponse{};
+    exec = true;
+    asynRequest->OnSendDone(response);
+}
+
+UNIT_TEST_CASE(PromAsynUnittest, TestExecTime);
+
+} // namespace logtail
+
+UNIT_TEST_MAIN