chore: optimized

Author: kirrg001

packages/collector/test/integration/currencies/messaging/amqplib/test_base.js

@@ -205,14 +205,14 @@ module.exports = function (name, version, isLatest) {
       it('must propagate suppression downstream for sendToQueue', () =>
         publisherControls
           .sendToQueue('Ohai', { 'X-INSTANA-L': 0 })
-          .then(() => delay(500))
+          .then(() => delay(1000))
           .then(() => agentControls.getSpans())
           .then(spans => expect(spans).to.be.empty));
 
       it('must propagate suppression downstream for publish', () =>
         publisherControls
           .publish('Ohai!', { 'X-INSTANA-L': 0 })
-          .then(() => delay(500))
+          .then(() => delay(1000))
           .then(() => agentControls.getSpans())
           .then(spans => expect(spans).to.be.empty));
     });
@@ -266,7 +266,8 @@ module.exports = function (name, version, isLatest) {
         span => expect(span.n).to.equal('node.http.client'),
         span => expect(span.t).to.equal(parentSpan.t),
         span => expect(span.p).to.equal(parentSpan.s),
-        span => expect(span.k).to.equal(constants.EXIT)
+        span => expect(span.k).to.equal(constants.EXIT),
+        span => expect(span.data.http.url).to.equal(`http://127.0.0.1:${agentControls.agentPort}/ping`)
       ]);
     }
   }

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

@@ -185,6 +185,7 @@ function instrumentedDispatchMessage(ctx, originalDispatchMessage, originalArgs)
   return cls.ns.runAndReturn(() => {
     if (tracingUtil.readAttribCaseInsensitive(headers, constants.traceLevelHeaderName) === '0') {
       cls.setTracingLevel('0');
+      removeInstanaHeadersFromMessage(originalArgs[1]);
       return originalDispatchMessage.apply(ctx, originalArgs);
     }
 
@@ -262,6 +263,7 @@ function instrumentedChannelModelGet(ctx, originalGet, originalArgs) {
 
       if (tracingUtil.readAttribCaseInsensitive(headers, constants.traceLevelHeaderName) === '0') {
         cls.setTracingLevel('0');
+        removeInstanaHeadersFromMessage(result);
         span.cancel();
         return result;
       }
@@ -349,6 +351,7 @@ function instrumentedCallbackModelGet(ctx, originalGet, originalArgs) {
 
       if (tracingUtil.readAttribCaseInsensitive(headers, constants.traceLevelHeaderName) === '0') {
         cls.setTracingLevel('0');
+        removeInstanaHeadersFromMessage(result);
         if (originalCallback) {
           return originalCallback(err, result);
         }