-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
fix(mongo): rewrite Buffer as ? during serialization #14071
Merged
Merged
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
402bd0e
fix(mongo): rewrite Buffer as ? during serialization
bcoe f2f387c
chore: fix formatting
bcoe 989826c
chore: update integration tests
bcoe 998bd68
chore: fix formatting
bcoe 5da83bc
Merge branch 'develop' into handle-buffer
bcoe 68ce53c
Merge branch 'develop' into handle-buffer
bcoe a71f831
Merge branch 'develop' into handle-buffer
bcoe 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
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,72 @@ | ||
import { MongoDBInstrumentation } from '@opentelemetry/instrumentation-mongodb'; | ||
|
||
import { | ||
_defaultDbStatementSerializer, | ||
instrumentMongo, | ||
mongoIntegration, | ||
} from '../../../src/integrations/tracing/mongo'; | ||
import { INSTRUMENTED } from '../../../src/otel/instrument'; | ||
|
||
jest.mock('@opentelemetry/instrumentation-mongodb'); | ||
|
||
describe('Mongo', () => { | ||
beforeEach(() => { | ||
jest.clearAllMocks(); | ||
delete INSTRUMENTED.Mongo; | ||
|
||
(MongoDBInstrumentation as unknown as jest.SpyInstance).mockImplementation(() => { | ||
return { | ||
setTracerProvider: () => undefined, | ||
setMeterProvider: () => undefined, | ||
getConfig: () => ({}), | ||
setConfig: () => ({}), | ||
enable: () => undefined, | ||
}; | ||
}); | ||
}); | ||
|
||
it('defaults are correct for instrumentMongo', () => { | ||
instrumentMongo(); | ||
|
||
expect(MongoDBInstrumentation).toHaveBeenCalledTimes(1); | ||
expect(MongoDBInstrumentation).toHaveBeenCalledWith({ | ||
dbStatementSerializer: expect.any(Function), | ||
responseHook: expect.any(Function), | ||
}); | ||
}); | ||
|
||
it('defaults are correct for mongoIntegration', () => { | ||
mongoIntegration().setupOnce!(); | ||
|
||
expect(MongoDBInstrumentation).toHaveBeenCalledTimes(1); | ||
expect(MongoDBInstrumentation).toHaveBeenCalledWith({ | ||
responseHook: expect.any(Function), | ||
dbStatementSerializer: expect.any(Function), | ||
}); | ||
}); | ||
|
||
describe('_defaultDbStatementSerializer', () => { | ||
it('rewrites strings as ?', () => { | ||
const serialized = _defaultDbStatementSerializer({ | ||
find: 'foo', | ||
}); | ||
expect(JSON.parse(serialized).find).toBe('?'); | ||
}); | ||
|
||
it('rewrites nested strings as ?', () => { | ||
const serialized = _defaultDbStatementSerializer({ | ||
find: { | ||
inner: 'foo', | ||
}, | ||
}); | ||
expect(JSON.parse(serialized).find.inner).toBe('?'); | ||
}); | ||
|
||
it('rewrites Buffer as ?', () => { | ||
const serialized = _defaultDbStatementSerializer({ | ||
find: Buffer.from('foo', 'utf8'), | ||
}); | ||
expect(JSON.parse(serialized).find).toBe('?'); | ||
}); | ||
}); | ||
}); |
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.
I don't think this is necessary, all our node versions should support this so let's just check normally here :)