Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: support millisecond in HttpRequest for lastSendTime #1755

Merged
merged 3 commits into from
Sep 13, 2024
Merged

feat: support millisecond in HttpRequest for lastSendTime #1755

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
840dd59
feat: support millisecond in HttpRequest for lastSendTime
catdogpandas Sep 12, 2024
76caffc
chore: update code style, add one ut
catdogpandas Sep 13, 2024
ff1666b
chore:
catdogpandas Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions core/common/http/AsynCurlRunner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

#include "app_config/AppConfig.h"
#include "common/StringTools.h"
#include "common/TimeUtil.h"
#include "common/http/Curl.h"
#include "logger/Logger.h"
#include "monitor/LogtailAlarm.h"
Expand Down Expand Up @@ -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->mLastSendTimeMilliSec = GetCurrentTimeInMilliSeconds();
auto res = curl_multi_add_handle(mClient, curl);
if (res != CURLM_OK) {
LOG_ERROR(sLogger,
Expand Down Expand Up @@ -182,7 +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))(
catdogpandas marked this conversation as resolved.
Show resolved Hide resolved
request)("response time millisecond",
ToString(GetCurrentTimeInMilliSeconds() - request->mLastSendTimeMilliSec))(
"try cnt", ToString(request->mTryCnt)));
switch (msg->data.result) {
case CURLE_OK: {
Expand Down
2 changes: 1 addition & 1 deletion core/common/http/HttpRequest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ struct HttpRequest {
uint32_t mMaxTryCnt = sDefaultMaxTryCnt;

uint32_t mTryCnt = 1;
time_t mLastSendTime = 0;
catdogpandas marked this conversation as resolved.
Show resolved Hide resolved
uint64_t mLastSendTimeMilliSec = 0;

HttpRequest(const std::string& method,
bool httpsFlag,
Expand Down
2 changes: 1 addition & 1 deletion core/prometheus/async/PromHttpRequest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ PromHttpRequest::PromHttpRequest(const std::string& method,
}

void PromHttpRequest::OnSendDone(const HttpResponse& response) {
mFuture->Process(response, mLastSendTime * 1000);
mFuture->Process(response, mLastSendTimeMilliSec);
}

[[nodiscard]] bool PromHttpRequest::IsContextValid() const {
Expand Down
9 changes: 6 additions & 3 deletions core/runner/sink/http/HttpSink.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

#include "app_config/AppConfig.h"
#include "common/StringTools.h"
#include "common/TimeUtil.h"
catdogpandas marked this conversation as resolved.
Show resolved Hide resolved
#include "common/http/Curl.h"
#include "logger/Logger.h"
#include "monitor/LogtailAlarm.h"
Expand Down Expand Up @@ -100,7 +101,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->mLastSendTimeMilliSec = GetCurrentTimeInMilliSeconds();

auto res = curl_multi_add_handle(mClient, curl);
if (res != CURLM_OK) {
request->mItem->mStatus = SendingStatus::IDLE;
Expand Down Expand Up @@ -193,8 +195,9 @@ void HttpSink::HandleCompletedRequests() {
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)));
"response time millisecond",
ToString(GetCurrentTimeInMilliSeconds() - request->mLastSendTimeMilliSec))(
"try cnt", ToString(request->mTryCnt)));
switch (msg->data.result) {
case CURLE_OK: {
long statusCode = 0;
Expand Down
Loading