Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 7 so the `contextCaptureFunctions7` version branch is exercised against a real mongoose.
describe('Mongoose v7 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const expectedSpan = (operation: string) =>
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': operation,
'db.system': 'mongoose',
}),
description: `mongoose.BlogPost.${operation}`,
op: 'db',
origin: 'auto.db.otel.mongoose',
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expectedSpan('save'),
expectedSpan('findOne'),
expectedSpan('aggregate'),
expectedSpan('insertMany'),
expectedSpan('bulkWrite'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v7.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^7' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

// Document instance methods. On mongoose 8.21.0+ these return a lazy Query that the
// instrumentation must hand back un-executed (regression guard for the thenable trap).
await post.updateOne({ title: 'Updated' });

// Verify the update actually persisted (i.e. the query executed exactly when awaited).
const updated = await BlogPost.findById(post._id);
if (!updated || updated.title !== 'Updated') {
throw new Error(`updateOne did not persist as expected, got: ${updated && updated.title}`);
}

// Lazy-Query guard: a document updateOne returns a lazy Query that only runs when awaited.
// Building it without awaiting must NOT execute it — if the instrumentation runs it (e.g. by
// calling `.then()` on the returned thenable), this premature write would change the document.
const lazyDoc = await new BlogPost({ title: 'Original', body: 'b', date: new Date() }).save();
// eslint-disable-next-line @typescript-eslint/no-floating-promises
lazyDoc.updateOne({ title: 'PrematurelyExecuted' });
await new Promise(resolve => setTimeout(resolve, 250));
Comment thread
cursor[bot] marked this conversation as resolved.
const lazyCheck = await BlogPost.findById(lazyDoc._id);
if (!lazyCheck || lazyCheck.title !== 'Original') {
throw new Error(
`lazy updateOne was executed without being awaited (got title: ${lazyCheck && lazyCheck.title})`,
);
}

await post.deleteOne();
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 8 (>= 8.21) so the document `updateOne`/`deleteOne` lazy-Query path is exercised
// against a real mongoose, guarding the thenable trap that mongoose 6 (the workspace version) can't hit.
describe('Mongoose v8 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'save',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.save',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'updateOne',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.updateOne',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'deleteOne',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.deleteOne',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v8 document methods.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^8' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);

// Document instance methods. On v9 these are not doc-method-patched (needsDocumentMethodPatch
// only matches 8.x) but are still instrumented via the patched Query.exec path.
const doc = await BlogPost.create({ title: 'DocMethod', body: 'b', date: new Date() });
await doc.updateOne({ title: 'DocMethodUpdated' });
await doc.deleteOne();
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, expect } from 'vitest';
import { conditionalTest } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 9 (top of our supported `>=5.9.7 <10` range) so the latest major is exercised
// against a real mongoose. mongoose 9 requires Node >=20.19, so this suite is skipped on older Node.
conditionalTest({ min: 20 })('Mongoose v9 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const expectedSpan = (operation: string) =>
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': operation,
'db.system': 'mongoose',
}),
description: `mongoose.BlogPost.${operation}`,
op: 'db',
origin: 'auto.db.otel.mongoose',
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expectedSpan('save'),
expectedSpan('findOne'),
expectedSpan('aggregate'),
expectedSpan('insertMany'),
expectedSpan('bulkWrite'),
// Document instance methods are instrumented via Query.exec on v9 (no doc-method patch).
expectedSpan('updateOne'),
expectedSpan('deleteOne'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v9.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^9' } },
);
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,44 @@ async function run() {
await post.save();

await BlogPost.findOne({});

// Callback form (mongoose 5/6 only): the callback is passed as the sole argument, so it must
// be forwarded in the correct position. Reject if the callback doesn't receive the saved doc.
await new Promise((resolve, reject) => {
new BlogPost({ title: 'Callback', body: 'cb', date: new Date() }).save((err, doc) => {
if (err) {
reject(err);
} else if (!doc || doc.title !== 'Callback') {
reject(new Error('save(callback) did not receive the saved document'));
} else {
resolve();
}
});
});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);

// `remove` is a real document method (deprecated in 6, removed in 7), only patched for v5/6.
const toRemove = await BlogPost.create({ title: 'Remove', body: 'r', date: new Date() });
await toRemove.remove();

// Cross-context parent: a query built inside one span but executed after it ends should still
// be parented to the span it was built in (via _STORED_PARENT_SPAN), not the active span at exec.
let pendingQuery;
Sentry.startSpan({ name: 'query-builder' }, () => {
pendingQuery = BlogPost.findOne({ title: 'Test' });
});
await pendingQuery;

