Merge pull request #27 from RisingStack/feature/stacktrace

feat(stacktrace): collect data from errors

Author: gergelyke

lib/collector.js

@@ -1,12 +1,11 @@
 var events = require('events');
 var util = require('util');
 var fs = require('fs');
-var path = require('path');
 
 var debug = require('debug')('trace-collector');
-
 var microtime = require('microtime');
 
+var config = require('./config');
 var getNamespace = require('continuation-local-storage').getNamespace;
 
 /*
@@ -30,6 +29,8 @@ function Collector(options) {
   this.on(Collector.SERVER_SEND, this.onServerSend);
   this.on(Collector.SERVER_RECV, this.onServerReceive);
 
+  this.formattableLogFile = config.logFilePath + config.logFilePrefix + '%s.log';
+
   this._updateLogFile();
 }
 
@@ -199,7 +200,7 @@ Collector.prototype.onServerReceive = function (data) {
 };
 
 Collector.prototype._updateLogFile = function () {
-  this.logFile = path.join(__dirname, '../../../', util.format('../trace_%s.log', Date.now()));
+  this.logFile = util.format(this.formattableLogFile, Date.now());
 };
 
 Collector.prototype.report = function (data) {

lib/config.js

@@ -1,3 +1,5 @@
+var path = require('path');
+
 var config = {};
 
 config.collectInterval = 10 * 1000;
@@ -7,6 +9,7 @@ config.collectorApi = 'http://comingsoon.trace.risingstack.com';
 config.collectorApiServiceEndpoint = '/service';
 config.collectorApiSampleEndpoint = '/service/sample';
 
+config.logFilePath = path.join(__dirname, '../../../../');
 config.logFilePrefix = 'trace_';
 
 config.configPath = process.env.TRACE_CONFIG_PATH;

lib/index.js

@@ -6,21 +6,20 @@ var session = require('continuation-local-storage').createNamespace('trace');
 var collectorConfig = require('./config');
 var Collector = require('./collector');
 var getConfig = require('./utils/configReader').getConfig;
+var wraps = require('./wraps');
 
 var traceAgent;
 
-var wraps = require('./wraps');
-
 function getOrphanTraces(config, callback) {
-  var files = fs.readdirSync(path.join(__dirname, '../../../../'));
+  var files = fs.readdirSync(collectorConfig.logFilePath);
   var logFileStartsWith = collectorConfig.logFilePrefix;
 
   var logFiles = files.filter(function (file) {
     return file.indexOf(logFileStartsWith) > -1;
   });
 
   logFiles = logFiles.map(function (logFile) {
-    return path.join(__dirname, '../../../../', logFile);
+    return path.join(collectorConfig.logFilePath, logFile);
   });
 
   return callback(null, logFiles);

lib/index.spec.js

@@ -4,6 +4,7 @@ var sinon = require('sinon');
 
 var collectorConfig = require('./config');
 var Collector = require('./collector');
+var wraps = require('./wraps');
 
 describe('The Trace module', function () {
 
@@ -30,6 +31,10 @@ describe('The Trace module', function () {
     });
   });
 
+  after(function () {
+    wraps.uninstrumentNatives();
+  });
+
   it('exposes methods', function () {
     expect(trace.report).to.be.ok;
     expect(trace.getTransactionId).to.be.ok;

lib/wraps/http.request.spec.js

@@ -1,26 +1,18 @@
 var http = require('http');
 var url = require('url');
 
-var chai = require('chai');
-var chaiSubset = require('chai-subset');
+var expect = require('chai').expect;
 var nock = require('nock');
-var sinon = require('sinon');
-var sinonChai = require('sinon-chai');
 
 var Shimmer = require('./shimmer');
 var wrapper = require('./http.request');
 
-chai.use(chaiSubset);
-chai.use(sinonChai);
-
-var expect = chai.expect;
 var dummyCollector = {
   emit: function () {},
   getService: function () {
     return 1;
   }
 };
-var sandbox;
 
 describe('The wrapper module', function () {
   before(function () {
@@ -37,14 +29,6 @@ describe('The wrapper module', function () {
     });
   });
 
-  beforeEach(function () {
-    sandbox = sinon.sandbox.create();
-  });
-
-  afterEach(function () {
-    sandbox.restore();
-  });
-
   describe('skips every whitelisted hosts', function () {
     it('wraps the HTTP.request(options) method', function () {
       nock('http://localhost:8000')
@@ -64,7 +48,7 @@ describe('The wrapper module', function () {
     });
 
     it('wraps the HTTP.get(urlString) method', function () {
-      var urlParseSpy = sandbox.spy(url, 'parse');
+      var urlParseSpy = this.sandbox.spy(url, 'parse');
 
       nock('http://localhost:8000')
         .get('/')
@@ -99,7 +83,7 @@ describe('The wrapper module', function () {
     });
 
     it('wraps the HTTP.get(urlString) method', function () {
-      var urlParseSpy = sandbox.spy(url, 'parse');
+      var urlParseSpy = this.sandbox.spy(url, 'parse');
 
       nock('http://non-whitelisted:8000')
         .get('/')

lib/wraps/index.js

@@ -37,7 +37,26 @@ function instrument (collector) {
     return require('./http.request')(original, collector);
   });
 
+  Shimmer.wrap(process, 'process', '_fatalException', function (original) {
+    return require('./process._fatalException')(original, collector);
+  });
+
   thirdParty.instrument();
 }
 
+function uninstrumentNatives () {
+  Shimmer.unwrap(https.Server.prototype, 'https.Server.prototype', 'on');
+  Shimmer.unwrap(https.Server.prototype, 'https.Server.prototype', 'addListener');
+
+  Shimmer.unwrap(http.Server.prototype, 'https.Server.prototype', 'addListener');
+  Shimmer.unwrap(http.Server.prototype, 'https.Server.prototype', 'addListener');
+
+  Shimmer.unwrap(http, 'http', 'request');
+
+  Shimmer.unwrap(https, 'https', 'request');
+
+  Shimmer.unwrap(process, 'process', '_fatalException');
+}
+
 module.exports.instrument = instrument;
+module.exports.uninstrumentNatives = uninstrumentNatives;

lib/wraps/process._fatalException.js

@@ -0,0 +1,17 @@
+var getNamespace = require('continuation-local-storage').getNamespace;
+var microtime = require('microtime');
+
+function wrapRequest (original, collector) {
+  var session = getNamespace('trace');
+
+  return session.bind(function (stackTrace) {
+    collector.onCrash({
+      id: session.get('request-id'),
+      time: microtime.now(),
+      stackTrace: stackTrace.stack
+    });
+    return original.apply(this, arguments);
+  });
+}
+
+module.exports = wrapRequest;

lib/wraps/process._fatalException.spec.js

@@ -0,0 +1,62 @@
+var fs = require('fs');
+var http = require('http');
+var spawn = require('child_process').spawn;
+var path = require('path');
+
+var extend = require('lodash/object/extend');
+var expect = require('chai').expect;
+
+function startFailingServer () {
+  var env = extend({}, process.env);
+  env.TRACE_CONFIG_PATH = path.join(__dirname, '../../test/mocks', 'failingServer.config.js');
+
+  var child = spawn('node', ['--harmony', 'test/mocks/failingServer.js'], {
+    env: env
+  });
+
+  return child;
+}
+
+describe('The stacktrace wrapper module', function () {
+
+  var spawned;
+
+  after(function () {
+    spawned.kill();
+  });
+
+  it('writes stacktrace into log file', function (done) {
+    spawned = startFailingServer();
+
+    spawned.stdout.on('data', function () {
+      http
+        .get('http://localhost:15124')
+        .on('error', function (err) {
+
+          expect(err.code).to.be.eq('ECONNRESET');
+
+          var files = fs.readdirSync(path.join(__dirname, '../../', 'test/mocks'));
+
+          var logFiles = files.filter(function (file) {
+            return file.indexOf('trace_') > -1;
+          });
+
+          var LOGFILE_PATH = path.join(__dirname, '../../', 'test/mocks', logFiles[0]);
+
+          fs.readFile(LOGFILE_PATH, 'utf-8', function (err, raw) {
+            expect(err).to.be.not.ok;
+            expect(raw).to.be.ok;
+
+            var stacktrace = JSON.parse(raw.slice(0, -2)).events[0];
+
+            expect(stacktrace.type).to.be.eq('st');
+
+            var errMsg = 'Error: Very error';
+            expect(stacktrace.data.trace.slice(0, errMsg.length)).to.be.eq(errMsg);
+            done();
+          });
+        });
+    });
+  });
+
+});

test/mocks/failingServer.config.js

@@ -0,0 +1,17 @@
+var config = {};
+
+config.appName = '#fail';
+
+function FailingServerTestReporter () {
+  this.send = function (data, cb) {
+    cb(null);
+  };
+
+  this.getService = function () {
+    return config.appName;
+  };
+}
+
+config.reporter = new FailingServerTestReporter();
+
+module.exports = config;

test/mocks/failingServer.js

@@ -0,0 +1,25 @@
+var path = require('path');
+
+var express = require('express');
+var collectorConfig = require('../../lib/config');
+
+// override log file path
+collectorConfig.logFilePath = path.join(__dirname, '/');
+
+// use trace collector
+require('../../lib');
+
+var failingServer = express();
+
+failingServer.get('/', function () {
+  setTimeout(function () {
+    throw new Error('Very error');
+  }, 0);
+});
+
+failingServer.listen(15124, function (err) {
+  if (err) {
+    throw err;
+  }
+  console.log('listening');
+});