@lwrjs/shared-utils 0.20.2 → 0.20.3

package/build/cjs/env.cjs

@@ -39,6 +39,7 @@ function getFeatureFlags() {
     LEGACY_LOADER: parseBooleanFlag("LEGACY_LOADER"),
     LWR_TRACING: parseTracingFlag(),
     DISABLE_B3_TRACING: parseBooleanFlag("DISABLE_B3_TRACING"),
+    MRT_B3_TRACING: parseBooleanFlag("MRT_B3_TRACING"),
     MAX_VIEW_CACHE_TTL: parseStringFlag("MAX_VIEW_CACHE_TTL"),
     REEVALUATE_MODULES: parseBooleanFlag("REEVALUATE_MODULES"),
     SSR_COMPILER_ENABLED: parseBooleanFlag("SSR_COMPILER_ENABLED"),
@@ -61,6 +62,14 @@ function parseTracingFlag() {
   const tracingValue = process.env.LWR_TRACING?.toLowerCase();
   return tracingValue && tracingValue !== "off" ? process.env.LWR_TRACING : void 0;
 }
+function shouldEnableB3Headers() {
+  const flags = getFeatureFlags();
+  const isMRT = isLambdaEnv() || process.env.MRT_REQUEST_CLASS || process.env.MOBIFY_PROPERTY_ID;
+  if (isMRT) {
+    return flags.MRT_B3_TRACING !== false;
+  }
+  return true;
+}
 function isLambdaEnv() {
   return process.env.AWS_LAMBDA_FUNCTION_NAME !== void 0;
 }
@@ -131,7 +140,7 @@ function getTraceHeaders(runtimeParams, span) {
     headers[TRUE_CLIENT_IP] = runtimeParams.trueClientIP;
   if (runtimeParams.correlationID)
     headers[CORRELATION_ID] = runtimeParams.correlationID;
-  if (!getFeatureFlags().DISABLE_B3_TRACING) {
+  if (shouldEnableB3Headers()) {
     if (span?.traceId) {
       headers[B3_TRACE_ID] = span.traceId;
       headers[B3_SAMPLED] = parseTracingFlag() ? "1" : "0";

package/build/es/env.js

@@ -15,7 +15,10 @@ export function getFeatureFlags() {
         // Enable metrics log level 'off', 'default' or 'verbose'
         LWR_TRACING: parseTracingFlag(),
         // Turn off distributed tracing (B3 headers, traceparent meta tag, MRT span exporting)
+        // Legacy flag - kept for backward compatibility but no longer controls B3 headers
         DISABLE_B3_TRACING: parseBooleanFlag('DISABLE_B3_TRACING'),
+        // Control x-b3-* distributed tracing headers specifically for MRT sites
+        MRT_B3_TRACING: parseBooleanFlag('MRT_B3_TRACING'),
         // Max size of ViewDefinition time to live
         MAX_VIEW_CACHE_TTL: parseStringFlag('MAX_VIEW_CACHE_TTL'),
         // Forces SSR to re-evaluate modules for every page render. By default, modules are evaluated only once.
@@ -54,13 +57,32 @@ function parseStringFlag(flag) {
     return value || undefined;
 }
 /**
- * Helper function to parse the LWR_TRACING flag.
- * Returns the value if it's not 'off' and is defined, otherwise returns false.
+ * Helper function to parse the LWR_TRACING flag for OpenTelemetry spans/instrumentation.
+ * Returns the value if it's not 'off' and is defined, otherwise returns undefined.
+ * This controls OpenTelemetry spans, NOT B3 distributed tracing headers.
  */
 function parseTracingFlag() {
     const tracingValue = process.env.LWR_TRACING?.toLowerCase();
     return tracingValue && tracingValue !== 'off' ? process.env.LWR_TRACING : undefined;
 }
+/**
+ * Helper function to determine if B3 distributed tracing headers should be enabled.
+ * Uses MRT_B3_TRACING for MRT sites, always enabled for non-MRT sites.
+ * Separates OpenTelemetry spans (LWR_TRACING) from B3 header propagation.
+ *
+ * @returns true if B3 distributed tracing headers should be set
+ */
+function shouldEnableB3Headers() {
+    const flags = getFeatureFlags();
+    // Check if this is an MRT environment
+    const isMRT = isLambdaEnv() || process.env.MRT_REQUEST_CLASS || process.env.MOBIFY_PROPERTY_ID;
+    if (isMRT) {
+        // For MRT sites, use the MRT-specific distributed tracing flag
+        return flags.MRT_B3_TRACING !== false;
+    }
+    // For non-MRT sites, always enable B3 headers
+    return true;
+}
 /**
  * This function is used to determine if the current environment is a lambda.
  *
@@ -167,7 +189,9 @@ export function getTraceHeaders(runtimeParams, span) {
         headers[TRUE_CLIENT_IP] = runtimeParams.trueClientIP;
     if (runtimeParams.correlationID)
         headers[CORRELATION_ID] = runtimeParams.correlationID;
-    if (!getFeatureFlags().DISABLE_B3_TRACING) {
+    // Set B3 distributed tracing headers for request correlation across microservices
+    // These headers are controlled independently from OpenTelemetry spans (LWR_TRACING)
+    if (shouldEnableB3Headers()) {
         if (span?.traceId) {
             headers[B3_TRACE_ID] = span.traceId;
             headers[B3_SAMPLED] = parseTracingFlag() ? '1' : '0';

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.20.2",
+    "version": "0.20.3",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -37,7 +37,7 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.20.2",
+        "@lwrjs/diagnostics": "0.20.3",
         "es-module-lexer": "^1.5.4",
         "fast-json-stable-stringify": "^2.1.0",
         "magic-string": "^0.30.9",
@@ -50,7 +50,7 @@
         "slugify": "^1.4.5"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.20.2",
+        "@lwrjs/types": "0.20.3",
         "@types/mime-types": "2.1.4",
         "@types/path-to-regexp": "^1.7.0",
         "memfs": "^4.13.0"
@@ -58,5 +58,5 @@
     "engines": {
         "node": ">=20.0.0"
     },
-    "gitHead": "be82aca54f9a3b6cd18a4aac86f2f96c0184a930"
+    "gitHead": "54759076bcb5d09e143a620e7653e2494658aefb"
 }