chore: updated more libs

Author: abhilash-sivan

packages/core/src/tracing/instrumentation/cloud/aws-sdk/v3/sqs-consumer.js

@@ -24,17 +24,22 @@ function instrument(SQSConsumer) {
           span.disableAutoEnd();
           const res = orig.apply(this, arguments);
 
-          res
-            .then(() => {
-              span.d = Date.now() - span.ts;
-              span.transmitManual();
-            })
-            .catch(err => {
-              span.ec = 1;
-              tracingUtil.setErrorDetails(span, err, 'sqs');
-              span.d = Date.now() - span.ts;
-              span.transmitManual();
-            });
+          if (res && typeof res.then === 'function') {
+            res
+              .then(() => {
+                span.d = Date.now() - span.ts;
+                span.transmitManual();
+              })
+              .catch(err => {
+                span.ec = 1;
+                tracingUtil.setErrorDetails(span, err, 'sqs');
+                span.d = Date.now() - span.ts;
+                span.transmitManual();
+              });
+          } else {
+            span.d = Date.now() - span.ts;
+            span.transmitManual();
+          }
 
           return res;
         });
@@ -56,17 +61,22 @@ function instrument(SQSConsumer) {
           span.disableAutoEnd();
           const res = orig.apply(this, arguments);
 
-          res
-            .then(() => {
-              span.d = Date.now() - span.ts;
-              span.transmitManual();
-            })
-            .catch(err => {
-              span.ec = 1;
-              tracingUtil.setErrorDetails(span, err, 'sqs');
-              span.d = Date.now() - span.ts;
-              span.transmitManual();
-            });
+          if (res && typeof res.then === 'function') {
+            res
+              .then(() => {
+                span.d = Date.now() - span.ts;
+                span.transmitManual();
+              })
+              .catch(err => {
+                span.ec = 1;
+                tracingUtil.setErrorDetails(span, err, 'sqs');
+                span.d = Date.now() - span.ts;
+                span.transmitManual();
+              });
+          } else {
+            span.d = Date.now() - span.ts;
+            span.transmitManual();
+          }
 
           return res;
         });

packages/core/src/tracing/instrumentation/control_flow/graphqlSubscriptions.js

@@ -62,18 +62,23 @@ function shimPushValue(originalFunction) {
 function shimPullValue(originalFunction) {
   return function () {
     const pullPromise = originalFunction.apply(this, arguments);
-    return pullPromise.then(result => {
-      if (result && result.value && result.value[CLS_CONTEXT_SYMBOL]) {
-        const clsContext = result.value[CLS_CONTEXT_SYMBOL];
-        if (isActive && clsContext) {
-          cls.ns.enter(clsContext);
-          setImmediate(() => {
-            cls.ns.exit(clsContext);
-          });
+
+    if (pullPromise && typeof pullPromise.then === 'function') {
+      return pullPromise.then(result => {
+        if (result && result.value && result.value[CLS_CONTEXT_SYMBOL]) {
+          const clsContext = result.value[CLS_CONTEXT_SYMBOL];
+          if (isActive && clsContext) {
+            cls.ns.enter(clsContext);
+            setImmediate(() => {
+              cls.ns.exit(clsContext);
+            });
+          }
         }
-      }
-      return result;
-    });
+        return result;
+      });
+    }
+
+    return pullPromise;
   };
 }
 

packages/core/src/tracing/instrumentation/messaging/bull.js

@@ -111,6 +111,8 @@ function instrumentedJobCreate(ctx, originalJobCreate, originalArgs, options) {
           return err;
         });
     }
+
+    finishSpan(null, null, span);
     return promise;
   });
 }
@@ -261,20 +263,26 @@ function instrumentedProcessJob(ctx, originalProcessJob, originalArgs) {
 
     const promise = originalProcessJob.apply(ctx, originalArgs);
 
-    return promise
-      .then(data => {
-        finishSpan(job.failedReason, data, span);
-        // Make sure the instana foreigner data is removed.
-        delete options.X_INSTANA_L;
-        return data;
-      })
-      .catch(err => {
-        addErrorToSpan(err, span);
-        finishSpan(null, null, span);
-        // Make sure the instana foreigner data is removed.
-        delete options.X_INSTANA_L;
-        throw err;
-      });
+    if (promise && typeof promise.then === 'function') {
+      return promise
+        .then(data => {
+          finishSpan(job.failedReason, data, span);
+          // Make sure the instana foreigner data is removed.
+          delete options.X_INSTANA_L;
+          return data;
+        })
+        .catch(err => {
+          addErrorToSpan(err, span);
+          finishSpan(null, null, span);
+          // Make sure the instana foreigner data is removed.
+          delete options.X_INSTANA_L;
+          throw err;
+        });
+    }
+
+    finishSpan(null, null, span);
+    delete options.X_INSTANA_L;
+    return promise;
   });
 }