donate this function; comment on why not using the usual _wrap; reduc…

…e TAV versions tested

plugins/node/opentelemetry-instrumentation-aws-sdk/.tav.yml

@@ -1,18 +1,18 @@
 "aws-sdk":
   # A small subset of releases in the range [2.308.0, 3) to reduce testing time.
-  versions: "2.308.0 || 2.548.0 || 2.785.0 || 2.1025.0 || 2.1265.0 || 2.1506.0 || >=2.1508.0"
+  versions: "2.308.0 || 2.556.0 || 2.801.0 || 2.1049.0 || 2.1297.0 || 2.1546.0 || >=2.1548.0"
   commands:
     - npm run test
 
 "@aws-sdk/client-s3":
   # A small subset of releases in the range [3.6.1, 4) to reduce testing time.
   # - 3.377.0 was a bad release (see issue #1828).
-  versions: "3.6.1 || 3.53.0 || 3.163.0 || 3.266.0 || 3.354.0 || 3.458.0 || >=3.462.0"
+  versions: "3.6.1 || 3.55.0 || 3.180.0 || 3.289.0 || 3.385.0 || 3.498.0 || >=3.503.1"
   commands:
     - npm run test
 
 "@aws-sdk/client-sqs":
   # A small subset of releases in the range [3.24.0, 4) to reduce testing time.
-  versions: "3.24.0 || 3.85.0 || 3.194.0 || 3.278.0 || 3.357.0 || 3.461.0 || >=3.462.0"
+  versions: "3.24.0 || 3.94.0 || 3.202.0 || 3.296.0 || 3.388.0 || 3.496.0 || >=3.503.1"
   commands:
     - npm run test

plugins/node/opentelemetry-instrumentation-aws-sdk/src/aws-sdk.ts

@@ -113,21 +113,23 @@
       v3MiddlewareStackFileNewVersions,
     ]);
 
-    // patch for @smithy/middleware-stack for aws-sdk packages v3.363.0+
+    // Patch for @smithy/middleware-stack for @aws-sdk/* packages v3.363.0+.
+    // As of @smithy/middleware-stack@2.1.0 `constructStack` is only available
+    // as a getter, so we cannot use `this._wrap()`.
     const self = this;
     const v3SmithyMiddlewareStack = new InstrumentationNodeModuleDefinition(
       '@smithy/middleware-stack',
       ['>=2.0.0'],
       (moduleExports, moduleVersion) => {
         const newExports = propwrap(
           moduleExports,
           'constructStack',
           (orig: any) => {
             self._diag.debug('propwrapping aws-sdk v3 constructStack');
             return self._getV3ConstructStackPatch(moduleVersion, orig);
           }
         );
         return newExports;
       }
     );
 

plugins/node/opentelemetry-instrumentation-aws-sdk/src/propwrap.ts

@@ -50,23 +50,21 @@
   from: any,
   except: string,
   desc?: PropertyDescriptor | undefined
 ) => {
   if ((from && typeof from === 'object') || typeof from === 'function') {
     for (const key of __getOwnPropNames(from)) {
       if (!__hasOwnProp.call(to, key) && key !== except) {
         __defProp(to, key, {
           get: () => from[key] as any,
           enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable,
         });
       }
     }
   }
   return to;
 };
 
 /**
- * Derived from https://github.com/elastic/apm-agent-nodejs/blob/main/lib/propwrap.js
- *
  * Return a new object that is a copy of `obj`, with its `subpath` property
  * replaced with the return value of `wrapper(original)`.
  *
@@ -103,55 +101,55 @@
  *    any but the last subpath part points to a non-Object.
  */
 export const propwrap = (obj: any, subpath: string, wrapper: Function): any => {
   const parts = subpath.split('.');
   const namespaces = [obj];
   let namespace = obj;
   let key;
   let val;
 
   // 1. Traverse the subpath parts to sanity check and get references to the
-  //    Objects that will will be copying.
+  //    Objects that we will be copying.
   for (let i = 0; i < parts.length; i++) {
     key = parts[i];
     val = namespace[key];
     if (!val) {
       throw new TypeError(
         `cannot wrap "${subpath}": "<obj>.${parts
           .slice(0, i)
           .join('.')}" is ${typeof val}`
       );
     } else if (i < parts.length - 1) {
       if (typeof val !== 'object') {
         throw new TypeError(
           `cannot wrap "${subpath}": "<obj>.${parts
             .slice(0, i)
             .join('.')}" is not an Object`
         );
       }
       namespace = val;
       namespaces.push(namespace);
     }
   }
 
   // 2. Now work backwards, wrapping each namespace with a new object that has a
   //    copy of all the properties, except the one that we've wrapped.
   for (let i = parts.length - 1; i >= 0; i--) {
     key = parts[i];
     namespace = namespaces[i];
     if (i === parts.length - 1) {
       const orig = namespace[key];
       val = wrapper(orig);
     } else {
       val = namespaces[i + 1];
     }
     const desc = __getOwnPropDesc(namespace, key);
     const wrappedNamespace = __defProp({}, key, {
       value: val,
       enumerable: !desc || desc.enumerable,
     });
     __copyProps(wrappedNamespace, namespace, key);
     namespaces[i] = wrappedNamespace;
   }
 
   return namespaces[0];
 };