fix: transmitted span immediately after receiving response (#2284)

Author: aryamohanan

packages/core/src/tracing/instrumentation/databases/couchbase.js

@@ -426,13 +426,15 @@ function instrumentTransactions(cluster, connectionStr) {
 
                   const result = originalFn.apply(this, arguments);
 
-                  if (result.then && result.catch && result.finally) {
+                  if (result.then && result.catch) {
                     result
+                      .then(() => {
+                        span.d = Date.now() - span.ts;
+                        span.transmit();
+                      })
                       .catch(err => {
                         span.ec = 1;
                         tracingUtil.setErrorDetails(span, err, 'couchbase');
-                      })
-                      .finally(() => {
                         span.d = Date.now() - span.ts;
                         span.transmit();
                       });
@@ -493,13 +495,13 @@ function instrumentOperation({ connectionStr, bucketName, getBucketTypeFn, sql,
                 resultHandler(span, result);
               }
 
+              span.d = Date.now() - span.ts;
+              span.transmit();
               return result;
             })
             .catch(err => {
               span.ec = 1;
               tracingUtil.setErrorDetails(span, err, 'couchbase');
-            })
-            .finally(() => {
               span.d = Date.now() - span.ts;
               span.transmit();
             });

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

@@ -261,16 +261,16 @@ function instrumentedProcessJob(ctx, originalProcessJob, 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);
-        throw err;
-      })
-      .finally(() => {
         // Make sure the instana foreigner data is removed.
         delete options.X_INSTANA_L;
+        throw err;
       });
   });
 }