instrumentation: check for null module in inspector instrumentation

newrelic · Jun 20, 2017 · 2eb9516 · 2eb9516
1 parent 47d4c46
commit 2eb9516
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/lib/instrumentation/core/inspector.js b/lib/instrumentation/core/inspector.js
@@ -5,7 +5,7 @@ var wrap = require('../../shimmer').wrapMethod
 module.exports = initialize
 
 function initialize(agent, inspector) {
-  var sessionProto = inspector.Session && inspector.Session.prototype
+  var sessionProto = inspector && inspector.Session && inspector.Session.prototype
   if (!sessionProto) {
     return false
   }

diff --git a/test/unit/instrumentation/core/inspector.test.js b/test/unit/instrumentation/core/inspector.test.js
@@ -0,0 +1,22 @@
+'use strict'
+
+var chai = require('chai')
+var helper = require('../../../lib/agent_helper')
+var inspectorInstrumentation = require('../../../../lib/instrumentation/core/inspector')
+
+var expect = chai.expect
+
+describe('Inspector instrumentation', function() {
+  var agent = null
+  before(function() {
+    agent = helper.loadMockedAgent()
+  })
+
+  after(function () {
+    helper.unloadAgent(agent)
+  })
+
+  it('should not throw when passed null for the module', function() {
+    expect(inspectorInstrumentation.bind(null, agent, null)).to.not.throw()
+  })
+})