-
Notifications
You must be signed in to change notification settings - Fork 309
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for http2 servers in compatibility mode (#2415)
* Add support for http2 servers in compatibility mode * fix typo Co-authored-by: Roch Devost <roch.devost@datadoghq.com>
- Loading branch information
Showing
3 changed files
with
367 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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('cancelled 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) | ||
}) | ||
}) | ||
}) | ||
}) |