// Failing operation: a save that violates required-field validation should still produce a
// span, marked with an error status.
const RequiredSchema = new Schema({ requiredField: { type: String, required: true } });
const RequiredDoc = mongoose.model('RequiredDoc', RequiredSchema);
await new RequiredDoc({}).save().catch(() => undefined);
},
);
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 7 so the `contextCaptureFunctions7` version branch is exercised against a real mongoose.
describe('Mongoose v7 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const expectedSpan = (operation: string) =>
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': operation,
'db.system': 'mongoose',
}),
description: `mongoose.BlogPost.${operation}`,
op: 'db',
origin: 'auto.db.otel.mongoose',
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expectedSpan('save'),
expectedSpan('findOne'),
expectedSpan('aggregate'),
expectedSpan('insertMany'),
expectedSpan('bulkWrite'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v7.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^7' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

// Document instance methods. On mongoose 8.21.0+ these return a lazy Query that the
// instrumentation must hand back un-executed (regression guard for the thenable trap).
await post.updateOne({ title: 'Updated' });

// Verify the update actually persisted (i.e. the query executed exactly when awaited).
const updated = await BlogPost.findById(post._id);
if (!updated || updated.title !== 'Updated') {
throw new Error(`updateOne did not persist as expected, got: ${updated && updated.title}`);
}

// Lazy-Query guard: a document updateOne returns a lazy Query that only runs when awaited.
// Building it without awaiting must NOT execute it — if the instrumentation runs it (e.g. by
// calling `.then()` on the returned thenable), this premature write would change the document.
const lazyDoc = await new BlogPost({ title: 'Original', body: 'b', date: new Date() }).save();
// eslint-disable-next-line @typescript-eslint/no-floating-promises
lazyDoc.updateOne({ title: 'PrematurelyExecuted' });
await new Promise(resolve => setTimeout(resolve, 250));
Comment thread
cursor[bot] marked this conversation as resolved.
const lazyCheck = await BlogPost.findById(lazyDoc._id);
if (!lazyCheck || lazyCheck.title !== 'Original') {
throw new Error(
`lazy updateOne was executed without being awaited (got title: ${lazyCheck && lazyCheck.title})`,
);
}

await post.deleteOne();
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 8 (>= 8.21) so the document `updateOne`/`deleteOne` lazy-Query path is exercised
// against a real mongoose, guarding the thenable trap that mongoose 6 (the workspace version) can't hit.
describe('Mongoose v8 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'save',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.save',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'updateOne',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.updateOne',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'deleteOne',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.deleteOne',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v8 document methods.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^8' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);

// Document instance methods. On v9 these are not doc-method-patched (needsDocumentMethodPatch
// only matches 8.x) but are still instrumented via the patched Query.exec path.
const doc = await BlogPost.create({ title: 'DocMethod', body: 'b', date: new Date() });
await doc.updateOne({ title: 'DocMethodUpdated' });
await doc.deleteOne();
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, expect } from 'vitest';
import { conditionalTest } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 9 (top of our supported `>=5.9.7 <10` range) so the latest major is exercised
// against a real mongoose. mongoose 9 requires Node >=20.19, so this suite is skipped on older Node.
conditionalTest({ min: 20 })('Mongoose v9 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const expectedSpan = (operation: string) =>
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': operation,
'db.system': 'mongoose',
}),
description: `mongoose.BlogPost.${operation}`,
op: 'db',
origin: 'auto.db.otel.mongoose',
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expectedSpan('save'),
expectedSpan('findOne'),
expectedSpan('aggregate'),
expectedSpan('insertMany'),
expectedSpan('bulkWrite'),
// Document instance methods are instrumented via Query.exec on v9 (no doc-method patch).
expectedSpan('updateOne'),
expectedSpan('deleteOne'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v9.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^9' } },
);
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,44 @@ async function run() {
await post.save();

await BlogPost.findOne({});

// Callback form (mongoose 5/6 only): the callback is passed as the sole argument, so it must
// be forwarded in the correct position. Reject if the callback doesn't receive the saved doc.
await new Promise((resolve, reject) => {
new BlogPost({ title: 'Callback', body: 'cb', date: new Date() }).save((err, doc) => {
if (err) {
reject(err);
} else if (!doc || doc.title !== 'Callback') {
reject(new Error('save(callback) did not receive the saved document'));
} else {
resolve();
}
});
});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);

// `remove` is a real document method (deprecated in 6, removed in 7), only patched for v5/6.
const toRemove = await BlogPost.create({ title: 'Remove', body: 'r', date: new Date() });
await toRemove.remove();

// Cross-context parent: a query built inside one span but executed after it ends should still
// be parented to the span it was built in (via _STORED_PARENT_SPAN), not the active span at exec.
let pendingQuery;
Sentry.startSpan({ name: 'query-builder' }, () => {
pendingQuery = BlogPost.findOne({ title: 'Test' });
});
await pendingQuery;

