HPCC-32770 Soapcall stats for DNS, connect, num failures 2

Signed-off-by: M Kelly <mark.kelly+copilot@lexisnexisrisk.com>
hpcc-systems · Oct 6, 2024 · db33ba1 · db33ba1
1 parent 5ff1fe3
commit db33ba1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/common/thorhelper/thorsoapcall.cpp b/common/thorhelper/thorsoapcall.cpp
@@ -2474,8 +2474,9 @@ class CWSCAsyncFor : implements IWSCAsyncFor, public CInterface, public CAsyncFo
                     // TODO: for DNS, do we use timeoutMS or remainingMS or remainingMS / maxRetries+1 or ?
                     ep.set(connUrl.host.get(), connUrl.port, master->timeoutMS);
 
-                    master->logctx.noteStatistic(StTimeSoapcallDNS, dnsTimer.elapsedNs());
-                    master->activitySpanScope->setSpanAttribute("SoapcallDNSTimeMs", dnsTimer.elapsedMs());
+                    unsigned __int64 dnsNs = dnsTimer.elapsedNs();
+                    master->logctx.noteStatistic(StTimeSoapcallDNS, dnsNs);
+                    master->activitySpanScope->setSpanAttribute("SoapcallDNSTimeNs", dnsNs);
 
                     if (ep.isNull())
                         throw MakeStringException(-1, "Failed to resolve host '%s'", nullText(connUrl.host.get()));
@@ -2529,14 +2530,15 @@ class CWSCAsyncFor : implements IWSCAsyncFor, public CInterface, public CAsyncFo
 #endif
                         }
 
