-
Notifications
You must be signed in to change notification settings - Fork 621
fix: instrumentation of ESM-imported mongoose #2793
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
Merged
pichlermarc
merged 4 commits into
open-telemetry:main
from
JCMais:feat/fix-mongoose-esm
Apr 30, 2025
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
1ec1c8a
fix instrumentation of ESM-imported mongoose
JCMais 0b88ab1
Update plugins/node/instrumentation-mongoose/test/mongoose-common.tes…
pichlermarc e157a0d
chore: fix lint
pichlermarc 930196e
Merge branch 'main' into feat/fix-mongoose-esm
pichlermarc 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 hidden or 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
63 changes: 63 additions & 0 deletions
63
plugins/node/instrumentation-mongoose/test/fixtures/use-mongoose.mjs
This file contains hidden or 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 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| // Use mongoose from an ES module: | ||
| // node --experimental-loader=@opentelemetry/instrumentation/hook.mjs use-mongoose.mjs [MONGO_URL] [DB_NAME | ||
|
|
||
| import { trace } from '@opentelemetry/api'; | ||
| import { createTestNodeSdk } from '@opentelemetry/contrib-test-utils'; | ||
|
|
||
| import { MongooseInstrumentation } from '../../build/src/index.js'; | ||
|
|
||
| const sdk = createTestNodeSdk({ | ||
| serviceName: 'use-mongoose', | ||
| instrumentations: [new MongooseInstrumentation()], | ||
| }); | ||
| sdk.start(); | ||
|
|
||
| import assert from 'assert'; | ||
| import mongoose from 'mongoose'; | ||
|
|
||
| const MONGO_URL = process.argv[2] || ''; | ||
| const DB_NAME = process.argv[3] || ''; | ||
|
|
||
| const randomId = ((Math.random() * 2 ** 32) >>> 0).toString(16); | ||
|
|
||
| await mongoose.connect(MONGO_URL, { | ||
| dbName: DB_NAME, | ||
| }); | ||
|
|
||
| const TestModel = mongoose.model( | ||
| 'Test', | ||
| new mongoose.Schema({ | ||
| name: String, | ||
| }) | ||
| ); | ||
|
|
||
| const tracer = trace.getTracer('mongoose-instrumentation'); | ||
| await tracer.startActiveSpan('manual', async span => { | ||
| const name = `test-${randomId}`; | ||
| const [createdDoc] = await TestModel.create([{ name }]); | ||
|
|
||
| const doc = await TestModel.findOne({ name }).exec(); | ||
|
|
||
| assert(doc && createdDoc?._id.toString() === doc?._id.toString()); | ||
|
|
||
| span.end(); | ||
| }); | ||
|
|
||
| await mongoose.disconnect(); | ||
| await sdk.shutdown(); |
This file contains hidden or 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.
Uh oh!
There was an error while loading. Please reload this page.