From 722bbffe38ec1d749e07ac7c5e165e731dc08144 Mon Sep 17 00:00:00 2001
From: kirrg001 <katharina.irrgang@gmail.com>
Date: Wed, 1 Dec 2021 20:42:00 +0100
Subject: [PATCH] chore: removed support for passing parent logger during
 initialisation

refs 80206

- https://www.instana.com/docs/ecosystem/node-js/configuration/#custom-parent-logger
---
 packages/collector/src/index.js                          | 9 ++++-----
 .../logger/bunyan/app-instana-receives-bunyan-logger.js  | 8 ++++----
 .../bunyan/app-instana-receives-non-bunyan-logger.js     | 7 ++++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/collector/src/index.js b/packages/collector/src/index.js
index 45dce6330d..b31e715273 100644
--- a/packages/collector/src/index.js
+++ b/packages/collector/src/index.js
@@ -26,8 +26,6 @@ let config;
 function init(_config) {
   config = normalizeConfig(_config);
 
-  log.init(config, false);
-
   agentConnection = require('./agentConnection');
   const agentOpts = require('./agent/opts');
   const pidStore = require('./pidStore');
@@ -37,9 +35,9 @@ function init(_config) {
   logger = log.getLogger('index', newLogger => {
     logger = newLogger;
   });
-  if (!config.logger) {
-    config.logger = logger;
-  }
+
+  // NOTE: By default we set our instana internal bunyan logger
+  config.logger = logger;
 
   agentOpts.init(config);
   instanaNodeJsCore.init(config, agentConnection, pidStore);
@@ -68,6 +66,7 @@ init.isConnected = function isConnected() {
  * @param {import('@instana/core/src/logger').GenericLogger} logger
  */
 init.setLogger = function setLogger(logger) {
+  // NOTE: Override our default logger with customer's logger
   config.logger = logger;
   log.init(config, true);
 };
diff --git a/packages/collector/test/tracing/logger/bunyan/app-instana-receives-bunyan-logger.js b/packages/collector/test/tracing/logger/bunyan/app-instana-receives-bunyan-logger.js
index fe1af21705..017496de1b 100644
--- a/packages/collector/test/tracing/logger/bunyan/app-instana-receives-bunyan-logger.js
+++ b/packages/collector/test/tracing/logger/bunyan/app-instana-receives-bunyan-logger.js
@@ -8,17 +8,17 @@
 'use strict';
 
 const agentPort = process.env.AGENT_PORT;
-
-const instana = require('../../../..');
-instana({
+const buynan = require('bunyan');
+const instana = require('../../../..')({
   agentPort,
-  logger: require('bunyan').createLogger({ name: 'app-logger' }),
   level: 'warn',
   tracing: {
     enabled: process.env.TRACING_ENABLED !== 'false',
     forceTransmissionStartingAt: 1
   }
 });
+instana.setLogger(buynan.createLogger({ name: 'app-logger' }));
+
 let instanaLogger;
 instanaLogger = require('../../../../src/logger').getLogger('test-module-name', newLogger => {
   instanaLogger = newLogger;
diff --git a/packages/collector/test/tracing/logger/bunyan/app-instana-receives-non-bunyan-logger.js b/packages/collector/test/tracing/logger/bunyan/app-instana-receives-non-bunyan-logger.js
index 9d4ac9276a..d1b4ddfe21 100644
--- a/packages/collector/test/tracing/logger/bunyan/app-instana-receives-non-bunyan-logger.js
+++ b/packages/collector/test/tracing/logger/bunyan/app-instana-receives-non-bunyan-logger.js
@@ -18,16 +18,17 @@ const dummyLogger = {
   error: console.error
 };
 
-const instana = require('../../../..');
-instana({
+const instana = require('../../../..')({
   agentPort,
-  logger: dummyLogger,
   level: 'warn',
   tracing: {
     enabled: process.env.TRACING_ENABLED !== 'false',
     forceTransmissionStartingAt: 1
   }
 });
+
+instana.setLogger(dummyLogger);
+
 let instanaLogger;
 instanaLogger = require('../../../../src/logger').getLogger('test-module-name', newLogger => {
   instanaLogger = newLogger;