chore: removed support for passing parent logger during initialisation

refs 80206 - https://www.instana.com/docs/ecosystem/node-js/configuration/#custom-parent-logger
instana · Dec 1, 2021 · 722bbff · 722bbff
1 parent ca5d100
commit 722bbff
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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;