From 004fb1199f28bc097ee65542a0288446f13b1f22 Mon Sep 17 00:00:00 2001 From: Stephen Belanger Date: Thu, 29 Sep 2022 14:46:39 -0400 Subject: [PATCH 1/2] Add support for http2 servers in compatibility mode --- .../src/http2/server.js | 68 ++++- packages/datadog-plugin-http2/src/server.js | 41 +++ .../datadog-plugin-http2/test/server.spec.js | 259 ++++++++++++++++++ 3 files changed, 367 insertions(+), 1 deletion(-) create mode 100644 packages/datadog-plugin-http2/test/server.spec.js diff --git a/packages/datadog-instrumentations/src/http2/server.js b/packages/datadog-instrumentations/src/http2/server.js index f0421430e76..6c9a290c7a7 100644 --- a/packages/datadog-instrumentations/src/http2/server.js +++ b/packages/datadog-instrumentations/src/http2/server.js @@ -1,3 +1,69 @@ 'use strict' -// Instrumentation temporarily disabled. See https://github.com/DataDog/dd-trace-js/issues/312 +// Old instrumentation temporarily replaced with compatibility mode only instrumentation. +// See https://github.com/DataDog/dd-trace-js/issues/312 + +const { + channel, + addHook, + AsyncResource +} = require('../helpers/instrument') +const shimmer = require('../../../datadog-shimmer') + +const startServerCh = channel('apm:http2:server:request:start') +const errorServerCh = channel('apm:http2:server:request:error') +const finishServerCh = channel('apm:http2:server:request:finish') + +addHook({ name: 'http2' }, http2 => { + shimmer.wrap(http2, 'createSecureServer', wrapCreateServer) + shimmer.wrap(http2, 'createServer', wrapCreateServer) + return http2 +}) + +function wrapCreateServer (createServer) { + return function (...args) { + const server = createServer.apply(this, args) + shimmer.wrap(server, 'emit', wrapEmit) + return server + } +} + +function wrapResponseEmit (emit) { + const asyncResource = new AsyncResource('bound-anonymous-fn') + return function (eventName, event) { + return asyncResource.runInAsyncScope(() => { + if (eventName === 'close' && finishServerCh.hasSubscribers) { + finishServerCh.publish({ req: this.req }) + } + + return emit.apply(this, arguments) + }) + } +} +function wrapEmit (emit) { + return function (eventName, req, res) { + if (!startServerCh.hasSubscribers) { + return emit.apply(this, arguments) + } + + if (eventName === 'request') { + res.req = req + + const asyncResource = new AsyncResource('bound-anonymous-fn') + return asyncResource.runInAsyncScope(() => { + startServerCh.publish({ req, res }) + + shimmer.wrap(res, 'emit', wrapResponseEmit) + + try { + return emit.apply(this, arguments) + } catch (err) { + errorServerCh.publish(err) + + throw err + } + }) + } + return emit.apply(this, arguments) + } +} diff --git a/packages/datadog-plugin-http2/src/server.js b/packages/datadog-plugin-http2/src/server.js index 7f40390590f..7544c550eaa 100644 --- a/packages/datadog-plugin-http2/src/server.js +++ b/packages/datadog-plugin-http2/src/server.js @@ -3,11 +3,52 @@ // Plugin temporarily disabled. See https://github.com/DataDog/dd-trace-js/issues/312 const Plugin = require('../../dd-trace/src/plugins/plugin') +const { storage } = require('../../datadog-core') +const web = require('../../dd-trace/src/plugins/util/web') +const { incomingHttpRequestStart } = require('../../dd-trace/src/appsec/gateway/channels') class Http2ServerPlugin extends Plugin { static get name () { return 'http2' } + + constructor (...args) { + super(...args) + + this.addSub('apm:http2:server:request:start', ({ req, res }) => { + const store = storage.getStore() + const span = web.startSpan(this.tracer, this.config, req, res, 'web.request') + + this.enter(span, { ...store, req }) + + const context = web.getContext(req) + + if (!context.instrumented) { + context.res.writeHead = web.wrapWriteHead(context) + context.instrumented = true + } + + if (incomingHttpRequestStart.hasSubscribers) { + incomingHttpRequestStart.publish({ req, res }) + } + }) + + this.addSub('apm:http2:server:request:error', (error) => { + web.addError(error) + }) + + this.addSub('apm:http2:server:request:finish', ({ req }) => { + const context = web.getContext(req) + + if (!context || !context.res) return // Not created by a http.Server instance. + + web.finishAll(context) + }) + } + + configure (config) { + return super.configure(web.normalizeConfig(config)) + } } module.exports = Http2ServerPlugin diff --git a/packages/datadog-plugin-http2/test/server.spec.js b/packages/datadog-plugin-http2/test/server.spec.js new file mode 100644 index 00000000000..965564f52df --- /dev/null +++ b/packages/datadog-plugin-http2/test/server.spec.js @@ -0,0 +1,259 @@ +'use strict' + +const { EventEmitter } = require('events') +const getPort = require('get-port') +const agent = require('../../dd-trace/test/plugins/agent') +const { incomingHttpRequestStart } = require('../../dd-trace/src/appsec/gateway/channels') + +class MockAbortController { + constructor () { + this.signal = new EventEmitter() + } + abort () { + this.signal.emit('abort') + } +} + +function request (http2, url, { signal } = {}) { + url = new URL(url) + return new Promise((resolve, reject) => { + const client = http2 + .connect(url.origin) + .on('error', reject) + + const req = client.request({ + ':path': url.pathname, + ':method': 'GET' + }) + req.on('error', reject) + + if (signal) { + signal.on('abort', () => req.destroy()) + } + + const chunks = [] + req.on('data', (chunk) => { + chunks.push(chunk) + }) + req.on('end', () => { + resolve(Buffer.concat(chunks)) + }) + + req.end() + }) +} + +describe('Plugin', () => { + let http2 + let listener + let appListener + let tracer + let port + let app + + describe('http2/server', () => { + beforeEach(() => { + tracer = require('../../dd-trace') + listener = (req, res) => { + app && app(req, res) + res.writeHead(200) + res.end() + } + }) + + beforeEach(() => { + return getPort().then(newPort => { + port = newPort + }) + }) + + afterEach(() => { + appListener && appListener.close() + app = null + return agent.close({ ritmReset: false }) + }) + + describe('canceled request', () => { + beforeEach(() => { + listener = (req, res) => { + setTimeout(() => { + app && app(req, res) + res.writeHead(200) + res.end() + }, 500) + } + }) + + beforeEach(() => { + return agent.load('http2') + .then(() => { + http2 = require('http2') + }) + }) + + beforeEach(done => { + const server = http2.createServer(listener) + appListener = server + .listen(port, 'localhost', () => done()) + }) + + it('should send traces to agent', (done) => { + app = sinon.stub() + agent + .use(traces => { + expect(app).not.to.have.been.called // request should be cancelled before call to app + expect(traces[0][0]).to.have.property('name', 'web.request') + expect(traces[0][0]).to.have.property('service', 'test') + expect(traces[0][0]).to.have.property('type', 'web') + expect(traces[0][0]).to.have.property('resource', 'GET') + expect(traces[0][0].meta).to.have.property('span.kind', 'server') + expect(traces[0][0].meta).to.have.property('http.url', `http://localhost:${port}/user`) + expect(traces[0][0].meta).to.have.property('http.method', 'GET') + expect(traces[0][0].meta).to.have.property('http.status_code', '200') + }) + .then(done) + .catch(done) + + // Don't use real AbortController because it requires 15.x+ + const ac = new MockAbortController() + request(http2, `http://localhost:${port}/user`, { + signal: ac.signal + }) + setTimeout(() => { ac.abort() }, 100) + }) + }) + + describe('without configuration', () => { + beforeEach(() => { + return agent.load('http2') + .then(() => { + http2 = require('http2') + }) + }) + + beforeEach(done => { + const server = http2.createServer(listener) + appListener = server + .listen(port, 'localhost', () => done()) + }) + + it('should do automatic instrumentation', done => { + agent + .use(traces => { + expect(traces[0][0]).to.have.property('name', 'web.request') + expect(traces[0][0]).to.have.property('service', 'test') + expect(traces[0][0]).to.have.property('type', 'web') + expect(traces[0][0]).to.have.property('resource', 'GET') + expect(traces[0][0].meta).to.have.property('span.kind', 'server') + expect(traces[0][0].meta).to.have.property('http.url', `http://localhost:${port}/user`) + expect(traces[0][0].meta).to.have.property('http.method', 'GET') + expect(traces[0][0].meta).to.have.property('http.status_code', '200') + }) + .then(done) + .catch(done) + + request(http2, `http://localhost:${port}/user`).catch(done) + }) + + it('should run the request listener in the request scope', done => { + const spy = sinon.spy(() => { + expect(tracer.scope().active()).to.not.be.null + }) + + incomingHttpRequestStart.subscribe(spy) + + app = (req, res) => { + expect(tracer.scope().active()).to.not.be.null + + expect(spy).to.have.been.calledOnceWithExactly({ req, res }, incomingHttpRequestStart.name) + + done() + } + + request(http2, `http://localhost:${port}/user`).catch(done) + }) + + it(`should run the request's close event in the correct context`, done => { + app = (req, res) => { + req.on('close', () => { + expect(tracer.scope().active()).to.equal(null) + done() + }) + } + + request(http2, `http://localhost:${port}/user`).catch(done) + }) + + it(`should run the response's close event in the correct context`, done => { + app = (req, res) => { + const span = tracer.scope().active() + + res.on('close', () => { + expect(tracer.scope().active()).to.equal(span) + done() + }) + } + + request(http2, `http://localhost:${port}/user`).catch(done) + }) + + it(`should run the finish event in the correct context`, done => { + app = (req, res) => { + const span = tracer.scope().active() + + res.on('finish', () => { + expect(tracer.scope().active()).to.equal(span) + done() + }) + } + + request(http2, `http://localhost:${port}/user`).catch(done) + }) + + it('should not cause `end` to be called multiple times', done => { + app = (req, res) => { + res.end = sinon.spy(res.end) + + res.on('finish', () => { + expect(res.end).to.have.been.calledOnce + done() + }) + } + + request(http2, `http://localhost:${port}/user`).catch(done) + }) + }) + + describe('with a blocklist configuration', () => { + beforeEach(() => { + return agent.load('http2', { client: false, blocklist: '/health' }) + .then(() => { + http2 = require('http2') + }) + }) + + beforeEach(done => { + const server = http2.createServer(listener) + appListener = server + .listen(port, 'localhost', () => done()) + }) + + it('should drop traces for blocklist route', done => { + const spy = sinon.spy(() => {}) + + agent + .use((traces) => { + spy() + }) + .catch(done) + + setTimeout(() => { + expect(spy).to.not.have.been.called + done() + }, 100) + + request(http2, `http://localhost:${port}/health`).catch(done) + }) + }) + }) +}) From 01435ed08f36c6f2098d1274f3b4d926c1053225 Mon Sep 17 00:00:00 2001 From: Roch Devost Date: Wed, 5 Oct 2022 10:20:49 -0400 Subject: [PATCH 2/2] fix typo --- packages/datadog-plugin-http2/test/server.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/datadog-plugin-http2/test/server.spec.js b/packages/datadog-plugin-http2/test/server.spec.js index 965564f52df..2b1ad92427d 100644 --- a/packages/datadog-plugin-http2/test/server.spec.js +++ b/packages/datadog-plugin-http2/test/server.spec.js @@ -73,7 +73,7 @@ describe('Plugin', () => { return agent.close({ ritmReset: false }) }) - describe('canceled request', () => { + describe('cancelled request', () => { beforeEach(() => { listener = (req, res) => { setTimeout(() => {