@komaci/prefetch 244.1.0 → 244.1.3

package/build/__tests__/prefetchService.spec.js

@@ -85,7 +85,7 @@ describe('prefetchService', () => {
                     MaxResolutionDepth: 512,
                     WireTimeout: 180 * 1000,
                     WireSlowRunningTimeout: 30 * 1000,
-                });
+                }, expect.anything());
                 expect(mockGetBulkAdgResolver.mock.calls[0][1]).toHaveLength(1);
             });
         });
@@ -407,7 +407,7 @@ describe('prefetchService', () => {
                         MaxResolutionDepth: 512,
                         WireTimeout: 180 * 1000,
                         WireSlowRunningTimeout: 30 * 1000,
-                    });
+                    }, expect.anything());
                     expect(mockGetBulkAdgResolver.mock.calls[0][1]).toHaveLength(2);
                 });
             });
@@ -455,7 +455,7 @@ describe('prefetchService', () => {
                         MaxResolutionDepth: 512,
                         WireTimeout: 180 * 1000,
                         WireSlowRunningTimeout: 30 * 1000,
-                    });
+                    }, expect.anything());
                     expect(onAddressProcessed).toHaveBeenCalledTimes(2);
                     expect(onAddressProcessed).toHaveBeenNthCalledWith(1, expect.objectContaining({
                         state: 'rejected',
@@ -509,7 +509,7 @@ describe('prefetchService', () => {
                         MaxResolutionDepth: 512,
                         WireTimeout: 180 * 1000,
                         WireSlowRunningTimeout: 30 * 1000,
-                    });
+                    }, expect.anything());
                     expect(mockGetBulkAdgResolver).toHaveBeenNthCalledWith(2, adgFunction2, expect.arrayContaining([
                         expect.objectContaining({
                             context: { CurrentPageReference: pageRef2 },
@@ -523,7 +523,7 @@ describe('prefetchService', () => {
                         MaxResolutionDepth: 512,
                         WireTimeout: 180 * 1000,
                         WireSlowRunningTimeout: 30 * 1000,
-                    });
+                    }, expect.anything());
                 });
             });
             const { onStateChanged, onAddressProcessed } = mockPrefetchConfig;
