@nxtedition/lib 19.10.5 → 19.11.0

package/app.js

@@ -438,7 +438,24 @@ export function makeApp(appConfig, onTerminate) {
         timestamp: Date.now(),
       })),
       rx.auditTime(1e3),
-      rx.filter(Boolean),
+      rx.withLatestFrom(
+        rxjs.timer(0, 1e3).pipe(
+          rx.map(() => performance.eventLoopUtilization?.()),
+          rx.pairwise(),
+          rx.map(([elu1, elu2]) => ({
+            ds: ds?.stats,
+            couch: couch?.stats,
+            lag: toobusy?.lag(),
+            memory: process.memoryUsage(),
+            utilization: performance.eventLoopUtilization?.(elu2, elu1),
+            heap: v8.getHeapStatistics(),
+          })),
+        ),
+      ),
+      rx.map(([serviceStats, appStats]) => ({
+        ...appStats,
+        [serviceName]: serviceStats,
+      })),
       rx.retryWhen((err$) =>
         err$.pipe(
           rx.tap((err) => logger.error({ err }, 'monitor.stats')),
@@ -452,27 +469,13 @@ export function makeApp(appConfig, onTerminate) {
 
     monitorProviders.stats$ = stats$
 
-    let elu1 = performance.eventLoopUtilization?.()
-    const subscription = stats$.pipe(rx.auditTime(10e3)).subscribe((stats) => {
-      if (process.env.NODE_ENV === 'production') {
-        const elu2 = performance.eventLoopUtilization?.()
-        logger.debug(
-          {
-            ds: ds?.stats,
-            couch: couch?.stats,
-            lag: toobusy?.lag(),
-            memory: process.memoryUsage(),
-            utilization: performance.eventLoopUtilization?.(elu2, elu1),
-            heap: v8.getHeapStatistics(),
-            [serviceName]: stats,
-          },
-          'STATS',
-        )
-        elu1 = elu2
-      }
-    })
-
-    appDestroyers.unshift(subscription)
+    if (process.env.NODE_ENV === 'production') {
+      appDestroyers.unshift(
+        stats$.pipe(rx.auditTime(10e3)).subscribe((stats) => {
+          logger.debug(stats, 'STATS')
+        }),
+      )
+    }
   }
 
   let status$

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "19.10.5",
+  "version": "19.11.0",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",