@lwrjs/o11y 0.10.0-alpha.8 → 0.10.0

package/build/bundle/prod/lwr/o11yService/o11yService.js

@@ -1,2 +1,2 @@
-import{getInstrumentation as t}from"o11y/client";import{MODULE_DEFINE as e,MODULE_DEFINE_COUNT as r,BOOTSTRAP_END as n,BOOTSTRAP_DURATION as s,MODULE_FETCH_DURATION as i,MAPPINGS_FETCH_DURATION as a,MODULE_FETCH as o,MAPPINGS_FETCH as c,ROUTER_NAV as m,ROUTER_VIEW as h,ROUTER_NAV_DURATION as l,ROUTER_VIEW_DURATION as u,BOOTSTRAP_ERROR as f,BOOTSTRAP_ERROR_COUNT as k,MODULE_FETCH_COUNT as g,MODULE_ERROR as p,MODULE_ERROR_COUNT as b,MAPPINGS_FETCH_COUNT as T,MAPPINGS_ERROR as y,MAPPINGS_ERROR_COUNT as W,ROUTER_NAV_COUNT as d,ROUTER_ERROR as v,ROUTER_ERROR_COUNT as E}from"lwr/metrics";const M=[o,c,m,h],w=[l,u],O={[f]:k,[e]:r,[o]:g,[p]:b,[c]:T,[y]:W,[m]:d,[v]:E},V=Object.keys(O);class x{constructor(t,e){this.config=e||{},this.instrumentation=t}track(){this.trackExistingMarks(),this.setupObserver()}trackExistingMarks(){const t=performance.getEntriesByType("mark").filter((t=>t.name.startsWith(e)));t.length>0&&this.instrumentation.incrementCounter(r,t.length)}setupObserver(){new PerformanceObserver((t=>{t.getEntries().forEach((t=>{const{name:e,duration:r,startTime:o}=t;e===n&&this.instrumentation.trackValue(s,o);const c=V.find((t=>e.startsWith(t)));c&&this.instrumentation.incrementCounter(O[c],1),this.config.enableModuleFetchTracking&&e.startsWith(i)&&this.instrumentation.trackValue(e,r),this.config.enableMappingFetchTracking&&e.startsWith(a)&&this.instrumentation.trackValue(e,r),w.some((t=>e.startsWith(t)))&&this.instrumentation.trackValue(e,r),M.some((t=>e.startsWith(t)))||performance.clearMarks(e)}))})).observe({entryTypes:["mark","measure"]})}}const C=void 0!==globalThis.performance&&"function"==typeof globalThis.performance.mark,j=globalThis.LWR,F={track:()=>{}};function B(e){const r=t("lwrjs"),n=j.metricsConfig||{};(C?new x(r,n):F).track()}export{B as default};
+import{getInstrumentation as t}from"o11y/client";import{MODULE_DEFINE as e,MODULE_DEFINE_COUNT as r,BOOTSTRAP_END as n,BOOTSTRAP_DURATION as i,MODULE_FETCH as s,MODULE_FETCH_DURATION as a,MAPPINGS_FETCH as o,MAPPINGS_FETCH_DURATION as c,INIT as m,INIT_MODULE as l,ROUTER_NAV as h,ROUTER_VIEW as u,INIT_DURATION as f,INIT_MODULE_DURATION as k,ROUTER_NAV_DURATION as g,ROUTER_VIEW_DURATION as p,BOOTSTRAP_ERROR as b,BOOTSTRAP_ERROR_COUNT as y,INIT_MODULE_COUNT as T,MODULE_FETCH_COUNT as d,MODULE_ERROR as v,MODULE_ERROR_COUNT as E,MAPPINGS_FETCH_COUNT as M,MAPPINGS_ERROR as O,MAPPINGS_ERROR_COUNT as W,ROUTER_NAV_COUNT as w,ROUTER_ERROR as V,ROUTER_ERROR_COUNT as j}from"lwr/metrics";const x=[s,o,m,l,h,u],C={[m]:f,[l]:k,[h]:g,[u]:p},F=Object.keys(C),B={[b]:y,[l]:T,[e]:r,[s]:d,[v]:E,[o]:M,[O]:W,[h]:w,[V]:j},L=Object.keys(B);class P{constructor(t,e){this.config=e||{},this.instrumentation=t}track(){this.trackExistingMarks(),this.setupObserver()}trackExistingMarks(){const t=performance.getEntriesByType("mark").filter((t=>t.name.startsWith(e)));t.length>0&&this.instrumentation.incrementCounter(r,t.length)}setupObserver(){new PerformanceObserver((t=>{t.getEntries().forEach((t=>{const{name:e,duration:r,startTime:m,entryType:l}=t,h=e.split("-")[0];if(e===n&&this.instrumentation.trackValue(i,m),"mark"===l){const e=t.detail||{},r=L.find((t=>t===h));r&&this.instrumentation.incrementCounter(B[r],1,!1,e)}if("measure"===l){const n=t.detail||{};this.config.enableModuleFetchTracking&&e.startsWith(s)&&this.instrumentation.trackValue(a,r,!1,n),this.config.enableMappingFetchTracking&&e.startsWith(o)&&this.instrumentation.trackValue(c,r,!1,n);const i=F.find((t=>t===h));i&&this.instrumentation.trackValue(C[i],r,!1,n)}x.some((t=>e.startsWith(t)))||performance.clearMarks(e)}))})).observe({entryTypes:["mark","measure"]})}}const R=void 0!==globalThis.performance&&"function"==typeof globalThis.performance.mark,q=globalThis.LWR,z={track:()=>{}};function A(e){const r=t("lwrjs"),n=q.metricsConfig||{};(R?new P(r,n):z).track()}export{A as default};
 //# sourceMappingURL=o11yService.js.map

