-
Notifications
You must be signed in to change notification settings - Fork 306
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add support for exit spans in Code Origin for Spans #4772
Open
watson
wants to merge
2
commits into
master
Choose a base branch
from
watson/DEBUG-2984/exit-spans
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+152
−13
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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,63 @@ | ||
'use strict' | ||
|
||
const agent = require('../../dd-trace/test/plugins/agent') | ||
|
||
describe('Plugin', () => { | ||
describe('http', () => { | ||
describe('Code Origin for Spans', () => { | ||
before(() => { | ||
// Needed when this spec file run together with other spec files, in which case the agent config is not | ||
// re-loaded unless the existing agent is wiped first. And we need the agent config to be re-loaded in order to | ||
// enable Code Origin for Spans. | ||
agent.wipe() | ||
}) | ||
|
||
beforeEach(async () => { | ||
return agent.load('http', { server: false }, { codeOriginForSpans: { enabled: true } }) | ||
}) | ||
|
||
afterEach(() => { | ||
return agent.close({ ritmReset: false }) | ||
}) | ||
|
||
it('should add code_origin tags for outbound requests', done => { | ||
server((port) => { | ||
const http = require('http') | ||
|
||
agent | ||
.use(traces => { | ||
const span = traces[0][0] | ||
expect(span.meta).to.have.property('_dd.code_origin.type', 'exit') | ||
|
||
// Just validate that frame 0 tags are present. The detailed validation is performed in a different test. | ||
expect(span.meta).to.have.property('_dd.code_origin.frames.0.file') | ||
expect(span.meta).to.have.property('_dd.code_origin.frames.0.line') | ||
expect(span.meta).to.have.property('_dd.code_origin.frames.0.column') | ||
expect(span.meta).to.have.property('_dd.code_origin.frames.0.method') | ||
expect(span.meta).to.have.property('_dd.code_origin.frames.0.type') | ||
}) | ||
.then(done) | ||
.catch(done) | ||
|
||
const req = http.request(`http://localhost:${port}/`, res => { | ||
res.resume() | ||
}) | ||
|
||
req.end() | ||
}) | ||
}) | ||
}) | ||
}) | ||
}) | ||
|
||
function server (callback) { | ||
const http = require('http') | ||
|
||
const server = http.createServer((req, res) => { | ||
res.end() | ||
}) | ||
|
||
server.listen(() => { | ||
callback(server.address().port) | ||
}) | ||
} |
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
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we already have a utility function that does this that I can re-use? Seem very much overkill to write this code for this test, but it does make the actual test much simpler to write once the tags are converted to a proper object structure 🤔