Fixed handler.ts to load user handler over Thundra core library ins…

…tead of loading itself

src/config/ConfigMetadata.ts

@@ -59,6 +59,9 @@ export const ConfigMetadata: {[key: string]: { type: string, defaultValue?: any
         type: 'boolean',
         defaultValue: false,
     },
+    [ConfigNames.THUNDRA_LAMBDA_HANDLER]: {
+        type: 'string',
+    },
     [ConfigNames.THUNDRA_LAMBDA_WARMUP_WARMUPAWARE]: {
         type: 'boolean',
         defaultValue: false,

src/config/ConfigNames.ts

@@ -45,6 +45,9 @@ class ConfigNames {
 
     /////////////////////////////////////////////////////////////////////////////
 
+    public static readonly THUNDRA_LAMBDA_HANDLER: string =
+        'thundra.agent.lambda.handler';
+
     public static readonly THUNDRA_LAMBDA_WARMUP_WARMUPAWARE: string =
         'thundra.agent.lambda.warmup.warmupaware';
 

src/handler.ts

@@ -1,19 +1,11 @@
 'use strict';
 
-import { loadHandler } from './runtime/RuntimeSupport';
-import Utils from './plugins/utils/Utils';
-import { EnvVariableKeys } from './Constants';
+const thundra = require('@thundra/core');
+const thundraWrapper = thundra();
 
-const HANDLER_ENV_VAR = 'thundra_agent_lambda_handler';
-
-const thundra = require('@thundra/core')();
-const userHandler = loadHandler(
-  Utils.getEnvVar(EnvVariableKeys.LAMBDA_TASK_ROOT),
-  Utils.getEnvVar(HANDLER_ENV_VAR),
-);
-
-const wrappedUserFunc = thundra(userHandler);
+const userHandler = thundra.loadUserHandler();
+const wrappedUserHandler = thundraWrapper(userHandler);
 
 exports.wrapper = (event: any, context: any, callback: any) => {
-  return wrappedUserFunc(event, context, callback);
+    return wrappedUserHandler(event, context, callback);
 };

src/index.ts

@@ -33,6 +33,7 @@ import ErrorAwareSampler from './opentracing/sampler/ErrorAwareSampler';
 import TimeAwareSampler from './opentracing/sampler/TimeAwareSampler';
 import { SamplerCompositionOperator } from './opentracing/sampler/CompositeSampler';
 import ConfigNames from './config/ConfigNames';
+import { loadHandler } from './runtime/RuntimeSupport';
 
 const ThundraWarmup = require('@thundra/warmup');
 const get = require('lodash.get');
@@ -198,3 +199,13 @@ module.exports.listeners = {
     CompositeSpanFilter,
     StandardSpanFilterer,
 };
+
+/**
+ * Must be called after "ConfigProvider" is initialized either
+ *   - by calling directly "ConfigProvider.init(...)"
+ *   - or by calling indirectly default exported function of this module
+ */
+module.exports.loadUserHandler = () => loadHandler(
+    Utils.getEnvVar(EnvVariableKeys.LAMBDA_TASK_ROOT),
+    ConfigProvider.get(ConfigNames.THUNDRA_LAMBDA_HANDLER),
+);