Merge c7a1246c43 into 13371fd2a1

lib/server-app.js

@@ -228,8 +228,10 @@ proto._findLayerByHandler = function(handler) {
     const isNewRelic = this._router.stack[k].handle['__NR_original'] === handler;
     const isAppDynamics = this._router.stack[k].handle['__appdynamicsProxyInfo__'] &&
       this._router.stack[k].handle['__appdynamicsProxyInfo__']['orig'] === handler;
+    const isShimmer = this._router.stack[k].handle['__wrapped'] && 
+      this._router.stack[k].handle['__original'] === handler;
 
-    if (isOriginal || isNewRelic || isAppDynamics) {
+    if (isOriginal || isNewRelic || isAppDynamics || isShimmer) {
       return this._router.stack[k];
     } else {
       // Aggressively check if the original handler has been wrapped

test/app.test.js

@@ -145,6 +145,27 @@ describe('app', function() {
           done();
         });
       });
+    
+    it('allows handlers to be wrapped by shimmer (ex: opentelemetry) on express stack',
+      function(done) {
+        const myHandler = namedHandler('my-handler');
+        const wrappedHandler = function(req, res, next) {
+          myHandler(req, res, next);
+        };
+        wrappedHandler['__wrapped'] = true;
+        wrappedHandler['__original'] = myHandler;
+        app.middleware('routes:before', wrappedHandler);
+        const found = app._findLayerByHandler(myHandler);
+        expect(found).to.be.an('object');
+        expect(found).have.property('phase', 'routes:before');
+        executeMiddlewareHandlers(app, function(err) {
+          if (err) return done(err);
+
+          expect(steps).to.eql(['my-handler']);
+
+          done();
+        });
+      });
 
     it('allows handlers to be wrapped as a property on express stack',
       function(done) {