chore: fixes

Author: kirrg001

packages/collector/src/announceCycle/agentHostLookup.js

@@ -230,6 +230,7 @@ function handleResponse(host, res, cb) {
       );
       return;
     }
+
     if (responseJson.version !== undefined) {
       cb(null);
     } else {

packages/collector/test/announceCycle/agentHostLookup_test.js

@@ -11,6 +11,7 @@ const sinonChai = require('sinon-chai');
 
 const { FakeRequestHandler, FakeRequest, FakeResponse } = require('../test_util/fake_http');
 const testUtils = require('@instana/core/test/test_util');
+const normalizeConfig = require('../../src/util/normalizeConfig');
 
 const { expect } = chai;
 chai.use(sinonChai);
@@ -72,10 +73,13 @@ describe('agent host lookup state', () => {
   let defaultGatewayParserMock;
   let transitionTo;
   let ctxStub;
+  let config;
 
-  before(() => {
-    // set up stubs for HTTP communication and file system access (for reading from /proc/self/net/route).
+  beforeEach(() => {
+    config = normalizeConfig({ agentHost: host, agentPort: port });
+    config.logger = testUtils.createFakeLogger();
 
+    // set up stubs for HTTP communication and file system access (for reading from /proc/self/net/route).
     requestStub = sinon.stub();
     httpStub = {
       request: requestStub,
@@ -99,19 +103,27 @@ describe('agent host lookup state', () => {
       './defaultGatewayParser': defaultGatewayParserMock
     });
 
-    agentHostLookupState.init({ logger: testUtils.createFakeLogger() });
+    agentHostLookupState.init(config);
     transitionTo = sinon.stub();
     ctxStub = { transitionTo };
   });
 
   afterEach(() => {
-    // reset stubs after each test
-    sinon.restore();
-    fakeRequest.reset();
+    requestStub.reset();
+    parseProcSelfNetRouteFileStub.reset();
+    configuredHostLookupOk.reset();
+    configuredHostLookupConnectionRefused.reset();
+    configuredHostLookupNotAnAgent.reset();
+    defaultGatewayLookupOk.reset();
+    defaultGatewayLookupConnectionRefused.reset();
+
+    // the agentHostLookup overrides agentHost! We have to reset it.
+    config.agentHost = host;
+    config.agentPort = port;
   });
 
   describe('via configured IP/configured port', () => {
-    before(() => {
+    beforeEach(() => {
       requestStub.callsFake((opt, cb) => {
         fakeRequest = new FakeRequest([configuredHostLookupOk], opt, cb);
         return fakeRequest;
@@ -130,7 +142,7 @@ describe('agent host lookup state', () => {
   });
 
   describe('via default gateway IP', () => {
-    before(() => {
+    beforeEach(() => {
       parseProcSelfNetRouteFileStub.callsFake(async () => defaultGatewayIp);
       requestStub.callsFake((opt, cb) => {
         fakeRequest = new FakeRequest(
@@ -160,7 +172,7 @@ describe('agent host lookup state', () => {
   });
 
   describe('via default gateway IP when something else listens on 127.0.0.1:42699', () => {
-    before(() => {
+    beforeEach(() => {
       parseProcSelfNetRouteFileStub.callsFake(async () => defaultGatewayIp);
       requestStub.callsFake((opt, cb) => {
         fakeRequest = new FakeRequest(
@@ -189,20 +201,19 @@ describe('agent host lookup state', () => {
     });
   });
 
-  describe('retry when default gateway IP cannot be determined', () => {
+  describe('retry when default gateway IP cannot be determined', function () {
     let sinonFakeTimers;
+    this.timeout(5000);
 
-    before(() => {
+    beforeEach(() => {
       parseProcSelfNetRouteFileStub.callsFake(async () => {
         throw new Error('Failed to determine the default gateway: The file /proc/self/net/route does not exist');
       });
       requestStub.callsFake((opt, cb) => {
         fakeRequest = new FakeRequest([configuredHostLookupConnectionRefused, configuredHostLookupOk], opt, cb);
         return fakeRequest;
       });
-    });
 
-    beforeEach(() => {
       sinonFakeTimers = sinon.useFakeTimers();
     });
 
@@ -229,11 +240,12 @@ describe('agent host lookup state', () => {
       }));
   });
 
-  describe('retry when default gateway IP can be determined', () => {
+  describe('retry when default gateway IP can be determined', function () {
     let sinonFakeTimers;
-
+    this.timeout(5000);
     const configuredHostLookupConnectionRefusedSecondAttempt = configuredHostLookupConnectionRefused.clone();
-    before(() => {
+
+    beforeEach(() => {
       parseProcSelfNetRouteFileStub.callsFake(async () => defaultGatewayIp);
       requestStub.callsFake((opt, cb) => {
         fakeRequest = new FakeRequest(
@@ -249,10 +261,8 @@ describe('agent host lookup state', () => {
         );
         return fakeRequest;
       });
-    });
 
-    beforeEach(() => {
-      sinonFakeTimers = sinon.useFakeTimers();
+      sinonFakeTimers = sinon.useFakeTimers({ shouldClearNativeTimers: true });
     });
 
     afterEach(() => {

packages/core/test/test_util/index.js

@@ -20,9 +20,13 @@ module.exports = {
   getTestAppLogger: require('./log').getLogger,
   createFakeLogger: () => {
     return {
-      debug: () => {},
+      debug: msg => {
+        console.log(msg);
+      },
       info: () => {},
-      warn: () => {},
+      warn: msg => {
+        console.log(msg);
+      },
       error: () => {},
       trace: () => {}
     };