@felloh-org/lambda-wrapper 1.11.39 → 1.11.40

package/dist/dependency-injection/dependency-injection.js

@@ -21,7 +21,6 @@ class DependencyInjection {
   constructor(configuration, event, context) {
     this.event = event;
     this.context = context;
-    this.lumigo = null;
     this.dependencies = {};
     this.configuration = configuration;
 
@@ -130,33 +129,6 @@ class DependencyInjection {
   get definitions() {
     return this.configuration.DEFINITIONS;
   }
-  /**
-   * Set Lumigo
-   * @param lumigo
-   */
-
-
-  setLumigo(lumigo) {
-    this.lumigo = lumigo;
-  }
-  /**
-   * Get Lumigo
-   * @return {null}
-   */
-
-
-  getLumigo() {
-    return this.lumigo;
-  }
-  /**
-   * Check to see whether lumigo is enabled
-   * @return {boolean}
-   */
-
-
-  lumigoIsEnabled() {
-    return this.lumigo !== null;
-  }
 
 }
 

package/dist/service/logger.js

@@ -17,8 +17,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 class Logger extends _dependencyAware.default {
   constructor(di) {
     super(di);
-    this.lumigo = di.getLumigo();
-    this.lumigoIsEnabled = di.lumigoIsEnabled();
     this.winston = null;
   }
   /**
@@ -136,12 +134,6 @@ class Logger extends _dependencyAware.default {
 
 
   error(error, message = '') {
-    if (this.lumigoIsEnabled) {
-      this.lumigo.error('error', {
-        err: error
-      });
-    }
-
     this.logger.log('error', message, {
       error: this.processMessage(error)
     });
@@ -156,10 +148,6 @@ class Logger extends _dependencyAware.default {
 
 
   info(message) {
-    if (this.lumigoIsEnabled) {
-      this.lumigo.info(message);
-    }
-
     this.logger.log('info', this.processMessage(message));
   }
   /**
@@ -178,12 +166,6 @@ class Logger extends _dependencyAware.default {
   warning(error) {
     const softWarningValues = ['true', '1'];
 
-    if (this.lumigoIsEnabled) {
-      this.lumigo.info('warning', {
-        err: error
-      });
-    }
-
     if (softWarningValues.includes(process.env.LOGGER_SOFT_WARNING)) {
       return this.info(error);
     }
@@ -199,10 +181,6 @@ class Logger extends _dependencyAware.default {
 
 
   label(descriptor, silent = false) {
-    if (this.lumigoIsEnabled) {
-      this.lumigo.addExecutionTag(descriptor);
-    }
-
     if (silent === false) {
       this.logger.log('info', `label - ${descriptor}`);
     }
@@ -217,10 +195,6 @@ class Logger extends _dependencyAware.default {
 
 
   metric(descriptor, stat, silent = false) {
-    if (this.lumigoIsEnabled) {
-      this.lumigo.addExecutionTag(descriptor, stat);
-    }
-
     if (silent === false) {
       this.logger.log('info', `metric - ${descriptor} - ${stat}`);
     }

package/dist/wrapper/index.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.handleSuccess = exports.handleError = exports.default = void 0;
 
-var _tracer = _interopRequireDefault(require("@lumigo/tracer"));
+var _lambdaNodeOpentelemetry = _interopRequireDefault(require("@baselime/lambda-node-opentelemetry"));
 
 var _dependencies = require("../config/dependencies");
 
@@ -85,17 +85,8 @@ const handleError = (di, error) => {
 exports.handleError = handleError;
 
 const wrapper = (configuration, handler, throwError = false) => {
-  let lumigo = null;
-
-  if (typeof process.env.LUMIGO_TOKEN === 'string' && process.env.LUMIGO_TOKEN !== 'undefined') {
-    lumigo = (0, _tracer.default)({
-      token: process.env.LUMIGO_TOKEN
-    });
-  }
-
   let instance = (event, context, callback) => {
     const di = new _dependencyInjection.default(configuration, event, context);
-    di.setLumigo(lumigo);
     const request = di.get(_dependencies.DEFINITIONS.REQUEST);
     const logger = di.get(_dependencies.DEFINITIONS.LOGGER);
     context.callbackWaitsForEmptyEventLoop = false; // If the event is to trigger a warm up, then don't bother returning the function.
@@ -143,11 +134,10 @@ const wrapper = (configuration, handler, throwError = false) => {
     }
 
     return outcome;
-  }; // If the Lumigo token is enabled, then wrap the instance in the Lumigo wrapper
-
+  };
 
-  if (lumigo !== null) {
-    instance = lumigo.trace(instance);
+  if (typeof process.env.BASELIME_KEY !== 'undefined') {
+    instance = _lambdaNodeOpentelemetry.default.wrap(instance);
   }
 
   return instance;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@felloh-org/lambda-wrapper",
-  "version": "1.11.39",
+  "version": "1.11.40",
   "description": "Lambda wrapper for all Felloh Serverless Projects",
   "main": "dist/index.js",
   "engines": {
@@ -54,7 +54,10 @@
     "aws-sdk": ">=2.831.0"
   },
   "dependencies": {
+    "@baselime/lambda-node-opentelemetry": "^0.2.13",
+    "@baselime/node-opentelemetry": "^0.1.0",
     "@lumigo/tracer": "^1.83.0",
+    "@opentelemetry/auto-instrumentations-node": "^0.39.2",
     "alai": "^1.0.3",
     "async": "^3.2.3",
     "axios": "^0.26.1",