Skip to content

Commit 1a1d8fc

Browse files
committed
Bump import/require-in-the-middle to match @opentelemetry/instrumentation's
1 parent 05f1303 commit 1a1d8fc

File tree

5 files changed

+45
-103
lines changed

5 files changed

+45
-103
lines changed

CHANGELOG.md

Lines changed: 39 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,33 @@
44

55
- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
66

7-
<<<<<<< HEAD
7+
- feat(deps): Bump OpenTelemetry instrumentations ([#18239](https://github.com/getsentry/sentry-javascript/pull/18239))
8+
- Bump @opentelemetry/instrumentation from 0.204.0 to 0.208.0
9+
- Bump @opentelemetry/instrumentation-amqplib from 0.51.0 to 0.55.0
10+
- Bump @opentelemetry/instrumentation-aws-sdk from 0.59.0 to 0.64.0
11+
- Bump @opentelemetry/instrumentation-connect from 0.48.0 to 0.52.0
12+
- Bump @opentelemetry/instrumentation-dataloader from 0.22.0 to 0.26.0
13+
- Bump @opentelemetry/instrumentation-express from 0.53.0 to 0.57.0
14+
- Bump @opentelemetry/instrumentation-fs from 0.24.0 to 0.28.0
15+
- Bump @opentelemetry/instrumentation-generic-pool from 0.48.0 to 0.52.0
16+
- Bump @opentelemetry/instrumentation-graphql from 0.52.0 to 0.56.0
17+
- Bump @opentelemetry/instrumentation-hapi from 0.51.0 to 0.55.0
18+
- Bump @opentelemetry/instrumentation-http from 0.204.0 to 0.208.0
19+
- Bump @opentelemetry/instrumentation-ioredis from 0.52.0 to 0.56.0
20+
- Bump @opentelemetry/instrumentation-kafkajs from 0.14.0 to 0.18.0
21+
- Bump @opentelemetry/instrumentation-knex from 0.49.0 to 0.53.0
22+
- Bump @opentelemetry/instrumentation-koa from 0.52.0 to 0.57.0
23+
- Bump @opentelemetry/instrumentation-lru-memoizer from 0.49.0 to 0.53.0
24+
- Bump @opentelemetry/instrumentation-mongodb from 0.57.0 to 0.61.0
25+
- Bump @opentelemetry/instrumentation-mongoose from 0.51.0 to 0.55.0
26+
- Bump @opentelemetry/instrumentation-mysql from 0.50.0 to 0.54.0
27+
- Bump @opentelemetry/instrumentation-mysql2 from 0.51.0 to 0.55.0
28+
- Bump @opentelemetry/instrumentation-nestjs-core from 0.50.0 to 0.55.0
29+
- Bump @opentelemetry/instrumentation-pg from 0.57.0 to 0.61.0
30+
- Bump @opentelemetry/instrumentation-redis from 0.53.0 to 0.57.0
31+
- Bump @opentelemetry/instrumentation-tedious from 0.23.0 to 0.27.0
32+
- Bump @opentelemetry/instrumentation-undici from 0.15.0 to 0.19.0
33+
- Bump @prisma/instrumentation from 6.15.0 to 6.19.0
834

935
## 10.26.0
1036

@@ -41,16 +67,11 @@ const graph = new StateGraph(MessagesAnnotation)
4167
.addEdge(START, 'agent')
4268
.addEdge('agent', END);
4369

44-
Sentry.instrumentLangGraph(graph, {
45-
recordInputs: true,
46-
recordOutputs: true,
47-
});
70+
Sentry.instrumentLangGraph(graph, { recordInputs: true, recordOutputs: true });
4871

4972
const compiled = graph.compile({ name: 'weather_assistant' });
5073

51-
await compiled.invoke({
52-
messages: [{ role: 'user', content: 'What is the weather in SF?' }],
53-
});
74+
await compiled.invoke({ messages: [{ role: 'user', content: 'What is the weather in SF?' }] });
5475
```
5576

5677
- **feat(node): Add OpenAI SDK v6 support ([#18244](https://github.com/getsentry/sentry-javascript/pull/18244))**
@@ -100,37 +121,7 @@ await compiled.invoke({
100121
- ref(core): Move ai integrations from utils to tracing ([#18185](https://github.com/getsentry/sentry-javascript/pull/18185))
101122
- ref(core): Optimize `Scope.setTag` bundle size and adjust test ([#18182](https://github.com/getsentry/sentry-javascript/pull/18182))
102123

103-
# </details>
104-
105-
- feat(deps): Bump OpenTelemetry instrumentations ([#18239](https://github.com/getsentry/sentry-javascript/pull/18239))
106-
- Bump @opentelemetry/instrumentation from 0.204.0 to 0.208.0
107-
- Bump @opentelemetry/instrumentation-amqplib from 0.51.0 to 0.55.0
108-
- Bump @opentelemetry/instrumentation-aws-sdk from 0.59.0 to 0.64.0
109-
- Bump @opentelemetry/instrumentation-connect from 0.48.0 to 0.52.0
110-
- Bump @opentelemetry/instrumentation-dataloader from 0.22.0 to 0.26.0
111-
- Bump @opentelemetry/instrumentation-express from 0.53.0 to 0.57.0
112-
- Bump @opentelemetry/instrumentation-fs from 0.24.0 to 0.28.0
113-
- Bump @opentelemetry/instrumentation-generic-pool from 0.48.0 to 0.52.0
114-
- Bump @opentelemetry/instrumentation-graphql from 0.52.0 to 0.56.0
115-
- Bump @opentelemetry/instrumentation-hapi from 0.51.0 to 0.55.0
116-
- Bump @opentelemetry/instrumentation-http from 0.204.0 to 0.208.0
117-
- Bump @opentelemetry/instrumentation-ioredis from 0.52.0 to 0.56.0
118-
- Bump @opentelemetry/instrumentation-kafkajs from 0.14.0 to 0.18.0
119-
- Bump @opentelemetry/instrumentation-knex from 0.49.0 to 0.53.0
120-
- Bump @opentelemetry/instrumentation-koa from 0.52.0 to 0.57.0
121-
- Bump @opentelemetry/instrumentation-lru-memoizer from 0.49.0 to 0.53.0
122-
- Bump @opentelemetry/instrumentation-mongodb from 0.57.0 to 0.61.0
123-
- Bump @opentelemetry/instrumentation-mongoose from 0.51.0 to 0.55.0
124-
- Bump @opentelemetry/instrumentation-mysql from 0.50.0 to 0.54.0
125-
- Bump @opentelemetry/instrumentation-mysql2 from 0.51.0 to 0.55.0
126-
- Bump @opentelemetry/instrumentation-nestjs-core from 0.50.0 to 0.55.0
127-
- Bump @opentelemetry/instrumentation-pg from 0.57.0 to 0.61.0
128-
- Bump @opentelemetry/instrumentation-redis from 0.53.0 to 0.57.0
129-
- Bump @opentelemetry/instrumentation-tedious from 0.23.0 to 0.27.0
130-
- Bump @opentelemetry/instrumentation-undici from 0.15.0 to 0.19.0
131-
- Bump @prisma/instrumentation from 6.15.0 to 6.19.0
132-
- fix(node): Fix Spotlight configuration precedence to match specification (#18195)
133-
> > > > > > > bf9901d2ee (feat(deps): Bump OpenTelemetry instrumentations)
124+
</details>
134125

135126
## 10.25.0
136127

@@ -730,12 +721,7 @@ With this release, we dropped the requirement to configure anything to get v5 su
730721
To enable it, set `_experiments.enableLambdaExtension` in your Sentry config like this:
731722

732723
```javascript
733-
Sentry.init({
734-
dsn: '<YOUR_DSN>',
735-
_experiments: {
736-
enableLambdaExtension: true,
737-
},
738-
});
724+
Sentry.init({ dsn: '<YOUR_DSN>', _experiments: { enableLambdaExtension: true } });
739725
```
740726

741727
### Other Changes
@@ -1046,10 +1032,7 @@ Sentry.init({
10461032
ignoreSpans: [
10471033
'partial match', // string matching on the span name
10481034
/regex/, // regex matching on the span name
1049-
{
1050-
name: 'span name',
1051-
op: /http.client/,
1052-
},
1035+
{ name: 'span name', op: /http.client/ },
10531036
],
10541037
});
10551038
```
@@ -1425,11 +1408,7 @@ The ANR integration has been deprecated and will be removed in future versions.
14251408
This replay option allows to configure a selector list of elements to not capture mutations for.
14261409

14271410
```js
1428-
Sentry.replayIntegration({
1429-
_experiments: {
1430-
ignoreMutations: ['.dragging'],
1431-
},
1432-
});
1411+
Sentry.replayIntegration({ _experiments: { ignoreMutations: ['.dragging'] } });
14331412
```
14341413

14351414
### Other changes
@@ -1478,12 +1457,7 @@ Work in this release was contributed by @0xbad0c0d3 and @alSergey. Thank you for
14781457
// server/plugins/sentry-cloudflare-setup.ts (filename does not matter)
14791458
import { sentryCloudflareNitroPlugin } from '@sentry/nuxt/module/plugins';
14801459

1481-
export default defineNitroPlugin(
1482-
sentryCloudflareNitroPlugin({
1483-
dsn: 'https://dsn',
1484-
tracesSampleRate: 1.0,
1485-
}),
1486-
);
1460+
export default defineNitroPlugin(sentryCloudflareNitroPlugin({ dsn: 'https://dsn', tracesSampleRate: 1.0 }));
14871461
```
14881462

14891463
or with access to `nitroApp`:
@@ -1516,21 +1490,13 @@ The `vercelAiIntegration` is now available as opt-in for the Cloudflare and the
15161490
To use it, add the integration in `Sentry.init`
15171491

15181492
```js
1519-
Sentry.init({
1520-
tracesSampleRate: 1.0,
1521-
integrations: [Sentry.vercelAIIntegration()],
1522-
});
1493+
Sentry.init({ tracesSampleRate: 1.0, integrations: [Sentry.vercelAIIntegration()] });
15231494
```
15241495

15251496
And enable telemetry for Vercel AI calls
15261497

15271498
```js
1528-
const result = await generateText({
1529-
model: openai('gpt-4o'),
1530-
experimental_telemetry: {
1531-
isEnabled: true,
1532-
},
1533-
});
1499+
const result = await generateText({ model: openai('gpt-4o'), experimental_telemetry: { isEnabled: true } });
15341500
```
15351501

15361502
- **feat(node): Add postgresjs instrumentation ([#16665](https://github.com/getsentry/sentry-javascript/pull/16665))**
@@ -1691,9 +1657,7 @@ This release adds an option to `browserTracingIntegration` that lets you ignore
16911657
```js
16921658
Sentry.init({
16931659
integrations: [
1694-
Sentry.browserTracingIntegration({
1695-
ignorePerformanceApiSpans: ['measure-to-ignore', /mark-to-ignore/],
1696-
}),
1660+
Sentry.browserTracingIntegration({ ignorePerformanceApiSpans: ['measure-to-ignore', /mark-to-ignore/] }),
16971661
],
16981662
});
16991663
```
@@ -1960,9 +1924,7 @@ This PR adds trace propagation to `@sentry/react-router` by providing utilities
19601924

19611925
const transport = Sentry.createSentryWinstonTransport(Transport);
19621926

1963-
const logger = winston.createLogger({
1964-
transports: [transport],
1965-
});
1927+
const logger = winston.createLogger({ transports: [transport] });
19661928
```
19671929

19681930
- **feat(core): Add `wrapMcpServerWithSentry` to instrument MCP servers from `@modelcontextprotocol/sdk` ([#16032](https://github.com/getsentry/sentry-javascript/pull/16032))**
@@ -1973,10 +1935,7 @@ This PR adds trace propagation to `@sentry/react-router` by providing utilities
19731935
import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
19741936

19751937
// Create an MCP server
1976-
const server = new McpServer({
1977-
name: 'Demo',
1978-
version: '1.0.0',
1979-
});
1938+
const server = new McpServer({ name: 'Demo', version: '1.0.0' });
19801939

19811940
// Use the instrumented server in your application
19821941
const instrumentedServer = Sentry.wrapMcpServerWithSentry(server);

dev-packages/e2e-tests/test-applications/nextjs-16/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
"@sentry/nextjs": "latest || *",
2727
"@sentry/core": "latest || *",
2828
"ai": "^3.0.0",
29-
"import-in-the-middle": "^1",
29+
"import-in-the-middle": "^2",
3030
"next": "16.0.0",
3131
"react": "19.1.0",
3232
"react-dom": "19.1.0",
33-
"require-in-the-middle": "^7",
33+
"require-in-the-middle": "^8",
3434
"zod": "^3.22.4"
3535
},
3636
"devDependencies": {

packages/node-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"@apm-js-collab/tracing-hooks": "^0.3.1",
7070
"@sentry/core": "10.26.0",
7171
"@sentry/opentelemetry": "10.26.0",
72-
"import-in-the-middle": "^1.14.2"
72+
"import-in-the-middle": "^2"
7373
},
7474
"devDependencies": {
7575
"@apm-js-collab/code-transformer": "^0.8.2",

packages/node/package.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,18 +94,11 @@
9494
"@opentelemetry/resources": "^2.1.0",
9595
"@opentelemetry/sdk-trace-base": "^2.1.0",
9696
"@opentelemetry/semantic-conventions": "^1.37.0",
97-
<<<<<<< HEAD
98-
"@prisma/instrumentation": "6.15.0",
97+
"@prisma/instrumentation": "6.19.0",
9998
"@sentry/core": "10.26.0",
10099
"@sentry/node-core": "10.26.0",
101100
"@sentry/opentelemetry": "10.26.0",
102-
=======
103-
"@prisma/instrumentation": "6.19.0",
104-
"@sentry/core": "10.25.0",
105-
"@sentry/node-core": "10.25.0",
106-
"@sentry/opentelemetry": "10.25.0",
107-
>>>>>>> bf9901d2ee (feat(deps): Bump OpenTelemetry instrumentations)
108-
"import-in-the-middle": "^1.14.2",
101+
"import-in-the-middle": "^2",
109102
"minimatch": "^9.0.0"
110103
},
111104
"devDependencies": {

yarn.lock

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19080,17 +19080,7 @@ import-fresh@^3.0.0, import-fresh@^3.2.1:
1908019080
parent-module "^1.0.0"
1908119081
resolve-from "^4.0.0"
1908219082

19083-
import-in-the-middle@^1.14.2:
19084-
version "1.14.2"
19085-
resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.14.2.tgz#283661625a88ff7c0462bd2984f77715c3bc967c"
19086-
integrity sha512-5tCuY9BV8ujfOpwtAGgsTx9CGUapcFMEEyByLv1B+v2+6DhAcw+Zr0nhQT7uwaZ7DiourxFEscghOR8e1aPLQw==
19087-
dependencies:
19088-
acorn "^8.14.0"
19089-
acorn-import-attributes "^1.9.5"
19090-
cjs-module-lexer "^1.2.2"
19091-
module-details-from-path "^1.0.3"
19092-
19093-
import-in-the-middle@^2.0.0:
19083+
import-in-the-middle@^2, import-in-the-middle@^2.0.0:
1909419084
version "2.0.0"
1909519085
resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-2.0.0.tgz#295948cee94d0565314824c6bd75379d13e5b1a5"
1909619086
integrity sha512-yNZhyQYqXpkT0AKq3F3KLasUSK4fHvebNH5hOsKQw2dhGSALvQ4U0BqUc5suziKvydO5u5hgN2hy1RJaho8U5A==

0 commit comments

Comments
 (0)