This repository has been archived by the owner on Sep 19, 2019. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #644 from blackflux/dev
[Gally]: master <- dev
- Loading branch information
Showing
16 changed files
with
87 additions
and
576 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,106 +1,3 @@ | ||
| const fs = require('fs'); | ||
| const path = require('path'); | ||
| const get = require('lodash.get'); | ||
| const Joi = require('joi-strict'); | ||
| const Rollbar = require('rollbar'); | ||
| const ensureString = require('./util/ensure-string'); | ||
|
|
||
| const templates = (() => { | ||
| const templateDir = path.join(__dirname, 'templates'); | ||
| return fs | ||
| .readdirSync(templateDir) | ||
| .map((f) => f.slice(0, -3)) | ||
| .reduce((p, f) => Object.assign(p, { | ||
| // eslint-disable-next-line global-require,import/no-dynamic-require | ||
| [f]: require(path.join(templateDir, f)) | ||
| }), {}); | ||
| })(); | ||
|
|
||
| module.exports = (options) => { | ||
| Joi.assert(options, Joi.object().keys({ | ||
| rollbar: Joi.object().keys({ | ||
| accessToken: Joi.string().optional(), | ||
| environment: Joi.string().optional(), | ||
| enabled: Joi.boolean().optional(), | ||
| verbose: Joi.boolean().optional(), | ||
| reportLevel: Joi.string().optional() | ||
| }).optional(), | ||
| template: Joi.string().optional() | ||
| })); | ||
| const rollbarOptions = get(options, 'rollbar', {}); | ||
| const template = templates[get(options, 'template', 'aws-sls-lambda-proxy')]; | ||
| const verbose = get(options, 'rollbar.verbose', false); | ||
| const rollbarEnvironment = get(options, 'rollbar.environment'); | ||
| const rollbar = new Rollbar(rollbarOptions); | ||
|
|
||
| const submitToRollbar = async ({ | ||
| error, | ||
| environment, | ||
| level, | ||
| event, | ||
| context | ||
| }) => { | ||
| const msgPrefix = [ | ||
| get(error, 'statusCode'), | ||
| get(error, 'messageId') | ||
| ].filter((e) => !['', undefined].includes(e)).join('@'); | ||
| const msgBody = get(error, 'message') || ensureString(error); | ||
| const message = [msgPrefix, msgBody].filter((e) => !['', undefined].includes(e)).join(': '); | ||
| if (verbose === true) { | ||
| // eslint-disable-next-line no-console | ||
| console.log(message); | ||
| } | ||
| rollbar.configure({ payload: { environment } }); | ||
| // reference: https://github.com/Rollbar/rollbar.js/#rollbarlog-1 | ||
| rollbar[level](message, error, { | ||
| context: { | ||
| remainingTimeInMillis: context.getRemainingTimeInMillis(), | ||
| callbackWaitsForEmptyEventLoop: context.callbackWaitsForEmptyEventLoop, | ||
| functionName: context.functionName, | ||
| functionVersion: context.functionVersion, | ||
| arn: context.invokedFunctionArn, | ||
| requestId: context.awsRequestId, | ||
| logGroupName: context.logGroupName, | ||
| logStreamName: context.logStreamName, | ||
| invokeid: context.invokeid, | ||
| memoryLimitInMB: context.memoryLimitInMB | ||
| }, | ||
| event | ||
| }, template(event)); | ||
| return error; | ||
| }; | ||
|
|
||
| /* Wrap Lambda function handler */ | ||
| return { | ||
| wrap: (handler) => (event, context, callback) => { | ||
| // eslint-disable-next-line no-param-reassign | ||
| context.callbackWaitsForEmptyEventLoop = false; | ||
|
|
||
| // Rollbar logging levels as promise | ||
| const rb = ['debug', 'info', 'warning', 'error', 'critical'] | ||
| .reduce((final, level) => Object.assign(final, { | ||
| [level]: (error, env = rollbarEnvironment) => submitToRollbar({ | ||
| error, env, level, event, context | ||
| }) | ||
| }), {}); | ||
|
|
||
| try { | ||
| handler(event, context, rb) | ||
| .then((resp) => rollbar.wait(() => callback(null, resp))) | ||
| .catch((err) => { | ||
| try { | ||
| rb.error(err); | ||
| } finally { | ||
| rollbar.wait(() => callback(err)); | ||
| } | ||
| }); | ||
| } catch (err) { | ||
| try { | ||
| rb.error(err); | ||
| } finally { | ||
| rollbar.wait(() => callback(err)); | ||
| } | ||
| } | ||
| } | ||
| }; | ||
| module.exports = () => { | ||
| throw new Error('Deprecated: Please use lambda-async, lambda-monitor and lambda-monitor-logger instead'); | ||
| }; |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,88 +1,9 @@ | ||
| const expect = require('chai').expect; | ||
| const uuid = require('uuid/v4'); | ||
| const { describe } = require('node-tdd'); | ||
| const Rollbar = require('../src/index'); | ||
|
|
||
| describe('Testing Rollbar Wrapper', { record: console, useNock: true }, () => { | ||
| let error; | ||
| let rollbarVerbose; | ||
| let rollbarNonVerbose; | ||
| let executeHandler; | ||
|
|
||
| before(() => { | ||
| error = new Error(uuid()); | ||
| rollbarVerbose = Rollbar({ | ||
| rollbar: { | ||
| accessToken: process.env.ACCESS_TOKEN, | ||
| environment: 'local', | ||
| enabled: true, | ||
| verbose: true | ||
| } | ||
| }); | ||
| rollbarNonVerbose = Rollbar({ | ||
| rollbar: { | ||
| accessToken: process.env.ACCESS_TOKEN, | ||
| environment: 'local', | ||
| enabled: true, | ||
| verbose: false | ||
| } | ||
| }); | ||
| executeHandler = (err, resp) => new Promise((resolve) => { | ||
| const handler = rollbarVerbose.wrap(() => (err ? Promise.reject(err) : Promise.resolve(resp))); | ||
| handler( | ||
| {}, | ||
| { getRemainingTimeInMillis: () => 0 }, | ||
| (err_, resp_) => { | ||
| resolve([err_, resp_]); | ||
| } | ||
| ); | ||
| }); | ||
| }); | ||
|
|
||
| it('Testing Execution Without Error', async ({ recorder }) => { | ||
| const response = { | ||
| statusCode: 400, | ||
| body: '{"message":"Invalid Parameter."}' | ||
| }; | ||
| const [err, resp] = await executeHandler(null, response); | ||
| expect(err).to.equal(null); | ||
| expect(resp).to.equal(response); | ||
| expect(recorder.get()).to.deep.equal([]); | ||
| }); | ||
|
|
||
| it('Testing Execution With Error', async ({ recorder }) => { | ||
| const [err, resp] = await executeHandler(error, undefined); | ||
| expect(err).to.equal(error); | ||
| expect(resp).to.equal(undefined); | ||
| expect(recorder.get()).to.deep.equal([ | ||
| error.message, | ||
| error, | ||
| 'Successful api response. Link: https://rollbar.com/occurrence/uuid/?uuid=9320983b-22d4-4157-893a-79e02d6081bb' | ||
| ]); | ||
| }); | ||
|
|
||
| it('Testing Execution With String Error Message', async ({ recorder }) => { | ||
| const [err, resp] = await executeHandler('String Error', undefined); | ||
| expect(err).to.equal('String Error'); | ||
| expect(resp).to.equal(undefined); | ||
| expect(recorder.get()).to.deep.equal([ | ||
| 'String Error', | ||
| 'String Error', | ||
| 'Successful api response. Link: https://rollbar.com/occurrence/uuid/?uuid=d56af703-6de0-4cf7-fce7-942fb9564467' | ||
| ]); | ||
| }); | ||
|
|
||
| it('Testing Exception Verbose', async ({ capture, recorder }) => { | ||
| await capture(() => new Promise((resolve, reject) => rollbarVerbose.wrap(() => { | ||
| throw error; | ||
| })({}, { getRemainingTimeInMillis: () => 0 }, reject))); | ||
| expect(recorder.get()).to.deep.equal([error.message, error]); | ||
| }); | ||
|
|
||
| it('Testing Exception Non-Verbose', async ({ capture, recorder }) => { | ||
| await capture(() => new Promise((resolve, reject) => rollbarNonVerbose.wrap(() => { | ||
| throw error; | ||
| })({}, { getRemainingTimeInMillis: () => 0 }, reject))); | ||
| expect(recorder.get()).to.deep.equal([]); | ||
| describe('Testing Rollbar', () => { | ||
| it('Testing Deprecated', async () => { | ||
| expect(() => Rollbar()) | ||
| .to.throw('Deprecated: Please use lambda-async, lambda-monitor and lambda-monitor-logger instead'); | ||
| }); | ||
| }); |
This file was deleted.
Oops, something went wrong.
1 change: 0 additions & 1 deletion
1
.../index.spec.js__cassettes/testingRollbarWrapper_testingExceptionNonVerbose_recording.json
This file was deleted.
Oops, something went wrong.
1 change: 0 additions & 1 deletion
1
test/index.spec.js__cassettes/testingRollbarWrapper_testingExceptionVerbose_recording.json
This file was deleted.
Oops, something went wrong.
15 changes: 0 additions & 15 deletions
15
test/index.spec.js__cassettes/testingRollbarWrapper_testingExecutionWithError_recording.json
This file was deleted.
Oops, something went wrong.
15 changes: 0 additions & 15 deletions
15
...js__cassettes/testingRollbarWrapper_testingExecutionWithStringErrorMessage_recording.json
This file was deleted.
Oops, something went wrong.
1 change: 0 additions & 1 deletion
1
...ndex.spec.js__cassettes/testingRollbarWrapper_testingExecutionWithoutError_recording.json
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.