// Failing operation: a save that violates required-field validation should still produce a
// span, marked with an error status.
const RequiredSchema = new Schema({ requiredField: { type: String, required: true } });
const RequiredDoc = mongoose.model('RequiredDoc', RequiredSchema);
await new RequiredDoc({}).save().catch(() => undefined);
},
);
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 7 so the `contextCaptureFunctions7` version branch is exercised against a real mongoose.
describe('Mongoose v7 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const expectedSpan = (operation: string) =>
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': operation,
'db.system': 'mongoose',
}),
description: `mongoose.BlogPost.${operation}`,
op: 'db',
origin: 'auto.db.otel.mongoose',
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expectedSpan('save'),
expectedSpan('findOne'),
expectedSpan('aggregate'),
expectedSpan('insertMany'),
expectedSpan('bulkWrite'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v7.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^7' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

// Document instance methods. On mongoose 8.21.0+ these return a lazy Query that the
// instrumentation must hand back un-executed (regression guard for the thenable trap).
await post.updateOne({ title: 'Updated' });

// Verify the update actually persisted (i.e. the query executed exactly when awaited).
const updated = await BlogPost.findById(post._id);
if (!updated || updated.title !== 'Updated') {
throw new Error(`updateOne did not persist as expected, got: ${updated && updated.title}`);
}

// Lazy-Query guard: a document updateOne returns a lazy Query that only runs when awaited.
// Building it without awaiting must NOT execute it — if the instrumentation runs it (e.g. by
// calling `.then()` on the returned thenable), this premature write would change the document.
const lazyDoc = await new BlogPost({ title: 'Original', body: 'b', date: new Date() }).save();
// eslint-disable-next-line @typescript-eslint/no-floating-promises
lazyDoc.updateOne({ title: 'PrematurelyExecuted' });
await new Promise(resolve => setTimeout(resolve, 250));
Comment thread
cursor[bot] marked this conversation as resolved.
const lazyCheck = await BlogPost.findById(lazyDoc._id);
if (!lazyCheck || lazyCheck.title !== 'Original') {
throw new Error(
`lazy updateOne was executed without being awaited (got title: ${lazyCheck && lazyCheck.title})`,
);
}

await post.deleteOne();
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 8 (>= 8.21) so the document `updateOne`/`deleteOne` lazy-Query path is exercised
// against a real mongoose, guarding the thenable trap that mongoose 6 (the workspace version) can't hit.
describe('Mongoose v8 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'save',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.save',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'updateOne',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.updateOne',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'deleteOne',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.deleteOne',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v8 document methods.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^8' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);

// Document instance methods. On v9 these are not doc-method-patched (needsDocumentMethodPatch
// only matches 8.x) but are still instrumented via the patched Query.exec path.
const doc = await BlogPost.create({ title: 'DocMethod', body: 'b', date: new Date() });
await doc.updateOne({ title: 'DocMethodUpdated' });
await doc.deleteOne();
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, expect } from 'vitest';
import { conditionalTest } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 9 (top of our supported `>=5.9.7 <10` range) so the latest major is exercised
// against a real mongoose. mongoose 9 requires Node >=20.19, so this suite is skipped on older Node.
conditionalTest({ min: 20 })('Mongoose v9 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const expectedSpan = (operation: string) =>
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': operation,
'db.system': 'mongoose',
}),
description: `mongoose.BlogPost.${operation}`,
op: 'db',
origin: 'auto.db.otel.mongoose',
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expectedSpan('save'),
expectedSpan('findOne'),
expectedSpan('aggregate'),
expectedSpan('insertMany'),
expectedSpan('bulkWrite'),
// Document instance methods are instrumented via Query.exec on v9 (no doc-method patch).
expectedSpan('updateOne'),
expectedSpan('deleteOne'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v9.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^9' } },
);
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,44 @@ async function run() {
await post.save();

await BlogPost.findOne({});

// Callback form (mongoose 5/6 only): the callback is passed as the sole argument, so it must
// be forwarded in the correct position. Reject if the callback doesn't receive the saved doc.
await new Promise((resolve, reject) => {
new BlogPost({ title: 'Callback', body: 'cb', date: new Date() }).save((err, doc) => {
if (err) {
reject(err);
} else if (!doc || doc.title !== 'Callback') {
reject(new Error('save(callback) did not receive the saved document'));
} else {
resolve();
}
});
});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);

// `remove` is a real document method (deprecated in 6, removed in 7), only patched for v5/6.
const toRemove = await BlogPost.create({ title: 'Remove', body: 'r', date: new Date() });
await toRemove.remove();

// Cross-context parent: a query built inside one span but executed after it ends should still
// be parented to the span it was built in (via _STORED_PARENT_SPAN), not the active span at exec.
let pendingQuery;
Sentry.startSpan({ name: 'query-builder' }, () => {
pendingQuery = BlogPost.findOne({ title: 'Test' });
});
await pendingQuery;

