HPCC-35868 Ensure graphs have an end time for metrics

Mark on failure, fake one for running

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>

Author: GordonSmith

esp/src/src/Timings.ts

@@ -83,14 +83,19 @@ export class WUTimelineNoFetch extends WUTimelinePatched {
                 scope.__hpcc_id = scope.name;
             }
             return scope.id &&
-                scope.WhenStarted && (scope.WhenFinished || scope.TimeElapsed) &&
+                scope.WhenStarted &&
                 scope.type !== "activity";
         }).map((scope: IScope) => {
             let whenFinished = scope.WhenFinished;
             if (!whenFinished) {
-                const d = new Date(scope.WhenStarted);
-                d.setMilliseconds(d.getMilliseconds() + scope.TimeElapsed * 1000);
-                whenFinished = d.toISOString();
+                if (scope.TimeElapsed) {
+                    const d = new Date(scope.WhenStarted);
+                    d.setMilliseconds(d.getMilliseconds() + scope.TimeElapsed * 1000);
+                    whenFinished = d.toISOString();
+                } else {
+                    // Graph still running — use current time as a placeholder end  
+                    whenFinished = new Date().toISOString();
+                }
             }
             return [
                 scope.id,

thorlcr/master/thgraphmanager.cpp

@@ -1171,6 +1171,20 @@ bool CJobManager::executeGraph(IConstWorkUnit &workunit, const char *graphName,
     {
         exception.setown(ThorWrapException(e, "CJobManager::executeGraph"));
         e->Release();
+        try
+        {
+            Owned<IWorkUnit> wu = &workunit.lock();
+            unsigned __int64 graphTimeNs = cycle_to_nanosec(get_cycles_now()-startCycles);
+            StringBuffer graphTimeStr;
+            formatGraphTimerLabel(graphTimeStr, graphName);
+            updateWorkunitStat(wu, SSTgraph, graphName, StTimeElapsed, graphTimeStr, graphTimeNs, wfid);
+            addTimeStamp(wu, SSTgraph, graphName, StWhenFinished, wfid);
+        }
+        catch (IException *e2)
+        {
+            EXCLOG(e2, "Failed to record graph end time");
+            e2->Release();
+        }
     }
     job->endJob();
     removeJob(*job);