@@ -593,7 +593,7 @@ describe('prefetchService', () => {
                         MaxResolutionDepth: 512,
                         WireTimeout: 180 * 1000,
                         WireSlowRunningTimeout: 30 * 1000,
-                    });
+                    }, expect.anything());
                     expect(onStateChanged).toHaveBeenCalledTimes(2);
                     expect(onAddressProcessed).toHaveBeenCalledTimes(2);
                     expect(onAddressProcessed).toHaveBeenNthCalledWith(1, expect.objectContaining({
@@ -658,7 +658,7 @@ describe('prefetchService', () => {
                                 MaxResolutionDepth: 512,
                                 WireTimeout: 180 * 1000,
                                 WireSlowRunningTimeout: 30 * 1000,
-                            });
+                            }, expect.anything());
                             expect(mockGetBulkAdgResolver).toHaveBeenCalledWith(adgFunction1, expect.arrayContaining([
                                 expect.objectContaining({
                                     context: { CurrentPageReference: pageRef1_2 },
@@ -672,7 +672,7 @@ describe('prefetchService', () => {
                                 MaxResolutionDepth: 512,
                                 WireTimeout: 180 * 1000,
                                 WireSlowRunningTimeout: 30 * 1000,
-                            });
+                            }, expect.anything());
                             expect(mockGetBulkAdgResolver.mock.calls[0][1]).toHaveLength(1);
                             expect(mockGetBulkAdgResolver.mock.calls[1][1]).toHaveLength(1);
                         });
@@ -707,7 +707,7 @@ describe('prefetchService', () => {
                                 MaxResolutionDepth: 512,
                                 WireTimeout: 180 * 1000,
                                 WireSlowRunningTimeout: 30 * 1000,
-                            });
+                            }, expect.anything());
                             expect(mockGetBulkAdgResolver).toHaveBeenCalledWith(adgFunction2, expect.arrayContaining([
                                 expect.objectContaining({
                                     context: { CurrentPageReference: pageRef2_1 },
@@ -724,7 +724,7 @@ describe('prefetchService', () => {
                                 MaxResolutionDepth: 512,
                                 WireTimeout: 180 * 1000,
                                 WireSlowRunningTimeout: 30 * 1000,
-                            });
+                            }, expect.anything());
                             expect(mockGetBulkAdgResolver.mock.calls[0][1]).toHaveLength(2);
                             expect(mockGetBulkAdgResolver.mock.calls[1][1]).toHaveLength(2);
                             expect(prefetchService.resolutionGroups[1].bulkResolver).toBe(undefined);

package/build/modules/komaci/prefetchService/prefetchService.d.ts

@@ -13,6 +13,7 @@ export declare class PrefetchService<TAddress = PageReference> implements IPrefe
     private _activity;
     private readonly _startTime;
     private readonly _size;
+    private readonly _prefetchId;
     constructor(router: Router<TAddress>, addresses: TAddress[], config?: PrefetchConfig<TAddress>);
     /**
      * Processes the given address through the router, retrieving the AdgFunction if

package/build/modules/komaci/prefetchService/prefetchService.js

@@ -2,6 +2,7 @@ import { ERROR_PREFIX, PrefetchStatusStates as STATE, } from 'komaci/prefetchTyp
 import { getInstrumentation } from 'o11y/client';
 import { getBulkAdgResolver } from 'komaci/resolver';
 import { InstrumentedAction } from 'komaci/instrumentedAction';
+import { generateId } from 'komaci/utils';
 import { bulkResolveSchema, prefetchSchema, prefetchServiceSchema, totalRoutingSchema, } from 'o11y_schema/sf_komaci';
 const NO_ADG_MODULE_FOUND = 'No ADG module found for given address.';
 const ValidStatusTransitions = {
@@ -33,6 +34,7 @@ export class PrefetchService {
         this._activity = this._instrumentation.startActivity('prefetch', this.apiOptions);
         this._size = addresses.length;
         this._startTime = Date.now();
+        this._prefetchId = generateId();
         this.prefetch(addresses);
     }
     /**
@@ -42,7 +44,10 @@ export class PrefetchService {
      * @returns AdgRoutingResult encapsulating the status, original address, and adgFn
      */
     processAddress(address) {
-        const userSchemaData = { page: JSON.stringify(address) };
+        const userSchemaData = {
+            page: JSON.stringify(address),
+            prefetchId: this._prefetchId,
+        };
         let resolveViewResult;
         try {
             resolveViewResult = this.router.resolveView(address);
@@ -181,7 +186,7 @@ export class PrefetchService {
             const processList = addresses.slice(i, Math.min(addresses.length, i + maxConcurrent));
             results.push(...(await Promise.all(processList.map((address) => this.processAddress(address)))));
         }
-        action.finishAction(false, {});
+        action.finishAction(false, { userSchemaData: { prefetchId: this._prefetchId } });
         return results;
     }
     /**
@@ -241,7 +246,7 @@ export class PrefetchService {
         if (this.state == STATE.stopped) {
             return;
         }
-        const action = InstrumentedAction.startAction('komaci', bulkResolveSchema, {
+        const action = InstrumentedAction.startAction('komaci.bulk-resolve', bulkResolveSchema, {
             instrumentWithoutLog: false,
             postTimeInLog: true,
             apiOptions: this.apiOptions,
@@ -260,8 +265,9 @@ export class PrefetchService {
             resolverInputStatus,
         };
         bulkResolutionGroup.adgInputs = adgInputs;
+        const bulkResolverId = generateId();
         const bulkResolutionStatusCbs = {
-            bulkResolutionStatusCb: this.onBulkResolutionStatus.bind(this, bulkResolutionGroup, action),
+            bulkResolutionStatusCb: this.onBulkResolutionStatus.bind(this, bulkResolutionGroup, action, bulkResolverId),
             overallBulkResolutionStatusCb: undefined,
         };
         const environmentCfg = {
@@ -271,7 +277,7 @@ export class PrefetchService {
             WireTimeout: 180 * 1000,
             WireSlowRunningTimeout: 30 * 1000,
         };
-        bulkResolutionGroup.bulkResolver = getBulkAdgResolver(adgFn, adgInputs, bulkResolutionStatusCbs, environmentCfg);
+        bulkResolutionGroup.bulkResolver = getBulkAdgResolver(adgFn, adgInputs, bulkResolutionStatusCbs, environmentCfg, { prefetchId: this._prefetchId, bulkResolverId: bulkResolverId });
         this.resolutionGroups.push(bulkResolutionGroup);
         bulkResolutionGroup.bulkResolver.start();
     }
@@ -282,7 +288,7 @@ export class PrefetchService {
      * @param action InstrumentationContext
      * @param status
      */
-    onBulkResolutionStatus(bulkResolutionGroup, action, status) {
+    onBulkResolutionStatus(bulkResolutionGroup, action, bulkResolverId, status) {
         var _a;
         const state = status.status.getState();
         const index = status.index;
@@ -298,6 +304,8 @@ export class PrefetchService {
             action.finishAction(false, {
                 userSchemaData: {
                     keyCount: addresses.length,
+                    prefetchId: this._prefetchId,
+                    bulkResolverId: bulkResolverId,
                 },
             });
         }
@@ -387,6 +395,7 @@ export class PrefetchService {
                 this._activity.stop(prefetchServiceSchema, {
                     addressCount: this._size,
                     startTime: this._startTime,
+                    prefetchId: this._prefetchId,
                 });
                 this.updateState(STATE.done, status.status.getErrorMessages().join('\n'));
                 bulkResolutionContext.bulkResolver = undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@komaci/prefetch",
-    "version": "244.1.0",
+    "version": "244.1.3",
     "description": "Komaci prefetch service.",
     "homepage": "https://komaci.dev/",
     "repository": {
@@ -26,14 +26,14 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@komaci/module-shared": "244.1.0",
-        "@komaci/resolver": "244.1.0",
+        "@komaci/module-shared": "244.1.3",
+        "@komaci/resolver": "244.1.3",
         "@lwrjs/router": "0.6.0-alpha.15",
         "o11y": "^244.0.0",
-        "o11y_schema": "^244.0.0"
+        "o11y_schema": "^244.4.0"
     },
     "devDependencies": {
-        "@komaci/types": "244.1.0",
+        "@komaci/types": "244.1.3",
         "wait-for-expect": "^3.0.2"
     }
 }