// Failing operation: a save that violates required-field validation should still produce a
// span, marked with an error status.
const RequiredSchema = new Schema({ requiredField: { type: String, required: true } });
const RequiredDoc = mongoose.model('RequiredDoc', RequiredSchema);
await new RequiredDoc({}).save().catch(() => undefined);
},
);
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 7 so the `contextCaptureFunctions7` version branch is exercised against a real mongoose.
describe('Mongoose v7 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const expectedSpan = (operation: string) =>
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': operation,
'db.system': 'mongoose',
}),
description: `mongoose.BlogPost.${operation}`,
op: 'db',
origin: 'auto.db.otel.mongoose',
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expectedSpan('save'),
expectedSpan('findOne'),
expectedSpan('aggregate'),
expectedSpan('insertMany'),
expectedSpan('bulkWrite'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v7.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^7' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

// Document instance methods. On mongoose 8.21.0+ these return a lazy Query that the
// instrumentation must hand back un-executed (regression guard for the thenable trap).
await post.updateOne({ title: 'Updated' });

// Verify the update actually persisted (i.e. the query executed exactly when awaited).
const updated = await BlogPost.findById(post._id);
if (!updated || updated.title !== 'Updated') {
throw new Error(`updateOne did not persist as expected, got: ${updated && updated.title}`);
}

// Lazy-Query guard: a document updateOne returns a lazy Query that only runs when awaited.
// Building it without awaiting must NOT execute it — if the instrumentation runs it (e.g. by
// calling `.then()` on the returned thenable), this premature write would change the document.
const lazyDoc = await new BlogPost({ title: 'Original', body: 'b', date: new Date() }).save();
// eslint-disable-next-line @typescript-eslint/no-floating-promises
lazyDoc.updateOne({ title: 'PrematurelyExecuted' });
await new Promise(resolve => setTimeout(resolve, 250));
Comment thread
cursor[bot] marked this conversation as resolved.
const lazyCheck = await BlogPost.findById(lazyDoc._id);
if (!lazyCheck || lazyCheck.title !== 'Original') {
throw new Error(
`lazy updateOne was executed without being awaited (got title: ${lazyCheck && lazyCheck.title})`,
);
}

await post.deleteOne();
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 8 (>= 8.21) so the document `updateOne`/`deleteOne` lazy-Query path is exercised
// against a real mongoose, guarding the thenable trap that mongoose 6 (the workspace version) can't hit.
describe('Mongoose v8 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'save',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.save',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'updateOne',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.updateOne',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'deleteOne',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.deleteOne',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v8 document methods.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^8' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);

// Document instance methods. On v9 these are not doc-method-patched (needsDocumentMethodPatch
// only matches 8.x) but are still instrumented via the patched Query.exec path.
const doc = await BlogPost.create({ title: 'DocMethod', body: 'b', date: new Date() });
await doc.updateOne({ title: 'DocMethodUpdated' });
await doc.deleteOne();
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, expect } from 'vitest';
import { conditionalTest } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 9 (top of our supported `>=5.9.7 <10` range) so the latest major is exercised
// against a real mongoose. mongoose 9 requires Node >=20.19, so this suite is skipped on older Node.
conditionalTest({ min: 20 })('Mongoose v9 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const expectedSpan = (operation: string) =>
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': operation,
'db.system': 'mongoose',
}),
description: `mongoose.BlogPost.${operation}`,
op: 'db',
origin: 'auto.db.otel.mongoose',
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expectedSpan('save'),
expectedSpan('findOne'),
expectedSpan('aggregate'),
expectedSpan('insertMany'),
expectedSpan('bulkWrite'),
// Document instance methods are instrumented via Query.exec on v9 (no doc-method patch).
expectedSpan('updateOne'),
expectedSpan('deleteOne'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v9.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^9' } },
);
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,44 @@ async function run() {
await post.save();

await BlogPost.findOne({});

// Callback form (mongoose 5/6 only): the callback is passed as the sole argument, so it must
// be forwarded in the correct position. Reject if the callback doesn't receive the saved doc.
await new Promise((resolve, reject) => {
new BlogPost({ title: 'Callback', body: 'cb', date: new Date() }).save((err, doc) => {
if (err) {
reject(err);
} else if (!doc || doc.title !== 'Callback') {
reject(new Error('save(callback) did not receive the saved document'));
} else {
resolve();
}
});
});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);

// `remove` is a real document method (deprecated in 6, removed in 7), only patched for v5/6.
const toRemove = await BlogPost.create({ title: 'Remove', body: 'r', date: new Date() });
await toRemove.remove();

// Cross-context parent: a query built inside one span but executed after it ends should still
// be parented to the span it was built in (via _STORED_PARENT_SPAN), not the active span at exec.
let pendingQuery;
Sentry.startSpan({ name: 'query-builder' }, () => {
pendingQuery = BlogPost.findOne({ title: 'Test' });
});
await pendingQuery;

