@lage-run/reporters 0.2.42 → 0.2.44

package/CHANGELOG.json

@@ -2,7 +2,52 @@
   "name": "@lage-run/reporters",
   "entries": [
     {
-      "date": "Tue, 06 Dec 2022 23:28:03 GMT",
+      "date": "Thu, 05 Jan 2023 00:40:39 GMT",
+      "tag": "@lage-run/reporters_v0.2.44",
+      "version": "0.2.44",
+      "comments": {
+        "patch": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/reporters",
+            "commit": "961843bef658c51312e02498554ad338e467e1a7",
+            "comment": "fixing progress bar to not be a bottleneck"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 08 Dec 2022 00:49:28 GMT",
+      "tag": "@lage-run/reporters_v0.2.43",
+      "version": "0.2.43",
+      "comments": {
+        "patch": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/reporters",
+            "commit": "ad281dfe8b222d949130821828a680d1c3625154",
+            "comment": "adding some more niceties to progress reporter"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 06 Dec 2022 23:33:47 GMT",
+      "tag": "@lage-run/reporters_v0.2.42",
+      "version": "0.2.42",
+      "comments": {
+        "none": [
+          {
+            "author": "renovate@whitesourcesoftware.com",
+            "package": "@lage-run/reporters",
+            "commit": "07c1993552c81082c2717146ce0ff57a7a2eba1b",
+            "comment": "Update devDependency @types/react to v18.0.26"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 06 Dec 2022 23:28:12 GMT",
       "tag": "@lage-run/reporters_v0.2.42",
       "version": "0.2.42",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,28 @@
 # Change Log - @lage-run/reporters
 
-This log was last generated on Tue, 06 Dec 2022 23:28:03 GMT and should not be manually modified.
+This log was last generated on Thu, 05 Jan 2023 00:40:39 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.2.44
+
+Thu, 05 Jan 2023 00:40:39 GMT
+
+### Patches
+
+- fixing progress bar to not be a bottleneck (kchau@microsoft.com)
+
+## 0.2.43
+
+Thu, 08 Dec 2022 00:49:28 GMT
+
+### Patches
+
+- adding some more niceties to progress reporter (kchau@microsoft.com)
+
 ## 0.2.42
 
-Tue, 06 Dec 2022 23:28:03 GMT
+Tue, 06 Dec 2022 23:28:12 GMT
 
 ### Patches
 

package/lib/ChromeTraceEventsReporter.d.ts

@@ -11,8 +11,6 @@ export declare class ChromeTraceEventsReporter implements Reporter {
     private options;
     logStream: Writable;
     consoleLogStream: Writable;
-    private threads;
-    private targetIdThreadMap;
     private events;
     private outputFile;
     constructor(options: ChromeTraceEventsReporterOptions);

package/lib/ChromeTraceEventsReporter.js

@@ -14,9 +14,6 @@ function _interopRequireDefault(obj) {
         default: obj
     };
 }
-function range(len) {
-    return Array(len).fill(0).map((_, idx)=>idx + 1);
-}
 function hrTimeToMicroseconds(hr) {
     return hr[0] * 1e6 + hr[1] * 1e-3;
 }
@@ -48,7 +45,7 @@ class ChromeTraceEventsReporter {
                     1000
                 ]),
                 pid: 1,
-                tid: targetRun.threadId ?? 0
+                tid: targetRun.threadId
             };
             if (categorize) {
                 event.cat += `,${categorize(targetRun)}`;
@@ -62,13 +59,11 @@ class ChromeTraceEventsReporter {
     constructor(options){
         this.options = options;
         this.consoleLogStream = process.stdout;
-        this.targetIdThreadMap = new Map();
         this.events = {
             traceEvents: [],
             displayTimeUnit: "ms"
         };
         this.outputFile = options.outputFile ?? getTimeBasedFilename("profile");
-        this.threads = range(options.concurrency);
         if (!_fs.default.existsSync(_path.default.dirname(this.outputFile))) {
             _fs.default.mkdirSync(_path.default.dirname(this.outputFile), {
                 recursive: true

package/lib/ProgressReporter.d.ts

@@ -3,6 +3,7 @@ import EventEmitter from "events";
 import type { LogEntry, Reporter } from "@lage-run/logger";
 import type { SchedulerRunSummary } from "@lage-run/scheduler-types";
 export declare class ProgressReporter implements Reporter {
+    startTime: [number, number];
     logEvent: EventEmitter;
     logEntries: Map<string, LogEntry<import("@lage-run/logger").LogStructuredData>[]>;
     constructor(options?: {

package/lib/ProgressReporter.js

@@ -67,7 +67,10 @@ class ProgressReporter {
         if (entry?.data?.target?.hidden) {
             return;
         }
-        if (entry.data && entry.data.target && typeof entry.data.threadId !== "undefined") {
+        if (entry.data && entry.data.schedulerRun) {
+            this.startTime = entry.data.schedulerRun.startTime;
+        }
+        if (entry.data && entry.data.status) {
             this.logEvent.emit("status", entry);
         }
         if (entry.data && entry.data.progress) {
@@ -83,6 +86,10 @@ class ProgressReporter {
     constructor(options = {
         concurrency: 0
     }){
+        this.startTime = [
+            0,
+            0
+        ];
         this.logEvent = new _events.default();
         this.logEntries = new Map();
         (0, _ink.render)(/*#__PURE__*/ _react.createElement(_progressReporterApp.ProgressReporterApp, {

package/lib/components/ProgressReporterApp.js

@@ -51,7 +51,8 @@ function _interopRequireWildcard(obj, nodeInterop) {
     return newObj;
 }
 function ProgressReporterApp(props) {
-    const [threadInfo, setThreadInfo] = _react.useState({});
+    const initialThreadInfo = new Set();
+    const [threadInfo, setThreadInfo] = _react.useState(initialThreadInfo);
     const [progress, setProgress] = _react.useState({
         waiting: 0,
         completed: 0,
@@ -62,18 +63,13 @@ function ProgressReporterApp(props) {
     _react.useEffect(()=>{
         logEvent.on("status", (entry)=>{
             const { target , threadId , status  } = entry.data;
-            if (status && status === "running") {
-                setThreadInfo((threadInfo)=>({
-                        ...threadInfo,
-                        [threadId]: target.id
-                    }));
-            } else if (status === "success" || status === "aborted" || status === "failed") {
+            if (status === "running") {
+                setThreadInfo((threadInfo)=>new Set(threadInfo).add(target.id));
+            } else if (status === "success" || status === "aborted" || status === "failed" || status === "skipped") {
                 setThreadInfo((threadInfo)=>{
-                    const newThreadInfo = {
-                        ...threadInfo
-                    };
-                    newThreadInfo[threadId] = "";
-                    return newThreadInfo;
+                    const newSet = new Set(threadInfo);
+                    newSet.delete(target.id);
+                    return newSet;
                 });
             }
         });
@@ -86,32 +82,24 @@ function ProgressReporterApp(props) {
     }, [
         logEvent
     ]);
-    const arrayGapLength = props.concurrency - Object.keys(threadInfo).length;
-    const idleWorkerDummyThreadInfo = arrayGapLength > 0 ? new Array(arrayGapLength).fill(0) : [];
+    const limit = 16;
+    const hasMore = threadInfo.size > limit;
     return /*#__PURE__*/ _react.createElement(_ink.Box, {
         flexDirection: "column"
-    }, /*#__PURE__*/ _react.createElement(_ink.Text, null, "Lage running tasks"), /*#__PURE__*/ _react.createElement(_ink.Text, {
-        color: "yellow"
-    }, "[warning: this progress reporter is currently in beta and unstable]"), summary ? /*#__PURE__*/ _react.createElement(_summaryInfo.SummaryInfo, {
+    }, /*#__PURE__*/ _react.createElement(_ink.Text, null, "Lage running tasks with ", props.concurrency, " workers"), summary ? /*#__PURE__*/ _react.createElement(_summaryInfo.SummaryInfo, {
         summary: summary
     }) : /*#__PURE__*/ _react.createElement(_ink.Box, {
         flexDirection: "column"
-    }, /*#__PURE__*/ _react.createElement(_ink.Box, {
+    }, /*#__PURE__*/ _react.createElement(_progressStatus.ProgressStatus, {
+        progress: progress
+    }), /*#__PURE__*/ _react.createElement(_ink.Box, {
         flexDirection: "column",
         marginLeft: 2,
         marginY: 1
-    }, Object.entries(threadInfo).map(([threadId, targetId])=>{
-        return /*#__PURE__*/ _react.createElement(_threadItem.ThreadItem, {
-            key: threadId,
+    }, [
+        ...threadInfo
+    ].slice(Math.max(0, threadInfo.size - limit)).map((targetId)=>/*#__PURE__*/ _react.createElement(_threadItem.ThreadItem, {
+            key: targetId,
             targetId: targetId
-        });
-    }), idleWorkerDummyThreadInfo.map((_, index)=>{
-        return /*#__PURE__*/ _react.createElement(_react.Fragment, {
-            key: `idle-${index}`
-        }, /*#__PURE__*/ _react.createElement(_threadItem.ThreadItem, {
-            targetId: ""
-        }));
-    })), /*#__PURE__*/ _react.createElement(_progressStatus.ProgressStatus, {
-        progress: progress
-    })));
+        })), hasMore && /*#__PURE__*/ _react.createElement(_ink.Text, null, "... (displaying most recent ", limit, ")"))));
 }

package/lib/components/ProgressStatus.d.ts

@@ -3,6 +3,4 @@ import { Progress } from "../types/progressBarTypes";
 export interface ProgressStatusProps {
     progress: Progress;
 }
-export declare function ProgressStatus(props: {
-    progress: Progress;
-}): JSX.Element;
+export declare function ProgressStatus(props: ProgressStatusProps): JSX.Element;

package/lib/components/ThreadItem.js

@@ -49,9 +49,9 @@ function _interopRequireWildcard(obj, nodeInterop) {
 }
 function ThreadItem(props) {
     const { targetId  } = props;
-    return /*#__PURE__*/ _react.createElement(_ink.Box, null, targetId ? /*#__PURE__*/ _react.createElement(_ink.Text, {
+    return targetId ? /*#__PURE__*/ _react.createElement(_ink.Text, {
         color: "whiteBright"
-    }, "[ ", targetId, " ]") : /*#__PURE__*/ _react.createElement(_ink.Text, {
+    }, targetId, " ") : /*#__PURE__*/ _react.createElement(_ink.Text, {
         color: "gray"
-    }, "[ IDLE ]"));
+    }, "IDLE");
 }

package/lib/createReporter.js

@@ -23,6 +23,11 @@ function createReporter({ reporter ="npmLog" , progress =false , grouped =false
                 grouped,
                 logLevel: verbose ? _logger.LogLevel.verbose : logLevel
             });
+        case "old":
+            return new _logReporterJs.LogReporter({
+                grouped,
+                logLevel: verbose ? _logger.LogLevel.verbose : logLevel
+            });
         default:
             return progress ? new _progressReporterJs.ProgressReporter({
                 concurrency

package/lib/types/progressBarTypes.d.ts

@@ -5,9 +5,7 @@ export interface Progress {
     completed: number;
     total: number;
 }
-export interface ThreadInfo {
-    [threadId: string]: string;
-}
+export type ThreadInfo = Set<string>;
 export interface SummaryWithLogs {
     schedulerRunSummary: SchedulerRunSummary;
     logEntries: Map<string, LogEntry[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lage-run/reporters",
-  "version": "0.2.42",
+  "version": "0.2.44",
   "description": "Log reporters for Lage",
   "repository": {
     "url": "https://github.com/microsoft/lage"
@@ -26,7 +26,7 @@
     "react": "^18.2.0"
   },
   "devDependencies": {
-    "@types/react": "18.0.25",
+    "@types/react": "18.0.26",
     "memory-streams": "0.1.3"
   },
   "publishConfig": {