-                        master->logctx.noteStatistic(StTimeSoapcallConn, connTimer.elapsedNs());
-                        master->activitySpanScope->setSpanAttribute("SoapcallConnTimeMs", connTimer.elapsedMs());
+                        unsigned __int64 connNs = connTimer.elapsedNs();
+                        master->logctx.noteStatistic(StTimeSoapcallConnect, connNs);
+                        master->activitySpanScope->setSpanAttribute("SoapcallConnectTimeNs", connNs);
                     }
                     break;
                 }
                 catch (IException *e)
                 {
-                    master->logctx.noteStatistic(StNumSoapcallConnFailures, 1);
+                    master->logctx.noteStatistic(StNumSoapcallConnectFailures, 1);
 
                     if (master->timeLimitExceeded)
                     {

diff --git a/roxie/ccd/ccdserver.cpp b/roxie/ccd/ccdserver.cpp
@@ -496,7 +496,7 @@ static const StatisticsMapping indexStatistics({StNumServerCacheHits, StNumIndex
 static const StatisticsMapping diskStatistics({StNumServerCacheHits, StNumDiskRowsRead, StNumDiskSeeks, StNumDiskAccepted,
                                                StNumDiskRejected, StSizeAgentReply, StTimeAgentWait, StTimeAgentQueue, StTimeAgentProcess, StTimeIBYTIDelay, StNumAckRetries,
                                                StSizeContinuationData, StNumContinuationRequests }, actStatistics);
-static const StatisticsMapping soapStatistics({ StTimeSoapcall, StTimeSoapcallDNS, StTimeSoapcallConn, StNumSoapcallConnFailures }, actStatistics);
+static const StatisticsMapping soapStatistics({ StTimeSoapcall, StTimeSoapcallDNS, StTimeSoapcallConnect, StNumSoapcallConnectFailures }, actStatistics);
 static const StatisticsMapping groupStatistics({ StNumGroups, StNumGroupMax }, actStatistics);
 static const StatisticsMapping sortStatistics({ StTimeSortElapsed }, actStatistics);
 static const StatisticsMapping indexWriteStatistics({ StNumDuplicateKeys, StNumLeafCacheAdds, StNumNodeCacheAdds, StNumBlobCacheAdds }, actStatistics);
@@ -518,7 +518,7 @@ extern const StatisticsMapping accumulatedStatistics({StWhenFirstRow, StTimeLoca
                                                       StCycleBlobFetchCycles, StCycleLeafFetchCycles, StCycleNodeFetchCycles, StTimeBlobFetch, StTimeLeafFetch, StTimeNodeFetch,
                                                       StNumNodeDiskFetches, StNumLeafDiskFetches, StNumBlobDiskFetches,
                                                       StNumDiskRejected, StSizeAgentReply, StTimeAgentWait,
-                                                      StTimeSoapcall, StTimeSoapcallDNS, StTimeSoapcallConn, StNumSoapcallConnFailures,
+                                                      StTimeSoapcall, StTimeSoapcallDNS, StTimeSoapcallConnect, StNumSoapcallConnectFailures,
                                                       StNumGroups,
                                                       StTimeSortElapsed,
                                                       StNumDuplicateKeys,

diff --git a/system/jlib/jstatcodes.h b/system/jlib/jstatcodes.h
@@ -312,10 +312,10 @@ enum StatisticKind
     StNumMatchCandidates,
     StNumMatchCandidatesMax,
     StTimeSoapcallDNS,                  // Time spent in DNS lookups for soapcalls
-    StTimeSoapcallConn,                 // Time spent in connect[+SSL_connect] for soapcalls
+    StTimeSoapcallConnect,              // Time spent in connect[+SSL_connect] for soapcalls
     StCycleSoapcallDNSCycles,
-    StCycleSoapcallConnCycles,
-    StNumSoapcallConnFailures,
+    StCycleSoapcallConnectCycles,
+    StNumSoapcallConnectFailures,
     StMax,
 
     //For any quantity there is potentially the following variants.

diff --git a/system/jlib/jstats.cpp b/system/jlib/jstats.cpp
@@ -984,10 +984,10 @@ static const constexpr StatisticMeta statsMetaData[StMax] = {
     { NUMSTAT(MatchCandidates), "The number of candidate combinations of left and right rows forming join groups" },
     { NUMSTAT(MatchCandidatesMax), "The largest number of candidate combinations of left and right rows in a single group" },
     { TIMESTAT(SoapcallDNS), "The time taken for DNS lookup in SOAPCALL" },
-    { TIMESTAT(SoapcallConn), "The time taken for connect[+SSL_connect] in SOAPCALL" },
+    { TIMESTAT(SoapcallConnect), "The time taken for connect[+SSL_connect] in SOAPCALL" },
     { CYCLESTAT(SoapcallDNS) },
-    { CYCLESTAT(SoapcallConn) },
-    { NUMSTAT(SoapcallConnFailures), "The number of SOAPCALL connect failures" },
+    { CYCLESTAT(SoapcallConnect) },
+    { NUMSTAT(SoapcallConnectFailures), "The number of SOAPCALL connect failures" },
 };
 
 static MapStringTo<StatisticKind, StatisticKind> statisticNameMap(true);

diff --git a/thorlcr/thorutil/thormisc.cpp b/thorlcr/thorutil/thormisc.cpp
@@ -75,7 +75,7 @@ static Owned<IMPtagAllocator> ClusterMPAllocator;
 // stat. mappings shared between master and slave activities
 const StatisticsMapping spillStatistics({StTimeSpillElapsed, StTimeSortElapsed, StNumSpills, StSizeSpillFile, StSizePeakTempDisk});
 const StatisticsMapping executeStatistics({StTimeTotalExecute, StTimeLocalExecute, StTimeBlocked});
-const StatisticsMapping soapcallStatistics({StTimeSoapcall, StTimeSoapcallDNS, StTimeSoapcallConn, StNumSoapcallConnFailures});
+const StatisticsMapping soapcallStatistics({StTimeSoapcall, StTimeSoapcallDNS, StTimeSoapcallConnect, StNumSoapcallConnectFailures});
 const StatisticsMapping basicActivityStatistics({}, executeStatistics, spillStatistics);
 const StatisticsMapping groupActivityStatistics({StNumGroups, StNumGroupMax}, basicActivityStatistics);
 const StatisticsMapping indexReadFileStatistics({}, diskReadRemoteStatistics, jhtreeCacheStatistics);