chore: corrected the refactoring

Author: abhilash-sivan

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

@@ -36,9 +36,6 @@ function instrument(SQSConsumer) {
                 span.d = Date.now() - span.ts;
                 span.transmitManual();
               });
-          } else {
-            span.d = Date.now() - span.ts;
-            span.transmitManual();
           }
 
           return res;
@@ -73,9 +70,6 @@ function instrument(SQSConsumer) {
                 span.d = Date.now() - span.ts;
                 span.transmitManual();
               });
-          } else {
-            span.d = Date.now() - span.ts;
-            span.transmitManual();
           }
 
           return res;

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

@@ -250,7 +250,6 @@ function shimPromiseConnection(original) {
         return connection;
       });
     }
-    return promise;
   };
 }
 

packages/core/src/tracing/instrumentation/frameworks/koa.js

@@ -72,11 +72,10 @@ function instrumentedRoutes(thisContext, originalRoutes, originalArgs) {
           return resolvedValue;
         });
       }
-      return dispatchResult;
+    } else {
+      return dispatch.apply(this, arguments);
     }
-    return dispatch.apply(this, arguments);
   };
-
   // The router attaches itself as a property to the dispatch function and other methods in koa-router rely on this, so
   // we need to attach this property to our dispatch function, too.
   instrumentedDispatch.router = dispatch.router;

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

@@ -303,7 +303,6 @@ function instrumentedChannelModelGet(ctx, originalGet, originalArgs) {
         return result;
       });
     }
-    return promise;
   });
 }
 

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

@@ -111,9 +111,6 @@ function instrumentedJobCreate(ctx, originalJobCreate, originalArgs, options) {
           return err;
         });
     }
-
-    finishSpan(null, null, span);
-    return promise;
   });
 }
 
@@ -279,10 +276,6 @@ function instrumentedProcessJob(ctx, originalProcessJob, originalArgs) {
           throw err;
         });
     }
-
-    finishSpan(null, null, span);
-    delete options.X_INSTANA_L;
-    return promise;
   });
 }
 

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

@@ -112,7 +112,6 @@ function instrumentedSend(ctx, originalSend, originalArgs, topic, messages) {
           throw error;
         });
     }
-    return promise;
   });
 }
 
@@ -194,7 +193,6 @@ function instrumentedSendBatch(ctx, originalSendBatch, originalArgs, topicMessag
           throw error;
         });
     }
-    return promise;
   });
 }