// Failing operation: a save that violates required-field validation should still produce a
// span, marked with an error status.
const RequiredSchema = new Schema({ requiredField: { type: String, required: true } });
const RequiredDoc = mongoose.model('RequiredDoc', RequiredSchema);
await new RequiredDoc({}).save().catch(() => undefined);
},
);
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 7 so the `contextCaptureFunctions7` version branch is exercised against a real mongoose.
describe('Mongoose v7 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const expectedSpan = (operation: string) =>
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': operation,
'db.system': 'mongoose',
}),
description: `mongoose.BlogPost.${operation}`,
op: 'db',
origin: 'auto.db.otel.mongoose',
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expectedSpan('save'),
expectedSpan('findOne'),
expectedSpan('aggregate'),
expectedSpan('insertMany'),
expectedSpan('bulkWrite'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v7.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^7' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

// Document instance methods. On mongoose 8.21.0+ these return a lazy Query that the
// instrumentation must hand back un-executed (regression guard for the thenable trap).
await post.updateOne({ title: 'Updated' });

// Verify the update actually persisted (i.e. the query executed exactly when awaited).
const updated = await BlogPost.findById(post._id);
if (!updated || updated.title !== 'Updated') {
throw new Error(`updateOne did not persist as expected, got: ${updated && updated.title}`);
}

// Lazy-Query guard: a document updateOne returns a lazy Query that only runs when awaited.
// Building it without awaiting must NOT execute it — if the instrumentation runs it (e.g. by
// calling `.then()` on the returned thenable), this premature write would change the document.
const lazyDoc = await new BlogPost({ title: 'Original', body: 'b', date: new Date() }).save();
// eslint-disable-next-line @typescript-eslint/no-floating-promises
lazyDoc.updateOne({ title: 'PrematurelyExecuted' });
await new Promise(resolve => setTimeout(resolve, 250));
Comment thread
cursor[bot] marked this conversation as resolved.
const lazyCheck = await BlogPost.findById(lazyDoc._id);
if (!lazyCheck || lazyCheck.title !== 'Original') {
throw new Error(
`lazy updateOne was executed without being awaited (got title: ${lazyCheck && lazyCheck.title})`,
);
}

await post.deleteOne();
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 8 (>= 8.21) so the document `updateOne`/`deleteOne` lazy-Query path is exercised
// against a real mongoose, guarding the thenable trap that mongoose 6 (the workspace version) can't hit.
describe('Mongoose v8 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'save',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.save',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'updateOne',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.updateOne',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'deleteOne',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.deleteOne',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v8 document methods.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^8' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);

// Document instance methods. On v9 these are not doc-method-patched (needsDocumentMethodPatch
// only matches 8.x) but are still instrumented via the patched Query.exec path.
const doc = await BlogPost.create({ title: 'DocMethod', body: 'b', date: new Date() });
await doc.updateOne({ title: 'DocMethodUpdated' });
await doc.deleteOne();
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, expect } from 'vitest';
import { conditionalTest } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 9 (top of our supported `>=5.9.7 <10` range) so the latest major is exercised
// against a real mongoose. mongoose 9 requires Node >=20.19, so this suite is skipped on older Node.
conditionalTest({ min: 20 })('Mongoose v9 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const expectedSpan = (operation: string) =>
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': operation,
'db.system': 'mongoose',
}),
description: `mongoose.BlogPost.${operation}`,
op: 'db',
origin: 'auto.db.otel.mongoose',
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expectedSpan('save'),
expectedSpan('findOne'),
expectedSpan('aggregate'),
expectedSpan('insertMany'),
expectedSpan('bulkWrite'),
// Document instance methods are instrumented via Query.exec on v9 (no doc-method patch).
expectedSpan('updateOne'),
expectedSpan('deleteOne'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v9.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^9' } },
);
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,44 @@ async function run() {
await post.save();

await BlogPost.findOne({});

// Callback form (mongoose 5/6 only): the callback is passed as the sole argument, so it must
// be forwarded in the correct position. Reject if the callback doesn't receive the saved doc.
await new Promise((resolve, reject) => {
new BlogPost({ title: 'Callback', body: 'cb', date: new Date() }).save((err, doc) => {
if (err) {
reject(err);
} else if (!doc || doc.title !== 'Callback') {
reject(new Error('save(callback) did not receive the saved document'));
} else {
resolve();
}
});
});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);

// `remove` is a real document method (deprecated in 6, removed in 7), only patched for v5/6.
const toRemove = await BlogPost.create({ title: 'Remove', body: 'r', date: new Date() });
await toRemove.remove();

// Cross-context parent: a query built inside one span but executed after it ends should still
// be parented to the span it was built in (via _STORED_PARENT_SPAN), not the active span at exec.
let pendingQuery;
Sentry.startSpan({ name: 'query-builder' }, () => {
pendingQuery = BlogPost.findOne({ title: 'Test' });
});
await pendingQuery;