package/build/modules/lwr/o11yService/performanceApiSink.js

@@ -1,8 +1,15 @@
-import { BOOTSTRAP_DURATION, BOOTSTRAP_END, BOOTSTRAP_ERROR, BOOTSTRAP_ERROR_COUNT, MAPPINGS_ERROR, MAPPINGS_ERROR_COUNT, MAPPINGS_FETCH, MAPPINGS_FETCH_COUNT, MAPPINGS_FETCH_DURATION, MODULE_DEFINE, MODULE_DEFINE_COUNT, MODULE_ERROR, MODULE_ERROR_COUNT, MODULE_FETCH, MODULE_FETCH_COUNT, MODULE_FETCH_DURATION, ROUTER_ERROR, ROUTER_ERROR_COUNT, ROUTER_NAV, ROUTER_NAV_COUNT, ROUTER_NAV_DURATION, ROUTER_VIEW, ROUTER_VIEW_DURATION } from 'lwr/metrics';
-const doNotClear = [MODULE_FETCH, MAPPINGS_FETCH, ROUTER_NAV, ROUTER_VIEW];
-const durationMetrics = [ROUTER_NAV_DURATION, ROUTER_VIEW_DURATION];
+import { BOOTSTRAP_DURATION, BOOTSTRAP_END, BOOTSTRAP_ERROR, BOOTSTRAP_ERROR_COUNT, INIT, INIT_DURATION, INIT_MODULE, INIT_MODULE_DURATION, INIT_MODULE_COUNT, MAPPINGS_ERROR, MAPPINGS_ERROR_COUNT, MAPPINGS_FETCH, MAPPINGS_FETCH_COUNT, MAPPINGS_FETCH_DURATION, MODULE_DEFINE, MODULE_DEFINE_COUNT, MODULE_ERROR, MODULE_ERROR_COUNT, MODULE_FETCH, MODULE_FETCH_COUNT, MODULE_FETCH_DURATION, ROUTER_ERROR, ROUTER_ERROR_COUNT, ROUTER_NAV, ROUTER_NAV_COUNT, ROUTER_NAV_DURATION, ROUTER_VIEW, ROUTER_VIEW_DURATION } from 'lwr/metrics';
+const doNotClear = [MODULE_FETCH, MAPPINGS_FETCH, INIT, INIT_MODULE, ROUTER_NAV, ROUTER_VIEW];
+const durationMap = {
+  [INIT]: INIT_DURATION,
+  [INIT_MODULE]: INIT_MODULE_DURATION,
+  [ROUTER_NAV]: ROUTER_NAV_DURATION,
+  [ROUTER_VIEW]: ROUTER_VIEW_DURATION
+};
+const metricsToTrack = Object.keys(durationMap);
 const countMap = {
   [BOOTSTRAP_ERROR]: BOOTSTRAP_ERROR_COUNT,
+  [INIT_MODULE]: INIT_MODULE_COUNT,
   [MODULE_DEFINE]: MODULE_DEFINE_COUNT,
   [MODULE_FETCH]: MODULE_FETCH_COUNT,
   [MODULE_ERROR]: MODULE_ERROR_COUNT,
@@ -44,8 +51,10 @@ export class PerformanceApiSink {
         const {
           name,
           duration,
-          startTime
+          startTime,
+          entryType
         } = entry;
+        const id = name.split('-')[0];
 
         // Track the bootstrap duration from navigation.start to lwr.bootstrap.end
         if (name === BOOTSTRAP_END) {
@@ -53,20 +62,27 @@ export class PerformanceApiSink {
         }
 
         // Increment count metrics
-        const metricToCount = metricsToCount.find(c => name.startsWith(c));
-        if (metricToCount) {
-          this.instrumentation.incrementCounter(countMap[metricToCount], 1);
+        if (entryType === 'mark') {
+          const metadata = entry.detail || {};
+          const metricToCount = metricsToCount.find(c => c === id);
+          if (metricToCount) {
+            this.instrumentation.incrementCounter(countMap[metricToCount], 1, false, metadata);
+          }
         }
 
         // Record duration metrics
-        if (this.config.enableModuleFetchTracking && name.startsWith(MODULE_FETCH_DURATION)) {
-          this.instrumentation.trackValue(name, duration);
-        }
-        if (this.config.enableMappingFetchTracking && name.startsWith(MAPPINGS_FETCH_DURATION)) {
-          this.instrumentation.trackValue(name, duration);
-        }
-        if (durationMetrics.some(d => name.startsWith(d))) {
-          this.instrumentation.trackValue(name, duration);
+        if (entryType === 'measure') {
+          const tags = entry.detail || {};
+          if (this.config.enableModuleFetchTracking && name.startsWith(MODULE_FETCH)) {
+            this.instrumentation.trackValue(MODULE_FETCH_DURATION, duration, false, tags);
+          }
+          if (this.config.enableMappingFetchTracking && name.startsWith(MAPPINGS_FETCH)) {
+            this.instrumentation.trackValue(MAPPINGS_FETCH_DURATION, duration, false, tags);
+          }
+          const metricToTrack = metricsToTrack.find(d => d === id);
+          if (metricToTrack) {
+            this.instrumentation.trackValue(durationMap[metricToTrack], duration, false, tags);
+          }
         }
 
         // Remove clearable marks

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.10.0-alpha.8",
+    "version": "0.10.0",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -24,15 +24,15 @@
         "build:bundle": "rollup --config scripts/rollup.moduleBundle.config.cjs"
     },
     "dependencies": {
-        "@lwrjs/shared-utils": "0.10.0-alpha.8"
+        "@lwrjs/shared-utils": "0.10.0"
     },
     "devDependencies": {
         "@rollup/plugin-sucrase": "^5.0.1",
-        "@rollup/plugin-terser": "^0.4.1",
+        "@rollup/plugin-terser": "^0.4.3",
         "rollup": "^2.78.0"
     },
     "peerDependencies": {
-        "o11y": "244.x"
+        "o11y": "246.x"
     },
     "lwc": {
         "modules": [
@@ -48,7 +48,7 @@
         ]
     },
     "engines": {
-        "node": ">=16.0.0 <20"
+        "node": ">=16.0.0"
     },
-    "gitHead": "46bd72343e1db7c72470033320921df3a7eff18a"
+    "gitHead": "e6deaeef3db8aa079acefed508897eca19b3218a"
 }