diff --git a/lib/instrumentation/module/express.js b/lib/instrumentation/module/express.js index 6f8d14e2..0df2ecd4 100644 --- a/lib/instrumentation/module/express.js +++ b/lib/instrumentation/module/express.js @@ -157,19 +157,6 @@ module.exports = function (agent, version, express) { return handle }) } - // let appAllMethodDescriptor - // let handlerMethodDescriptor - // if (objectName == 'route') { - // const appAllbuilder = ExpressMethodDescriptorBuilder.make(makeMethodDescriptorBuilder(MODULE_NAME, 3)) - // appAllMethodDescriptor = apiMetaService.cacheApiWithBuilder(appAllbuilder) - // const handlerBuilder = makeMethodDescriptorBuilder(undefined, 4) - // handlerMethodDescriptor = apiMetaService.cacheApiWithBuilder(handlerBuilder) - // } - // shimmer.wrap(layer, 'handle', function (original) { - // return (original.length === 4) - // ? recordErrorHandle(original, objectName, layerName) - // : recordHandle(original, objectName, layerName, appAllMethodDescriptor, handlerMethodDescriptor, layerPath) - // }) } function safePush(obj, prop, value) { @@ -213,66 +200,5 @@ module.exports = function (agent, version, express) { return 6 } } - - function recordHandle(original, objectName, layerName, appAllMethodDescriptor, handlerMethodDescriptor, layerPath) { - return function (req) { - const trace = agent.traceContext.currentTraceObject() - let spanEventRecorder = null - let handlerSpanEventRecorder - if (trace) { - spanEventRecorder = trace.traceBlockBegin() - spanEventRecorder.recordServiceType(ServiceTypeCode.express) - - const methodDescriptor = appAllMethodDescriptor || getMethodDescriptor(objectName, layerName, req.method) - if (methodDescriptor && layerPath) { - spanEventRecorder.recordApiWithParameters(methodDescriptor, [layerPath]) - } else if (methodDescriptor) { - spanEventRecorder.recordApi(methodDescriptor) - } else { - spanEventRecorder.recordApiDesc(getDescriptionText(objectName, layerName)) - } - - if (handlerMethodDescriptor) { - handlerSpanEventRecorder = trace.traceBlockBegin() - handlerSpanEventRecorder.recordServiceType(ServiceTypeCode.node_method) - handlerSpanEventRecorder.recordApi(handlerMethodDescriptor) - } - } - const result = original.apply(this, arguments) - if (trace) { - if (handlerSpanEventRecorder) { - trace.traceBlockEnd(handlerSpanEventRecorder) - } - trace.traceBlockEnd(spanEventRecorder) - } - return result - } - } - - function recordErrorHandle(original, objectName, layerName) { - return function (err, req, res, next) { - log.debug('recordErrorHandle start', getMethodDescriptor(objectName, layerName, req.method)) - const trace = agent.traceContext.currentTraceObject() - let spanEventRecorder = null - - if (err && trace) { - spanEventRecorder = trace.traceBlockBegin() - spanEventRecorder.recordServiceType(ServiceTypeCode.express) - spanEventRecorder.recordException(err, true) - const methodDescriptor = getMethodDescriptor(objectName, layerName, req.method) - if (methodDescriptor) { - spanEventRecorder.recordApi(getMethodDescriptor(objectName, layerName, req.method)) - } else { - spanEventRecorder.recordApiDesc(getDescriptionText(objectName, layerName, req.method)) - } - } - const result = original.apply(this, arguments) - if (trace) { - trace.traceBlockEnd(spanEventRecorder) - } - log.debug('recordErrorHandle end', getMethodDescriptor(objectName, layerName, req.method)) - return result - } - } return express }