refactor: removed "getLogger" usage

packages/aws-fargate/src/activate.js

@@ -6,7 +6,7 @@
 'use strict';
 
 const instanaCore = require('@instana/core');
-const { backendConnector, consoleLogger } = require('@instana/serverless');
+const { backendConnector, consoleLogger: log } = require('@instana/serverless');
 
 const identityProvider = require('./identity_provider');
 const metrics = require('./metrics');
@@ -15,14 +15,11 @@ const { fullyQualifiedContainerId } = require('./metrics/container/containerUtil
 const { tracing, util: coreUtil } = instanaCore;
 const { normalizeConfig } = coreUtil;
 
-let logger = consoleLogger;
-logger.init();
-
-const config = normalizeConfig({});
-config.logger = logger;
+const logger = log.init();
+const config = normalizeConfig({}, logger);
 
 function init() {
-  instanaCore.preInit();
+  instanaCore.preInit(config);
 
   metrics.init(config, function onReady(err, ecsContainerPayload) {
     if (err) {
@@ -57,7 +54,7 @@ function init() {
       }
 
       identityProvider.init(taskArn, containerId);
-      backendConnector.init(identityProvider, logger, false, true, 950);
+      backendConnector.init(config, identityProvider, logger, false, true, 950);
       instanaCore.init(config, backendConnector, identityProvider);
       metrics.activate(backendConnector);
       tracing.activate();
@@ -83,11 +80,9 @@ exports.currentSpan = function getHandleForCurrentSpan() {
 
 exports.sdk = tracing.sdk;
 
+// NOTE: this is the external interface for the customer. They can set a custom logger.
 exports.setLogger = function setLogger(_logger) {
-  logger = _logger;
-  config.logger = logger;
-  instanaCore.logger.init(config);
-  metrics.setLogger(_logger);
+  log.init({ logger: _logger });
 };
 
 exports.opentracing = tracing.opentracing;

packages/aws-fargate/src/metrics/index.js

@@ -5,14 +5,14 @@
 
 'use strict';
 
-const { consoleLogger } = require('@instana/serverless');
 const transmissionCycle = require('./transmissionCycle');
 
-let logger = consoleLogger;
-
+let logger;
 const metadataUriKey = 'ECS_CONTAINER_METADATA_URI';
 
 exports.init = function init(config, onReady) {
+  logger = config.logger;
+
   const metadataUri = process.env.ECS_CONTAINER_METADATA_URI;
   if (!metadataUri) {
     logger.error(`${metadataUriKey} is not set. This fargate task will not be monitored.`);
@@ -29,8 +29,3 @@ exports.activate = function activate() {
 exports.deactivate = function deactivate() {
   transmissionCycle.deactivate();
 };
-
-exports.setLogger = function setLogger(_logger) {
-  logger = _logger;
-  transmissionCycle.setLogger(logger);
-};

packages/aws-fargate/src/metrics/transmissionCycle.js

@@ -5,16 +5,17 @@
 
 'use strict';
 
-const { backendConnector, consoleLogger } = require('@instana/serverless');
+const { backendConnector } = require('@instana/serverless');
 const processorRegistry = require('./processorRegistry');
 
-let logger = consoleLogger;
-
+let logger;
 let transmissionDelay = 1000;
 let transmissionTimeoutHandle;
 let isActive = false;
 
 exports.init = function init(config, metadataUri, onReady) {
+  logger = config.logger;
+
   transmissionDelay = config.metrics.transmissionDelay;
   processorRegistry.init(config, metadataUri, onReady);
 };
@@ -78,7 +79,3 @@ function onMetricsHaveBeenSent(transmittedPayloadPerProcessor, error) {
     processor.setLastTransmittedPayload(transmittedPayloadPerProcessor[processor.getId()]);
   });
 }
-
-exports.setLogger = function setLogger(_logger) {
-  logger = _logger;
-};

packages/aws-fargate/src/noop.js

@@ -17,8 +17,8 @@ exports.currentSpan = function getHandleForCurrentSpan() {
 
 exports.sdk = tracing.sdk;
 
-exports.setLogger = function setLogger(logger) {
-  instanaCore.logger.init({ logger });
+exports.setLogger = function setLogger() {
+  // We do nothing.
 };
 
 exports.opentracing = tracing.opentracing;

packages/aws-fargate/test/metrics/transmissionCycle_test.js

@@ -9,18 +9,16 @@ const path = require('path');
 const { fork } = require('child_process');
 const { expect } = require('chai');
 const proxyquire = require('proxyquire');
-
-const { consoleLogger } = require('@instana/serverless');
 const portfinder = require('@instana/collector/test/test_util/portfinder');
-
-const { retry } = require('../../../core/test/test_util');
-const config = require('@instana/core/test/config');
+const { retry, createFakeLogger } = require('../../../core/test/test_util');
+const testConfig = require('@instana/core/test/config');
+const core = require('@instana/core');
 
 let transmissionCycle;
 
 describe('transmission cycle', function () {
-  this.timeout(config.getTestTimeout());
-  this.slow(config.getTestTimeout() / 2);
+  this.timeout(testConfig.getTestTimeout());
+  this.slow(testConfig.getTestTimeout() / 2);
 
   let messagesFromMetadataMock = [];
   let metadataMock;
@@ -30,12 +28,15 @@ describe('transmission cycle', function () {
   let onReadyError;
 
   before(() => {
+    const config = core.util.normalizeConfig({});
+    core.secrets.init(config);
+
     const metadataMockPort = portfinder();
     metadataMockUrl = `http://localhost:${metadataMockPort}`;
 
     messagesFromMetadataMock = [];
     metadataMock = fork(path.join(__dirname, '../metadata_mock'), {
-      stdio: config.getAppStdio(),
+      stdio: testConfig.getAppStdio(),
       env: Object.assign({ METADATA_MOCK_PORT: metadataMockPort })
     });
     metadataMock.on('message', message => {
@@ -54,8 +55,7 @@ describe('transmission cycle', function () {
     onReadyError = null;
     transmissionCycle = proxyquire('../../src/metrics/transmissionCycle', {
       '@instana/serverless': {
-        backendConnector: { sendMetrics },
-        consoleLogger
+        backendConnector: { sendMetrics }
       }
     });
   });
@@ -102,6 +102,7 @@ describe('transmission cycle', function () {
   function init() {
     transmissionCycle.init(
       {
+        logger: createFakeLogger(),
         metrics: { transmissionDelay: 1000 }
       },
       metadataMockUrl,

packages/aws-lambda/src/metrics/index.js

@@ -6,15 +6,17 @@
 'use strict';
 
 const { metrics: coreMetrics } = require('@instana/core');
-
-coreMetrics.registerAdditionalMetrics([
-  require('./npmPackageName'),
-  require('./npmPackageVersion'),
-  require('./npmPackageDescription')
-]);
+const npmPackageName = require('./npmPackageName');
+const npmPackageVersion = require('./npmPackageVersion');
+const npmPackageDescription = require('./npmPackageDescription');
 
 exports.init = function init(config) {
   coreMetrics.init(config);
+  npmPackageName.init(config);
+  npmPackageVersion.init(config);
+  npmPackageDescription.init(config);
+
+  coreMetrics.registerAdditionalMetrics([npmPackageName, npmPackageVersion, npmPackageDescription]);
 };
 
 exports.activate = function activate() {

packages/aws-lambda/src/metrics/npmPackageDescription.js

@@ -6,13 +6,17 @@
 'use strict';
 
 const { util: coreUtil } = require('@instana/core');
-const { consoleLogger: logger } = require('@instana/serverless');
-
 const rootDir = require('./rootDir');
 
 exports.payloadPrefix = 'npmPackageDescription';
 exports.currentPayload = undefined;
 
+let logger;
+
+exports.init = config => {
+  logger = config.logger;
+};
+
 exports.activate = function activate() {
   coreUtil.applicationUnderMonitoring.getMainPackageJsonStartingAtDirectory(rootDir.root, (err, pckg) => {
     if (err) {

packages/aws-lambda/src/metrics/npmPackageName.js

@@ -6,13 +6,17 @@
 'use strict';
 
 const { util: coreUtil } = require('@instana/core');
-const { consoleLogger: logger } = require('@instana/serverless');
-
 const rootDir = require('./rootDir');
 
 exports.payloadPrefix = 'npmPackageName';
 exports.currentPayload = undefined;
 
+let logger;
+
+exports.init = config => {
+  logger = config.logger;
+};
+
 exports.activate = function activate() {
   coreUtil.applicationUnderMonitoring.getMainPackageJsonStartingAtDirectory(rootDir.root, (err, pckg) => {
     if (err) {

packages/aws-lambda/src/metrics/npmPackageVersion.js

@@ -6,13 +6,17 @@
 'use strict';
 
 const { util: coreUtil } = require('@instana/core');
-const { consoleLogger: logger } = require('@instana/serverless');
-
 const rootDir = require('./rootDir');
 
 exports.payloadPrefix = 'npmPackageVersion';
 exports.currentPayload = undefined;
 
+let logger;
+
+exports.init = config => {
+  logger = config.logger;
+};
+
 exports.activate = function activate() {
   coreUtil.applicationUnderMonitoring.getMainPackageJsonStartingAtDirectory(rootDir.root, (err, pckg) => {
     if (err) {

packages/aws-lambda/src/noop_wrapper.js

@@ -8,9 +8,7 @@
 // We need to require core to provide noop implementations for currentSpan, sdk etc. but neither tracing nor metric
 // collection will be activated. (Neither core.init nor core.preInit are called.)
 const instanaCore = require('@instana/core');
-
 const { tracing } = instanaCore;
-let config;
 
 exports.wrap = noopWrap;
 
@@ -19,7 +17,6 @@ function noopWrap(_config, originalHandler) {
     originalHandler = _config;
     _config = null;
   }
-  config = _config || {};
 
   return originalHandler;
 }
@@ -30,9 +27,8 @@ exports.currentSpan = function getHandleForCurrentSpan() {
 
 exports.sdk = tracing.sdk;
 
-exports.setLogger = function setLogger(logger) {
-  config.logger = logger;
-  instanaCore.logger.init(config);
+exports.setLogger = function setLogger() {
+  // We do nothing. Noop.
 };
 
 exports.opentracing = tracing.opentracing;

packages/aws-lambda/src/ssm.js

@@ -10,6 +10,7 @@ let fetchedValue = null;
 let envValue = null;
 let errorFromAWS = null;
 let initTimeoutInMs = 0;
+let logger;
 
 module.exports.reset = () => {
   fetchedValue = null;
@@ -32,7 +33,9 @@ module.exports.validate = () => {
   return true;
 };
 
-module.exports.init = ({ logger }) => {
+module.exports.init = config => {
+  logger = config.logger;
+
   // CASE: INSTANA_SSM_PARAM_NAME is not set, skip
   if (!exports.isUsed()) {
     return;