@salesforce/lds-instrumentation 1.208.0 → 1.209.0

package/dist/ldsInstrumentation.js

@@ -948,7 +948,7 @@ function logAdapterCacheMissOutOfTtlDuration(name, config, currentCacheMissTimes
 function startAdapterActivity(instrumentation, adapterName, requestContext) {
     if (requestContext === undefined ||
         requestContext.requestCorrelator === undefined ||
-        requestContext.requestCorrelator.observabilityContext === undefined) {
+        getObservabilityContext(requestContext) === undefined) {
         return instrumentation.startActivity(adapterName);
     }
     const { traceId, ...rest } = requestContext.requestCorrelator
@@ -1023,6 +1023,8 @@ function instrumentAdapter(adapter, metadata, adapterInstrumentationOptions) {
         incrementAdapterCachePolicyType(requestContext);
         // start collecting
         const activity = startAdapterActivity(ldsInstrumentation, adapterName, requestContext);
+        // swap in activity's Id if observabilityContext exists
+        updateRequestContext(activity, requestContext);
         return runAdapterWithReport(metadata.name, adapter, config, requestContext || {}, (report) => {
             const { executionTime } = report;
             switch (report.result) {
@@ -1107,6 +1109,26 @@ function instrumentAdapter(adapter, metadata, adapterInstrumentationOptions) {
         ? instrumentGraphqlAdapter(instrumentedAdapter)
         : instrumentedAdapter;
 }
+/**
+ * Replaces observabilityContext's traceId with parentActivity's Id since traceId
+ * is treated as parentId when observabilityContext is passed to native as part of
+ * the network request.
+ * @param parentActivity
+ * @param requestContext
+ */
+function updateRequestContext(parentActivity, requestContext) {
+    if (requestContext !== undefined) {
+        const observabilityContext = getObservabilityContext(requestContext);
+        if (observabilityContext !== undefined) {
+            observabilityContext.traceId = parentActivity.getId();
+        }
+    }
+}
+function getObservabilityContext(requestContext) {
+    return requestContext.requestCorrelator !== undefined
+        ? requestContext.requestCorrelator.observabilityContext
+        : undefined;
+}
 /**
  * Any graphql get adapter specific instrumentation that we need to log
  * @param snapshot from either in-memory or built after a network hit
@@ -1466,4 +1488,4 @@ function setStoreEventObservers(store) {
 const instrumentation = new Instrumentation();
 
 export { Instrumentation, LRUCache, metricKeys as METRIC_KEYS, handleIngestedNewData, handleOnDataOutOfTtlDurationUpdate, incrementCounterMetric, incrementGetRecordNormalInvokeCount, incrementGetRecordNotifyChangeAllowCount, incrementGetRecordNotifyChangeDropCount, incrementNotifyRecordUpdateAvailableAllowCount, incrementNotifyRecordUpdateAvailableDropCount, instrumentAdapter, instrumentLuvio, instrumentMethods, instrumentStoreMethods, instrumentation, logObjectInfoChanged, setInstrumentationHooks, setLdsAdaptersUiapiInstrumentation, setLdsNetworkAdapterInstrumentation, setStoreEventObservers, setupInstrumentation, startAdapterActivity, updatePercentileHistogramMetric };
-// version: 1.208.0-75bd0667c
+// version: 1.209.0-6b633d53a

package/dist/types/__mocks__/o11y/activity.d.ts

@@ -7,5 +7,6 @@ export declare const activity: {
     error: typeof error;
     discard: typeof discard;
     terminate: typeof terminate;
+    getId: () => string;
 };
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-instrumentation",
-    "version": "1.208.0",
+    "version": "1.209.0",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "Instrumentation utils for Lightning Data Service",
     "main": "dist/ldsInstrumentation.js",