// Failing operation: a save that violates required-field validation should still produce a
// span, marked with an error status.
const RequiredSchema = new Schema({ requiredField: { type: String, required: true } });
const RequiredDoc = mongoose.model('RequiredDoc', RequiredSchema);
await new RequiredDoc({}).save().catch(() => undefined);
},
);
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 7 so the `contextCaptureFunctions7` version branch is exercised against a real mongoose.
describe('Mongoose v7 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const expectedSpan = (operation: string) =>
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': operation,
'db.system': 'mongoose',
}),
description: `mongoose.BlogPost.${operation}`,
op: 'db',
origin: 'auto.db.otel.mongoose',
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expectedSpan('save'),
expectedSpan('findOne'),
expectedSpan('aggregate'),
expectedSpan('insertMany'),
expectedSpan('bulkWrite'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v7.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^7' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

// Document instance methods. On mongoose 8.21.0+ these return a lazy Query that the
// instrumentation must hand back un-executed (regression guard for the thenable trap).
await post.updateOne({ title: 'Updated' });

// Verify the update actually persisted (i.e. the query executed exactly when awaited).
const updated = await BlogPost.findById(post._id);
if (!updated || updated.title !== 'Updated') {
throw new Error(`updateOne did not persist as expected, got: ${updated && updated.title}`);
}

// Lazy-Query guard: a document updateOne returns a lazy Query that only runs when awaited.
// Building it without awaiting must NOT execute it — if the instrumentation runs it (e.g. by
// calling `.then()` on the returned thenable), this premature write would change the document.
const lazyDoc = await new BlogPost({ title: 'Original', body: 'b', date: new Date() }).save();
// eslint-disable-next-line @typescript-eslint/no-floating-promises
lazyDoc.updateOne({ title: 'PrematurelyExecuted' });
await new Promise(resolve => setTimeout(resolve, 250));
Comment thread
cursor[bot] marked this conversation as resolved.
const lazyCheck = await BlogPost.findById(lazyDoc._id);
if (!lazyCheck || lazyCheck.title !== 'Original') {
throw new Error(
`lazy updateOne was executed without being awaited (got title: ${lazyCheck && lazyCheck.title})`,
);
}

await post.deleteOne();
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 8 (>= 8.21) so the document `updateOne`/`deleteOne` lazy-Query path is exercised
// against a real mongoose, guarding the thenable trap that mongoose 6 (the workspace version) can't hit.
describe('Mongoose v8 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'save',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.save',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'updateOne',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.updateOne',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'deleteOne',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.deleteOne',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v8 document methods.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^8' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);

// Document instance methods. On v9 these are not doc-method-patched (needsDocumentMethodPatch
// only matches 8.x) but are still instrumented via the patched Query.exec path.
const doc = await BlogPost.create({ title: 'DocMethod', body: 'b', date: new Date() });
await doc.updateOne({ title: 'DocMethodUpdated' });
await doc.deleteOne();
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, expect } from 'vitest';
import { conditionalTest } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 9 (top of our supported `>=5.9.7 <10` range) so the latest major is exercised
// against a real mongoose. mongoose 9 requires Node >=20.19, so this suite is skipped on older Node.
conditionalTest({ min: 20 })('Mongoose v9 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const expectedSpan = (operation: string) =>
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': operation,
'db.system': 'mongoose',
}),
description: `mongoose.BlogPost.${operation}`,
op: 'db',
origin: 'auto.db.otel.mongoose',
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expectedSpan('save'),
expectedSpan('findOne'),
expectedSpan('aggregate'),
expectedSpan('insertMany'),
expectedSpan('bulkWrite'),
// Document instance methods are instrumented via Query.exec on v9 (no doc-method patch).
expectedSpan('updateOne'),
expectedSpan('deleteOne'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v9.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^9' } },
);
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,44 @@ async function run() {
await post.save();

await BlogPost.findOne({});

// Callback form (mongoose 5/6 only): the callback is passed as the sole argument, so it must
// be forwarded in the correct position. Reject if the callback doesn't receive the saved doc.
await new Promise((resolve, reject) => {
new BlogPost({ title: 'Callback', body: 'cb', date: new Date() }).save((err, doc) => {
if (err) {
reject(err);
} else if (!doc || doc.title !== 'Callback') {
reject(new Error('save(callback) did not receive the saved document'));
} else {
resolve();
}
});
});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);

// `remove` is a real document method (deprecated in 6, removed in 7), only patched for v5/6.
const toRemove = await BlogPost.create({ title: 'Remove', body: 'r', date: new Date() });
await toRemove.remove();

// Cross-context parent: a query built inside one span but executed after it ends should still
// be parented to the span it was built in (via _STORED_PARENT_SPAN), not the active span at exec.
let pendingQuery;
Sentry.startSpan({ name: 'query-builder' }, () => {
pendingQuery = BlogPost.findOne({ title: 'Test' });
});
await pendingQuery;

