@luvio/environments 0.122.0 → 0.124.0

package/dist/es/es2018/environments.js

@@ -131,7 +131,7 @@ function publishDurableStoreEntries(durableRecords, publish, publishMetadata) {
  */
 function reviveSnapshot(baseEnvironment, durableStore, 
 // TODO [W-10165787]: We should only allow Unfulfilled snapshot be passed in
-unavailableSnapshot, durableStoreErrorHandler, buildL1Snapshot, reviveMetrics = { l2ReadCount: 0, l2ReadDuration: 0 }) {
+unavailableSnapshot, durableStoreErrorHandler, buildL1Snapshot, reviveMetrics = { l2Trips: [] }) {
     const { recordId, select, seenRecords, state } = unavailableSnapshot;
     // L2 can only revive Unfulfilled snapshots that have a selector since they have the
     // info needed to revive (like missingLinks) and rebuild.  Otherwise return L1 snapshot.
@@ -147,9 +147,12 @@ unavailableSnapshot, durableStoreErrorHandler, buildL1Snapshot, reviveMetrics =
     const keysToRevive = keys(keysToReviveSet);
     const canonicalKeys = keysToRevive.map((x) => baseEnvironment.storeGetCanonicalKey(x));
     const start = Date.now();
-    reviveMetrics.l2ReadCount++;
+    const { l2Trips } = reviveMetrics;
     return durableStore.getEntries(canonicalKeys, DefaultDurableSegment).then((durableRecords) => {
-        reviveMetrics.l2ReadDuration += Date.now() - start;
+        l2Trips.push({
+            duration: Date.now() - start,
+            keysRequestedCount: canonicalKeys.length,
+        });
         const { revivedKeys, hadUnexpectedShape } = publishDurableStoreEntries(durableRecords, 
         // TODO [W-10072584]: instead of implicitly using L1 we should take in
         // publish and publishMetadata funcs, so callers can decide where to
@@ -699,9 +702,9 @@ function makeDurable(environment, { durableStore, instrumentation }) {
                 const revivedSnapshot = reviveSnapshot(environment, durableStore, snapshot, durableStoreErrorHandler, () => injectedStoreLookup(snapshot.select, snapshot.refresh)).then((result) => {
                     emitDurableEnvironmentAdapterEvent({
                         type: 'l2-revive-end',
+                        snapshot: result.snapshot,
                         duration: Date.now() - start,
-                        l2Trips: result.metrics.l2ReadCount,
-                        l2Duration: result.metrics.l2ReadDuration,
+                        l2Trips: result.metrics.l2Trips,
                     }, adapterRequestContext.eventObservers);
                     return result.snapshot;
                 });

package/dist/es/es2018/events.d.ts

@@ -1,13 +1,16 @@
 import type { EnvironmentAdapterEvent } from '@luvio/engine';
-import type { LuvioAdapterEventObserver } from '@luvio/engine';
+import type { LuvioAdapterEventObserver, Snapshot } from '@luvio/engine';
 interface ReviveStartEvent {
     type: 'l2-revive-start';
 }
 interface ReviveEndEvent {
     type: 'l2-revive-end';
     duration: number;
-    l2Trips: number;
-    l2Duration: number;
+    snapshot: Snapshot<unknown, unknown>;
+    l2Trips: {
+        duration: number;
+        keysRequestedCount: number;
+    }[];
 }
 export declare type DurableEnvironmentAdapterEventData = ReviveStartEvent | ReviveEndEvent;
 export declare function isDurableEnvironmentEvent(event: EnvironmentAdapterEvent<unknown>): event is EnvironmentAdapterEvent<DurableEnvironmentAdapterEventData>;

package/dist/es/es2018/makeDurable/revive.d.ts

@@ -21,8 +21,10 @@ declare type ReviveResponse = {
  */
 export declare function publishDurableStoreEntries(durableRecords: DurableStoreEntries<unknown> | undefined, publish: (key: string, record: unknown) => void, publishMetadata: (key: string, metadata: StoreMetadata) => void): ReviveResponse;
 interface ReviveMetrics {
-    l2ReadCount: number;
-    l2ReadDuration: number;
+    l2Trips: {
+        keysRequestedCount: number;
+        duration: number;
+    }[];
 }
 interface ReviveResult<D, V> {
     snapshot: Snapshot<D, V>;

package/dist/umd/es2018/environments.js

@@ -135,7 +135,7 @@
      */
     function reviveSnapshot(baseEnvironment, durableStore, 
     // TODO [W-10165787]: We should only allow Unfulfilled snapshot be passed in
-    unavailableSnapshot, durableStoreErrorHandler, buildL1Snapshot, reviveMetrics = { l2ReadCount: 0, l2ReadDuration: 0 }) {
+    unavailableSnapshot, durableStoreErrorHandler, buildL1Snapshot, reviveMetrics = { l2Trips: [] }) {
         const { recordId, select, seenRecords, state } = unavailableSnapshot;
         // L2 can only revive Unfulfilled snapshots that have a selector since they have the
         // info needed to revive (like missingLinks) and rebuild.  Otherwise return L1 snapshot.
@@ -151,9 +151,12 @@
         const keysToRevive = keys(keysToReviveSet);
         const canonicalKeys = keysToRevive.map((x) => baseEnvironment.storeGetCanonicalKey(x));
         const start = Date.now();
-        reviveMetrics.l2ReadCount++;
+        const { l2Trips } = reviveMetrics;
         return durableStore.getEntries(canonicalKeys, DefaultDurableSegment).then((durableRecords) => {
-            reviveMetrics.l2ReadDuration += Date.now() - start;
+            l2Trips.push({
+                duration: Date.now() - start,
+                keysRequestedCount: canonicalKeys.length,
+            });
             const { revivedKeys, hadUnexpectedShape } = publishDurableStoreEntries(durableRecords, 
             // TODO [W-10072584]: instead of implicitly using L1 we should take in
             // publish and publishMetadata funcs, so callers can decide where to
@@ -703,9 +706,9 @@
                     const revivedSnapshot = reviveSnapshot(environment, durableStore, snapshot, durableStoreErrorHandler, () => injectedStoreLookup(snapshot.select, snapshot.refresh)).then((result) => {
                         emitDurableEnvironmentAdapterEvent({
                             type: 'l2-revive-end',
+                            snapshot: result.snapshot,
                             duration: Date.now() - start,
-                            l2Trips: result.metrics.l2ReadCount,
-                            l2Duration: result.metrics.l2ReadDuration,
+                            l2Trips: result.metrics.l2Trips,
                         }, adapterRequestContext.eventObservers);
                         return result.snapshot;
                     });

package/dist/umd/es2018/events.d.ts

@@ -1,13 +1,16 @@
 import type { EnvironmentAdapterEvent } from '@luvio/engine';
-import type { LuvioAdapterEventObserver } from '@luvio/engine';
+import type { LuvioAdapterEventObserver, Snapshot } from '@luvio/engine';
 interface ReviveStartEvent {
     type: 'l2-revive-start';
 }
 interface ReviveEndEvent {
     type: 'l2-revive-end';
     duration: number;
-    l2Trips: number;
-    l2Duration: number;
+    snapshot: Snapshot<unknown, unknown>;
+    l2Trips: {
+        duration: number;
+        keysRequestedCount: number;
+    }[];
 }
 export declare type DurableEnvironmentAdapterEventData = ReviveStartEvent | ReviveEndEvent;
 export declare function isDurableEnvironmentEvent(event: EnvironmentAdapterEvent<unknown>): event is EnvironmentAdapterEvent<DurableEnvironmentAdapterEventData>;

package/dist/umd/es2018/makeDurable/revive.d.ts

@@ -21,8 +21,10 @@ declare type ReviveResponse = {
  */
 export declare function publishDurableStoreEntries(durableRecords: DurableStoreEntries<unknown> | undefined, publish: (key: string, record: unknown) => void, publishMetadata: (key: string, metadata: StoreMetadata) => void): ReviveResponse;
 interface ReviveMetrics {
-    l2ReadCount: number;
-    l2ReadDuration: number;
+    l2Trips: {
+        keysRequestedCount: number;
+        duration: number;
+    }[];
 }
 interface ReviveResult<D, V> {
     snapshot: Snapshot<D, V>;

package/dist/umd/es5/environments.js

@@ -212,7 +212,7 @@
     // TODO [W-10165787]: We should only allow Unfulfilled snapshot be passed in
     unavailableSnapshot, durableStoreErrorHandler, buildL1Snapshot, reviveMetrics) {
         var _a;
-        if (reviveMetrics === void 0) { reviveMetrics = { l2ReadCount: 0, l2ReadDuration: 0 }; }
+        if (reviveMetrics === void 0) { reviveMetrics = { l2Trips: [] }; }
         var recordId = unavailableSnapshot.recordId, select = unavailableSnapshot.select, seenRecords = unavailableSnapshot.seenRecords, state = unavailableSnapshot.state;
         // L2 can only revive Unfulfilled snapshots that have a selector since they have the
         // info needed to revive (like missingLinks) and rebuild.  Otherwise return L1 snapshot.
@@ -228,10 +228,13 @@
         var keysToRevive = keys(keysToReviveSet);
         var canonicalKeys = keysToRevive.map(function (x) { return baseEnvironment.storeGetCanonicalKey(x); });
         var start = Date.now();
-        reviveMetrics.l2ReadCount++;
+        var l2Trips = reviveMetrics.l2Trips;
         return durableStore.getEntries(canonicalKeys, DefaultDurableSegment).then(function (durableRecords) {
             var _a;
-            reviveMetrics.l2ReadDuration += Date.now() - start;
+            l2Trips.push({
+                duration: Date.now() - start,
+                keysRequestedCount: canonicalKeys.length,
+            });
             var _b = publishDurableStoreEntries(durableRecords, 
             // TODO [W-10072584]: instead of implicitly using L1 we should take in
             // publish and publishMetadata funcs, so callers can decide where to
@@ -812,9 +815,9 @@
                     var revivedSnapshot = reviveSnapshot(environment, durableStore, snapshot, durableStoreErrorHandler, function () { return injectedStoreLookup(snapshot.select, snapshot.refresh); }).then(function (result) {
                         emitDurableEnvironmentAdapterEvent({
                             type: 'l2-revive-end',
+                            snapshot: result.snapshot,
                             duration: Date.now() - start_1,
-                            l2Trips: result.metrics.l2ReadCount,
-                            l2Duration: result.metrics.l2ReadDuration,
+                            l2Trips: result.metrics.l2Trips,
                         }, adapterRequestContext.eventObservers);
                         return result.snapshot;
                     });

package/dist/umd/es5/events.d.ts

@@ -1,13 +1,16 @@
 import type { EnvironmentAdapterEvent } from '@luvio/engine';
-import type { LuvioAdapterEventObserver } from '@luvio/engine';
+import type { LuvioAdapterEventObserver, Snapshot } from '@luvio/engine';
 interface ReviveStartEvent {
     type: 'l2-revive-start';
 }
 interface ReviveEndEvent {
     type: 'l2-revive-end';
     duration: number;
-    l2Trips: number;
-    l2Duration: number;
+    snapshot: Snapshot<unknown, unknown>;
+    l2Trips: {
+        duration: number;
+        keysRequestedCount: number;
+    }[];
 }
 export declare type DurableEnvironmentAdapterEventData = ReviveStartEvent | ReviveEndEvent;
 export declare function isDurableEnvironmentEvent(event: EnvironmentAdapterEvent<unknown>): event is EnvironmentAdapterEvent<DurableEnvironmentAdapterEventData>;

package/dist/umd/es5/makeDurable/revive.d.ts

@@ -21,8 +21,10 @@ declare type ReviveResponse = {
  */
 export declare function publishDurableStoreEntries(durableRecords: DurableStoreEntries<unknown> | undefined, publish: (key: string, record: unknown) => void, publishMetadata: (key: string, metadata: StoreMetadata) => void): ReviveResponse;
 interface ReviveMetrics {
-    l2ReadCount: number;
-    l2ReadDuration: number;
+    l2Trips: {
+        keysRequestedCount: number;
+        duration: number;
+    }[];
 }
 interface ReviveResult<D, V> {
     snapshot: Snapshot<D, V>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@luvio/environments",
-    "version": "0.122.0",
+    "version": "0.124.0",
     "description": "Luvio Environments",
     "repository": {
         "type": "git",
@@ -23,7 +23,7 @@
         "watch": "yarn build --watch"
     },
     "dependencies": {
-        "@luvio/engine": "0.122.0"
+        "@luvio/engine": "0.124.0"
     },
     "bundlesize": [
         {
@@ -40,5 +40,6 @@
                 ]
             }
         }
-    }
+    },
+    "gitHead": "50e7f51b6cf902290c846bc7ea661febc48fd145"
 }