From 68782c9be5e87a2ebf7ca92eca1b91cc2dc9e5cc Mon Sep 17 00:00:00 2001 From: YangWeimin Date: Thu, 5 Jun 2025 23:22:42 +0800 Subject: [PATCH 1/9] code check for UT Signed-off-by: YangWeimin --- .../utils/netstack_chr_client/NetStackChrClientTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittest/utils/netstack_chr_client/NetStackChrClientTest.cpp b/test/unittest/utils/netstack_chr_client/NetStackChrClientTest.cpp index 73f7a1118..c2dbf5ae2 100644 --- a/test/unittest/utils/netstack_chr_client/NetStackChrClientTest.cpp +++ b/test/unittest/utils/netstack_chr_client/NetStackChrClientTest.cpp @@ -153,7 +153,7 @@ HWTEST_F(NetStackChrClientTest, NetStackChrClientTestPort, TestSize.Level2) { ChrClient::DataTransTcpInfo tcpInfo; int sockfd = socket(AF_INET, SOCK_STREAM, 0); - if (sockfd >0) { + if (sockfd > 0) { ChrClient::NetStackChrClient::GetInstance().GetTcpInfoFromSock(sockfd, tcpInfo); EXPECT_EQ(tcpInfo.unacked, 0); EXPECT_EQ(tcpInfo.srcPort, 0); -- Gitee From e58b6cf1821a4be5d9303f6eaf9aca6daee7a6e5 Mon Sep 17 00:00:00 2001 From: YangWeimin Date: Tue, 17 Jun 2025 19:28:40 +0800 Subject: [PATCH 2/9] add http version Signed-off-by: YangWeimin --- .../include/i_netstack_chr_client.h | 1 + .../include/netstack_chr_client.h | 1 + .../src/netstack_chr_client.cpp | 24 +++++++++++++++++++ .../src/netstack_chr_report.cpp | 5 ++-- 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/utils/netstack_chr_client/include/i_netstack_chr_client.h b/utils/netstack_chr_client/include/i_netstack_chr_client.h index 45fc986be..3e742bace 100644 --- a/utils/netstack_chr_client/include/i_netstack_chr_client.h +++ b/utils/netstack_chr_client/include/i_netstack_chr_client.h @@ -46,6 +46,7 @@ typedef struct DataTransHttpInfo { curl_off_t queueTime; long curlCode; long requestStartTime; + std::string httpVersion; } DataTransHttpInfo; typedef struct DataTransTcpInfo { diff --git a/utils/netstack_chr_client/include/netstack_chr_client.h b/utils/netstack_chr_client/include/netstack_chr_client.h index fadb94450..3d21644e0 100644 --- a/utils/netstack_chr_client/include/netstack_chr_client.h +++ b/utils/netstack_chr_client/include/netstack_chr_client.h @@ -42,6 +42,7 @@ private: static DataType GetNumericAttributeFromCurl(CURL *handle, CURLINFO info); static std::string GetStringAttributeFromCurl(CURL *handle, CURLINFO info); static long GetRequestStartTime(curl_off_t totalTime); + static std:string ConvertHttpVersion(long version); static int ShouldReportHttpAbnormalEvent(const DataTransHttpInfo &httpInfo); NetStackChrReport netstackChrReport_; }; diff --git a/utils/netstack_chr_client/src/netstack_chr_client.cpp b/utils/netstack_chr_client/src/netstack_chr_client.cpp index 0ad525422..a8f54b280 100644 --- a/utils/netstack_chr_client/src/netstack_chr_client.cpp +++ b/utils/netstack_chr_client/src/netstack_chr_client.cpp @@ -136,6 +136,28 @@ long NetStackChrClient::GetRequestStartTime(curl_off_t totalTime) return msCount; } +std:string NetStackChrClient::ConvertHttpVersion(long version) +{ + switch (version) { + case CURL_HTTP_VERSION_NONE: + return "HTTP_NONE"; + case CURL_HTTP_VERSION_1_0: + return "HTTP_1_0"; + case CURL_HTTP_VERSION_1_1: + return "HTTP_1_1"; + case CURL_HTTP_VERSION_2_0: + case CURL_HTTP_VERSION_2TLS: + case CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE: + return "HTTP_2"; + case CURL_HTTP_VERSION_3: + return "HTTP_3"; + case CURL_HTTP_VERSION_3ONLY: + return "HTTP_3ONLY"; + default: + return "ILLEGAL"; + } +} + void NetStackChrClient::GetHttpInfoFromCurl(CURL *handle, DataTransHttpInfo &httpInfo) { (void)curl_easy_getinfo(handle, CURLINFO_RESPONSE_CODE, &httpInfo.responseCode); @@ -162,6 +184,8 @@ void NetStackChrClient::GetHttpInfoFromCurl(CURL *handle, DataTransHttpInfo &htt httpInfo.effectiveMethod = GetStringAttributeFromCurl(handle, CURLINFO_EFFECTIVE_METHOD); httpInfo.contentType = GetStringAttributeFromCurl(handle, CURLINFO_CONTENT_TYPE); + long version = GetNumericAttributeFromCurl(handle, CURLINFO_HTTP_VERSION); + } int NetStackChrClient::ShouldReportHttpAbnormalEvent(const DataTransHttpInfo &httpInfo) diff --git a/utils/netstack_chr_client/src/netstack_chr_report.cpp b/utils/netstack_chr_client/src/netstack_chr_report.cpp index a746a9d52..6b87dcf7f 100644 --- a/utils/netstack_chr_client/src/netstack_chr_report.cpp +++ b/utils/netstack_chr_client/src/netstack_chr_report.cpp @@ -78,8 +78,9 @@ void NetStackChrReport::SetHttpInfoJsonStr(DataTransHttpInfo httpInfo, std::stri { std::stringstream ss; ss << "{\"uid\":" << httpInfo.uid - << ",{\"response_code\":" << httpInfo.responseCode - << ",{\"total_time\":" << httpInfo.totalTime + << ",{\"http_version\":" << httpInfo.httpVersion + << ",{\"response_code\":\"" << httpInfo.responseCode + << "\",{\"total_time\":" << httpInfo.totalTime << ",{\"namelookup_time\":" << httpInfo.nameLookUpTime << ",{\"connect_time\":" << httpInfo.connectTime << ",{\"pretransfer_time\":" << httpInfo.preTransferTime -- Gitee From ea3fb35996ceaac151566c951e1236e8b77e3740 Mon Sep 17 00:00:00 2001 From: YangWeimin Date: Tue, 17 Jun 2025 19:35:33 +0800 Subject: [PATCH 3/9] add http verssion Signed-off-by: YangWeimin --- utils/netstack_chr_client/src/netstack_chr_client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/netstack_chr_client/src/netstack_chr_client.cpp b/utils/netstack_chr_client/src/netstack_chr_client.cpp index a8f54b280..7c961f060 100644 --- a/utils/netstack_chr_client/src/netstack_chr_client.cpp +++ b/utils/netstack_chr_client/src/netstack_chr_client.cpp @@ -185,7 +185,7 @@ void NetStackChrClient::GetHttpInfoFromCurl(CURL *handle, DataTransHttpInfo &htt httpInfo.effectiveMethod = GetStringAttributeFromCurl(handle, CURLINFO_EFFECTIVE_METHOD); httpInfo.contentType = GetStringAttributeFromCurl(handle, CURLINFO_CONTENT_TYPE); long version = GetNumericAttributeFromCurl(handle, CURLINFO_HTTP_VERSION); - + httpInfo.httpVersion = ConvertHttpVersion(version); } int NetStackChrClient::ShouldReportHttpAbnormalEvent(const DataTransHttpInfo &httpInfo) -- Gitee From cf8ca5938ddb902f99ba9c9b8debb94a88952d0e Mon Sep 17 00:00:00 2001 From: YangWeimin Date: Tue, 17 Jun 2025 19:38:44 +0800 Subject: [PATCH 4/9] add http version Signed-off-by: YangWeimin --- .../src/netstack_chr_client.cpp | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/utils/netstack_chr_client/src/netstack_chr_client.cpp b/utils/netstack_chr_client/src/netstack_chr_client.cpp index 7c961f060..f34380cb7 100644 --- a/utils/netstack_chr_client/src/netstack_chr_client.cpp +++ b/utils/netstack_chr_client/src/netstack_chr_client.cpp @@ -139,22 +139,22 @@ long NetStackChrClient::GetRequestStartTime(curl_off_t totalTime) std:string NetStackChrClient::ConvertHttpVersion(long version) { switch (version) { - case CURL_HTTP_VERSION_NONE: - return "HTTP_NONE"; - case CURL_HTTP_VERSION_1_0: - return "HTTP_1_0"; - case CURL_HTTP_VERSION_1_1: - return "HTTP_1_1"; - case CURL_HTTP_VERSION_2_0: - case CURL_HTTP_VERSION_2TLS: - case CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE: - return "HTTP_2"; - case CURL_HTTP_VERSION_3: - return "HTTP_3"; - case CURL_HTTP_VERSION_3ONLY: - return "HTTP_3ONLY"; - default: - return "ILLEGAL"; + case CURL_HTTP_VERSION_NONE: + return "HTTP_NONE"; + case CURL_HTTP_VERSION_1_0: + return "HTTP_1_0"; + case CURL_HTTP_VERSION_1_1: + return "HTTP_1_1"; + case CURL_HTTP_VERSION_2_0: + case CURL_HTTP_VERSION_2TLS: + case CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE: + return "HTTP_2"; + case CURL_HTTP_VERSION_3: + return "HTTP_3"; + case CURL_HTTP_VERSION_3ONLY: + return "HTTP_3ONLY"; + default: + return "ILLEGAL"; } } -- Gitee From 266b76e931a4032728743b352275e97a381f1e3d Mon Sep 17 00:00:00 2001 From: YangWeimin Date: Tue, 17 Jun 2025 19:41:27 +0800 Subject: [PATCH 5/9] add http version Signed-off-by: YangWeimin --- utils/netstack_chr_client/src/netstack_chr_report.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/netstack_chr_client/src/netstack_chr_report.cpp b/utils/netstack_chr_client/src/netstack_chr_report.cpp index 6b87dcf7f..e57ca689f 100644 --- a/utils/netstack_chr_client/src/netstack_chr_report.cpp +++ b/utils/netstack_chr_client/src/netstack_chr_report.cpp @@ -78,9 +78,9 @@ void NetStackChrReport::SetHttpInfoJsonStr(DataTransHttpInfo httpInfo, std::stri { std::stringstream ss; ss << "{\"uid\":" << httpInfo.uid - << ",{\"http_version\":" << httpInfo.httpVersion - << ",{\"response_code\":\"" << httpInfo.responseCode - << "\",{\"total_time\":" << httpInfo.totalTime + << ",{\"http_version\":\"" << httpInfo.httpVersion + << "\",{\"response_code\":" << httpInfo.responseCode + << ",{\"total_time\":" << httpInfo.totalTime << ",{\"namelookup_time\":" << httpInfo.nameLookUpTime << ",{\"connect_time\":" << httpInfo.connectTime << ",{\"pretransfer_time\":" << httpInfo.preTransferTime -- Gitee From 224d856c5b13db871465aee6e330eb54a7804789 Mon Sep 17 00:00:00 2001 From: YangWeimin Date: Tue, 17 Jun 2025 20:18:44 +0800 Subject: [PATCH 6/9] add http version Signed-off-by: YangWeimin --- utils/netstack_chr_client/include/netstack_chr_client.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/netstack_chr_client/include/netstack_chr_client.h b/utils/netstack_chr_client/include/netstack_chr_client.h index 3d21644e0..a4abba9a1 100644 --- a/utils/netstack_chr_client/include/netstack_chr_client.h +++ b/utils/netstack_chr_client/include/netstack_chr_client.h @@ -42,7 +42,7 @@ private: static DataType GetNumericAttributeFromCurl(CURL *handle, CURLINFO info); static std::string GetStringAttributeFromCurl(CURL *handle, CURLINFO info); static long GetRequestStartTime(curl_off_t totalTime); - static std:string ConvertHttpVersion(long version); + static std::string ConvertHttpVersion(long version); static int ShouldReportHttpAbnormalEvent(const DataTransHttpInfo &httpInfo); NetStackChrReport netstackChrReport_; }; -- Gitee From 8d903a1fc536c3db0d3fdb0c5855930c256a95bf Mon Sep 17 00:00:00 2001 From: YangWeimin Date: Tue, 17 Jun 2025 20:40:14 +0800 Subject: [PATCH 7/9] add http version Signed-off-by: YangWeimin --- utils/netstack_chr_client/src/netstack_chr_client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/netstack_chr_client/src/netstack_chr_client.cpp b/utils/netstack_chr_client/src/netstack_chr_client.cpp index f34380cb7..e28285974 100644 --- a/utils/netstack_chr_client/src/netstack_chr_client.cpp +++ b/utils/netstack_chr_client/src/netstack_chr_client.cpp @@ -136,7 +136,7 @@ long NetStackChrClient::GetRequestStartTime(curl_off_t totalTime) return msCount; } -std:string NetStackChrClient::ConvertHttpVersion(long version) +std::string NetStackChrClient::ConvertHttpVersion(long version) { switch (version) { case CURL_HTTP_VERSION_NONE: -- Gitee From a0fc341b46e706f31bceec7989779b27ebab4a1d Mon Sep 17 00:00:00 2001 From: YangWeimin Date: Mon, 23 Jun 2025 08:03:44 +0000 Subject: [PATCH 8/9] update test/unittest/utils/netstack_chr_client/NetStackChrClientTest.cpp. Signed-off-by: YangWeimin --- .../NetStackChrClientTest.cpp | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/test/unittest/utils/netstack_chr_client/NetStackChrClientTest.cpp b/test/unittest/utils/netstack_chr_client/NetStackChrClientTest.cpp index c2dbf5ae2..b3ffaf483 100644 --- a/test/unittest/utils/netstack_chr_client/NetStackChrClientTest.cpp +++ b/test/unittest/utils/netstack_chr_client/NetStackChrClientTest.cpp @@ -246,4 +246,33 @@ HWTEST_F(NetStackChrClientTest, NetStackChrClientTestTimeLimits, TestSize.Level2 int second_ret = netstackChrReport.ReportCommonEvent(chrStats); EXPECT_EQ(second_ret, 1); } + +HWTEST_F(NetStackChrClientTest, NetStackChrClientTestHttpVersion, TestSize.Level2) +{ + std::string versionNone = ChrClient::NetStackChrClient::GetInstance().ConvertHttpVersion(CURL_HTTP_VERSION_NONE); + EXPECT_EQ(versionNone, "HTTP_NONE"); + + std::string version1_0 = ChrClient::NetStackChrClient::GetInstance().ConvertHttpVersion(CURL_HTTP_VERSION_1_0); + EXPECT_EQ(version1_0, "HTTP_1_0"); + + std::string version1_1 = ChrClient::NetStackChrClient::GetInstance().ConvertHttpVersion(CURL_HTTP_VERSION_1_1); + EXPECT_EQ(version1_1, "HTTP_1_1"); + + std::string version2 = ChrClient::NetStackChrClient::GetInstance().ConvertHttpVersion(CURL_HTTP_VERSION_2_0); + EXPECT_EQ(version2, "HTTP_2"); + version2 = ChrClient::NetStackChrClient::GetInstance().ConvertHttpVersion(CURL_HTTP_VERSION_2TLS); + EXPECT_EQ(version2, "HTTP_2"); + version2 = ChrClient::NetStackChrClient::GetInstance().ConvertHttpVersion(CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE); + EXPECT_EQ(version2, "HTTP_2"); + + std::string version3 = ChrClient::NetStackChrClient::GetInstance().ConvertHttpVersion(CURL_HTTP_VERSION_3); + EXPECT_EQ(version3, "HTTP_3"); + + std::string version3Only = ChrClient::NetStackChrClient::GetInstance().ConvertHttpVersion(CURL_HTTP_VERSION_3ONLY); + EXPECT_EQ(version3Only, "HTTP_3ONLY"); + + long errorHttpVersion = -1; + std::string versionIllegal = ChrClient::NetStackChrClient::GetInstance().ConvertHttpVersion(errorHttpVersion); + EXPECT_EQ(versionIllegal, "ILLEGAL"); +} } \ No newline at end of file -- Gitee From bddfe63a46d794dd87571fc4122da4a7bed33e82 Mon Sep 17 00:00:00 2001 From: YangWeimin Date: Mon, 23 Jun 2025 09:06:44 +0000 Subject: [PATCH 9/9] update test/unittest/utils/netstack_chr_client/NetStackChrClientTest.cpp. Signed-off-by: YangWeimin --- .../utils/netstack_chr_client/NetStackChrClientTest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/unittest/utils/netstack_chr_client/NetStackChrClientTest.cpp b/test/unittest/utils/netstack_chr_client/NetStackChrClientTest.cpp index b3ffaf483..5e0de5330 100644 --- a/test/unittest/utils/netstack_chr_client/NetStackChrClientTest.cpp +++ b/test/unittest/utils/netstack_chr_client/NetStackChrClientTest.cpp @@ -252,11 +252,11 @@ HWTEST_F(NetStackChrClientTest, NetStackChrClientTestHttpVersion, TestSize.Level std::string versionNone = ChrClient::NetStackChrClient::GetInstance().ConvertHttpVersion(CURL_HTTP_VERSION_NONE); EXPECT_EQ(versionNone, "HTTP_NONE"); - std::string version1_0 = ChrClient::NetStackChrClient::GetInstance().ConvertHttpVersion(CURL_HTTP_VERSION_1_0); - EXPECT_EQ(version1_0, "HTTP_1_0"); + std::string version10 = ChrClient::NetStackChrClient::GetInstance().ConvertHttpVersion(CURL_HTTP_VERSION_1_0); + EXPECT_EQ(version10, "HTTP_1_0"); - std::string version1_1 = ChrClient::NetStackChrClient::GetInstance().ConvertHttpVersion(CURL_HTTP_VERSION_1_1); - EXPECT_EQ(version1_1, "HTTP_1_1"); + std::string version11 = ChrClient::NetStackChrClient::GetInstance().ConvertHttpVersion(CURL_HTTP_VERSION_1_1); + EXPECT_EQ(version11, "HTTP_1_1"); std::string version2 = ChrClient::NetStackChrClient::GetInstance().ConvertHttpVersion(CURL_HTTP_VERSION_2_0); EXPECT_EQ(version2, "HTTP_2"); -- Gitee