// Failing operation: a save that violates required-field validation should still produce a
// span, marked with an error status.
const RequiredSchema = new Schema({ requiredField: { type: String, required: true } });
const RequiredDoc = mongoose.model('RequiredDoc', RequiredSchema);
await new RequiredDoc({}).save().catch(() => undefined);
},
);
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 7 so the `contextCaptureFunctions7` version branch is exercised against a real mongoose.
describe('Mongoose v7 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const expectedSpan = (operation: string) =>
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': operation,
'db.system': 'mongoose',
}),
description: `mongoose.BlogPost.${operation}`,
op: 'db',
origin: 'auto.db.otel.mongoose',
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expectedSpan('save'),
expectedSpan('findOne'),
expectedSpan('aggregate'),
expectedSpan('insertMany'),
expectedSpan('bulkWrite'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v7.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^7' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

// Document instance methods. On mongoose 8.21.0+ these return a lazy Query that the
// instrumentation must hand back un-executed (regression guard for the thenable trap).
await post.updateOne({ title: 'Updated' });

// Verify the update actually persisted (i.e. the query executed exactly when awaited).
const updated = await BlogPost.findById(post._id);
if (!updated || updated.title !== 'Updated') {
throw new Error(`updateOne did not persist as expected, got: ${updated && updated.title}`);
}

// Lazy-Query guard: a document updateOne returns a lazy Query that only runs when awaited.
// Building it without awaiting must NOT execute it — if the instrumentation runs it (e.g. by
// calling `.then()` on the returned thenable), this premature write would change the document.
const lazyDoc = await new BlogPost({ title: 'Original', body: 'b', date: new Date() }).save();
// eslint-disable-next-line @typescript-eslint/no-floating-promises
lazyDoc.updateOne({ title: 'PrematurelyExecuted' });
await new Promise(resolve => setTimeout(resolve, 250));
Comment thread
cursor[bot] marked this conversation as resolved.
const lazyCheck = await BlogPost.findById(lazyDoc._id);
if (!lazyCheck || lazyCheck.title !== 'Original') {
throw new Error(
`lazy updateOne was executed without being awaited (got title: ${lazyCheck && lazyCheck.title})`,
);
}

await post.deleteOne();
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 8 (>= 8.21) so the document `updateOne`/`deleteOne` lazy-Query path is exercised
// against a real mongoose, guarding the thenable trap that mongoose 6 (the workspace version) can't hit.
describe('Mongoose v8 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'save',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.save',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'updateOne',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.updateOne',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'deleteOne',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.deleteOne',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v8 document methods.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^8' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);

// Document instance methods. On v9 these are not doc-method-patched (needsDocumentMethodPatch
// only matches 8.x) but are still instrumented via the patched Query.exec path.
const doc = await BlogPost.create({ title: 'DocMethod', body: 'b', date: new Date() });
await doc.updateOne({ title: 'DocMethodUpdated' });
await doc.deleteOne();
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, expect } from 'vitest';
import { conditionalTest } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 9 (top of our supported `>=5.9.7 <10` range) so the latest major is exercised
// against a real mongoose. mongoose 9 requires Node >=20.19, so this suite is skipped on older Node.
conditionalTest({ min: 20 })('Mongoose v9 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const expectedSpan = (operation: string) =>
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': operation,
'db.system': 'mongoose',
}),
description: `mongoose.BlogPost.${operation}`,
op: 'db',
origin: 'auto.db.otel.mongoose',
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expectedSpan('save'),
expectedSpan('findOne'),
expectedSpan('aggregate'),
expectedSpan('insertMany'),
expectedSpan('bulkWrite'),
// Document instance methods are instrumented via Query.exec on v9 (no doc-method patch).
expectedSpan('updateOne'),
expectedSpan('deleteOne'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v9.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^9' } },
);
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,44 @@ async function run() {
await post.save();

await BlogPost.findOne({});

// Callback form (mongoose 5/6 only): the callback is passed as the sole argument, so it must
// be forwarded in the correct position. Reject if the callback doesn't receive the saved doc.
await new Promise((resolve, reject) => {
new BlogPost({ title: 'Callback', body: 'cb', date: new Date() }).save((err, doc) => {
if (err) {
reject(err);
} else if (!doc || doc.title !== 'Callback') {
reject(new Error('save(callback) did not receive the saved document'));
} else {
resolve();
}
});
});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);

// `remove` is a real document method (deprecated in 6, removed in 7), only patched for v5/6.
const toRemove = await BlogPost.create({ title: 'Remove', body: 'r', date: new Date() });
await toRemove.remove();

// Cross-context parent: a query built inside one span but executed after it ends should still
// be parented to the span it was built in (via _STORED_PARENT_SPAN), not the active span at exec.
let pendingQuery;
Sentry.startSpan({ name: 'query-builder' }, () => {
pendingQuery = BlogPost.findOne({ title: 'Test' });
});
await pendingQuery;

// Failing operation: a save that violates required-field validation should still produce a
// span, marked with an error status.
const RequiredSchema = new Schema({ requiredField: { type: String, required: true } });
const RequiredDoc = mongoose.model('RequiredDoc', RequiredSchema);
await new RequiredDoc({}).save().catch(() => undefined);
},
);
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 7 so the `contextCaptureFunctions7` version branch is exercised against a real mongoose.
describe('Mongoose v7 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const expectedSpan = (operation: string) =>
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': operation,
'db.system': 'mongoose',
}),
description: `mongoose.BlogPost.${operation}`,
op: 'db',
origin: 'auto.db.otel.mongoose',
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expectedSpan('save'),
expectedSpan('findOne'),
expectedSpan('aggregate'),
expectedSpan('insertMany'),
expectedSpan('bulkWrite'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v7.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^7' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

// Document instance methods. On mongoose 8.21.0+ these return a lazy Query that the
// instrumentation must hand back un-executed (regression guard for the thenable trap).
await post.updateOne({ title: 'Updated' });

// Verify the update actually persisted (i.e. the query executed exactly when awaited).
const updated = await BlogPost.findById(post._id);
if (!updated || updated.title !== 'Updated') {
throw new Error(`updateOne did not persist as expected, got: ${updated && updated.title}`);
}

// Lazy-Query guard: a document updateOne returns a lazy Query that only runs when awaited.
// Building it without awaiting must NOT execute it — if the instrumentation runs it (e.g. by
// calling `.then()` on the returned thenable), this premature write would change the document.
const lazyDoc = await new BlogPost({ title: 'Original', body: 'b', date: new Date() }).save();
// eslint-disable-next-line @typescript-eslint/no-floating-promises
lazyDoc.updateOne({ title: 'PrematurelyExecuted' });
await new Promise(resolve => setTimeout(resolve, 250));
Comment thread
cursor[bot] marked this conversation as resolved.
const lazyCheck = await BlogPost.findById(lazyDoc._id);
if (!lazyCheck || lazyCheck.title !== 'Original') {
throw new Error(
`lazy updateOne was executed without being awaited (got title: ${lazyCheck && lazyCheck.title})`,
);
}

await post.deleteOne();
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 8 (>= 8.21) so the document `updateOne`/`deleteOne` lazy-Query path is exercised
// against a real mongoose, guarding the thenable trap that mongoose 6 (the workspace version) can't hit.
describe('Mongoose v8 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'save',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.save',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'updateOne',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.updateOne',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': 'deleteOne',
'db.system': 'mongoose',
}),
description: 'mongoose.BlogPost.deleteOne',
op: 'db',
origin: 'auto.db.otel.mongoose',
}),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v8 document methods.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^8' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
import * as Sentry from '@sentry/node';
import mongoose from 'mongoose';

