Merge branch 'develop' into mrt-test-ci-deploy

Author: vcua-mobify

packages/pwa-kit-react-sdk/CHANGELOG.md

@@ -1,4 +1,5 @@
 ## v3.10.0-dev (Feb 18, 2025)
+- Fix the performance logging util to use the correct delimiter for the server-timing header. [#2225](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2295)
 
 ## v3.9.0 (Feb 18, 2025)
 - Fix the performance logging util to not round duration. [#2199](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2199)

packages/pwa-kit-react-sdk/src/ssr/universal/components/with-legacy-get-props/index.js

@@ -34,7 +34,7 @@ export const withLegacyGetProps = (Wrapped) => {
                 // getTemplateName should be very fast, under 0.2ms
                 c.getTemplateName().then((templateName) => {
                     res.__performanceTimer.mark(
-                        `${PERFORMANCE_MARKS.getProps}::${templateName}`,
+                        `${PERFORMANCE_MARKS.getProps}.${templateName}`,
                         'start'
                     )
                 })
@@ -49,7 +49,7 @@ export const withLegacyGetProps = (Wrapped) => {
                           .then((result) => {
                               c.getTemplateName().then((templateName) => {
                                   res.__performanceTimer.mark(
-                                      `${PERFORMANCE_MARKS.getProps}::${templateName}`,
+                                      `${PERFORMANCE_MARKS.getProps}.${templateName}`,
                                       'end'
                                   )
                               })

packages/pwa-kit-react-sdk/src/ssr/universal/components/with-react-query/index.js

@@ -79,14 +79,14 @@ export const withReactQuery = (Wrapped, options = {}) => {
                     // always include the index to avoid duplicate entries
                     const displayName = q.meta?.displayName ? `${q.meta?.displayName}:${i}` : `${i}`
                     res.__performanceTimer.mark(
-                        `${PERFORMANCE_MARKS.reactQueryUseQuery}::${displayName}`,
+                        `${PERFORMANCE_MARKS.reactQueryUseQuery}.${displayName}`,
                         'start'
                     )
                     return q
                         .fetch()
                         .then((result) => {
                             res.__performanceTimer.mark(
-                                `${PERFORMANCE_MARKS.reactQueryUseQuery}::${displayName}`,
+                                `${PERFORMANCE_MARKS.reactQueryUseQuery}.${displayName}`,
                                 'end',
                                 {
                                     detail: q.queryHash

packages/pwa-kit-react-sdk/src/utils/performance.js

@@ -6,14 +6,14 @@
  */
 import logger from './logger-instance'
 export const PERFORMANCE_MARKS = {
-    total: 'ssr:total',
-    renderToString: 'ssr:render-to-string',
-    routeMatching: 'ssr:route-matching',
-    loadComponent: 'ssr:load-component',
-    fetchStrategies: 'ssr:fetch-strategies',
-    reactQueryPrerender: 'ssr:fetch-strategies:react-query:pre-render',
-    reactQueryUseQuery: 'ssr:fetch-strategies:react-query:use-query',
-    getProps: 'ssr:fetch-strategies:get-prop'
+    total: 'ssr.total',
+    renderToString: 'ssr.render-to-string',
+    routeMatching: 'ssr.route-matching',
+    loadComponent: 'ssr.load-component',
+    fetchStrategies: 'ssr.fetch-strategies',
+    reactQueryPrerender: 'ssr.fetch-strategies.react-query.pre-render',
+    reactQueryUseQuery: 'ssr.fetch-strategies.react-query.use-query',
+    getProps: 'ssr.fetch-strategies.get-prop'
 }
 
 /**