@adobe/spacecat-shared-utils 1.37.0 → 1.37.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [@adobe/spacecat-shared-utils-v1.37.2](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-utils-v1.37.1...@adobe/spacecat-shared-utils-v1.37.2) (2025-05-06)
+
+
+### Bug Fixes
+
+* **xray:** local friendly xray instrumentation ([#714](https://github.com/adobe/spacecat-shared/issues/714)) ([7c7cebd](https://github.com/adobe/spacecat-shared/commit/7c7cebdde4e1c0b24c80201c5d16a68f470122cb))
+
+# [@adobe/spacecat-shared-utils-v1.37.1](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-utils-v1.37.0...@adobe/spacecat-shared-utils-v1.37.1) (2025-05-03)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([#712](https://github.com/adobe/spacecat-shared/issues/712)) ([76cebd2](https://github.com/adobe/spacecat-shared/commit/76cebd2a7a7b9799e4ca265833620eada01f5c8c))
+
 # [@adobe/spacecat-shared-utils-v1.37.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-utils-v1.36.3...@adobe/spacecat-shared-utils-v1.37.0) (2025-04-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-shared-utils",
-  "version": "1.37.0",
+  "version": "1.37.2",
   "description": "Shared modules of the Spacecat Services - utils",
   "type": "module",
   "engines": {
@@ -46,8 +46,8 @@
   },
   "dependencies": {
     "@adobe/fetch": "4.2.0",
-    "@aws-sdk/client-s3": "3.797.0",
-    "@aws-sdk/client-sqs": "3.797.0",
+    "@aws-sdk/client-s3": "3.802.0",
+    "@aws-sdk/client-sqs": "3.799.0",
     "@json2csv/plainjs": "7.0.6",
     "aws-xray-sdk": "3.10.3",
     "uuid": "11.1.0"

package/src/index.js

@@ -49,7 +49,7 @@ export { sqsWrapper } from './sqs.js';
 export { sqsEventAdapter } from './sqs.js';
 
 export { logWrapper } from './log-wrapper.js';
-export { xrayWrapper } from './xray.js';
+export { instrumentAWSClient } from './xray.js';
 
 export {
   composeBaseURL,

package/src/s3.js

@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import AWSXray from 'aws-xray-sdk';
 import { S3Client } from '@aws-sdk/client-s3';
+import { instrumentAWSClient } from './xray.js';
 
 /**
  * Adds an S3Client instance and bucket to the context.
@@ -29,7 +29,7 @@ export function s3Wrapper(fn) {
         S3_BUCKET_NAME: bucket,
       } = context.env;
 
-      context.s3.s3Client = AWSXray.captureAWSv3Client(new S3Client({ region }));
+      context.s3.s3Client = instrumentAWSClient(new S3Client({ region }));
       context.s3.s3Bucket = bucket;
     }
 

package/src/sqs.js

@@ -12,7 +12,7 @@
 
 import { Response } from '@adobe/fetch';
 import { SendMessageCommand, SQSClient } from '@aws-sdk/client-sqs';
-import AWSXray from 'aws-xray-sdk';
+import { instrumentAWSClient } from './xray.js';
 
 import { hasText, isNonEmptyArray } from './functions.js';
 
@@ -30,7 +30,7 @@ function badRequest(message) {
  */
 class SQS {
   constructor(region, log) {
-    this.sqsClient = AWSXray.captureAWSv3Client(new SQSClient({ region }));
+    this.sqsClient = instrumentAWSClient(new SQSClient({ region }));
     this.log = log;
   }
 

package/src/tracing-fetch.js

@@ -151,13 +151,6 @@ const fetchWithTimeout = async (resource, options, signal) => {
  * @returns {Promise<Response>} The response from the fetch request.
  */
 export async function tracingFetch(url, options) {
-  // fallback to adobe fetch outside an aws lambda function
-  if (!isAWSLambda()) {
-    return adobeFetch;
-  }
-
-  const parentSegment = AWSXRay.getSegment();
-
   options = isObject(options) ? { ...options } : {};
   options.headers = isObject(options.headers) ? options.headers : { };
 
@@ -180,6 +173,13 @@ export async function tracingFetch(url, options) {
     options.headers['User-Agent'] = SPACECAT_USER_AGENT;
   }
 
+  // fallback to adobe fetch outside an aws lambda function
+  if (!isAWSLambda()) {
+    return fetchWithTimeout(url, options, signal);
+  }
+
+  const parentSegment = AWSXRay.getSegment();
+
   // If no parent segment, perform fetch without tracing
   if (!parentSegment) {
     return fetchWithTimeout(url, options, signal);

package/src/xray.js

@@ -13,16 +13,6 @@
 import AWSXray from 'aws-xray-sdk';
 import { isAWSLambda } from './runtimes.js';
 
-export function xrayWrapper(fn) {
-  return async (req, context) => {
-    if (context.xray) {
-      return context.xray;
-    }
-
-    context.xray = {
-      instrument: (client) => (isAWSLambda() ? AWSXray.captureAWSv3Client(client) : client),
-    };
-
-    return fn(req, context);
-  };
+export function instrumentAWSClient(client) {
+  return isAWSLambda() ? AWSXray.captureAWSv3Client(client) : client;
 }