async function run() {
await mongoose.connect(process.env.MONGO_URL || '');

const BlogPostSchema = new mongoose.Schema({
title: String,
body: String,
date: Date,
});

const BlogPost = mongoose.model('BlogPost', BlogPostSchema);

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
const post = new BlogPost({ title: 'Test', body: 'Test body', date: new Date() });

await post.save();

await BlogPost.findOne({});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);

// Document instance methods. On v9 these are not doc-method-patched (needsDocumentMethodPatch
// only matches 8.x) but are still instrumented via the patched Query.exec path.
const doc = await BlogPost.create({ title: 'DocMethod', body: 'b', date: new Date() });
await doc.updateOne({ title: 'DocMethodUpdated' });
await doc.deleteOne();
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
import { afterAll, beforeAll, expect } from 'vitest';
import { conditionalTest } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Pins mongoose 9 (top of our supported `>=5.9.7 <10` range) so the latest major is exercised
// against a real mongoose. mongoose 9 requires Node >=20.19, so this suite is skipped on older Node.
conditionalTest({ min: 20 })('Mongoose v9 Test', () => {
let mongoServer: MongoMemoryServer;

beforeAll(async () => {
mongoServer = await MongoMemoryServer.create();
process.env.MONGO_URL = mongoServer.getUri();
}, 30000);

afterAll(async () => {
if (mongoServer) {
await mongoServer.stop();
}
cleanupChildProcesses();
});

const expectedSpan = (operation: string) =>
expect.objectContaining({
data: expect.objectContaining({
'db.mongodb.collection': 'blogposts',
'db.operation': operation,
'db.system': 'mongoose',
}),
description: `mongoose.BlogPost.${operation}`,
op: 'db',
origin: 'auto.db.otel.mongoose',
});

const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction',
spans: expect.arrayContaining([
expectedSpan('save'),
expectedSpan('findOne'),
expectedSpan('aggregate'),
expectedSpan('insertMany'),
expectedSpan('bulkWrite'),
// Document instance methods are instrumented via Query.exec on v9 (no doc-method patch).
expectedSpan('updateOne'),
expectedSpan('deleteOne'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments `mongoose` v9.', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});
},
{ additionalDependencies: { mongoose: '^9' } },
);
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,44 @@ async function run() {
await post.save();

await BlogPost.findOne({});

// Callback form (mongoose 5/6 only): the callback is passed as the sole argument, so it must
// be forwarded in the correct position. Reject if the callback doesn't receive the saved doc.
await new Promise((resolve, reject) => {
new BlogPost({ title: 'Callback', body: 'cb', date: new Date() }).save((err, doc) => {
if (err) {
reject(err);
} else if (!doc || doc.title !== 'Callback') {
reject(new Error('save(callback) did not receive the saved document'));
} else {
resolve();
}
});
});

await BlogPost.aggregate([{ $match: {} }]);

await BlogPost.insertMany([{ title: 'Insert', body: 'Insert body', date: new Date() }]);

await BlogPost.bulkWrite([{ insertOne: { document: { title: 'Bulk', body: 'Bulk body', date: new Date() } } }]);

// `remove` is a real document method (deprecated in 6, removed in 7), only patched for v5/6.
const toRemove = await BlogPost.create({ title: 'Remove', body: 'r', date: new Date() });
await toRemove.remove();

// Cross-context parent: a query built inside one span but executed after it ends should still
// be parented to the span it was built in (via _STORED_PARENT_SPAN), not the active span at exec.
let pendingQuery;
Sentry.startSpan({ name: 'query-builder' }, () => {
pendingQuery = BlogPost.findOne({ title: 'Test' });
});
await pendingQuery;

// Failing operation: a save that violates required-field validation should still produce a
// span, marked with an error status.
const RequiredSchema = new Schema({ requiredField: { type: String, required: true } });
const RequiredDoc = mongoose.model('RequiredDoc', RequiredSchema);
await new RequiredDoc({}).save().catch(() => undefined);
},
);
}
Expand Down
Loading
Loading