Skip to content

Commit e435f4e

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

File tree

5 files changed

+34
-55
lines changed

5 files changed

+34
-55
lines changed

CHANGELOG.md

Lines changed: 28 additions & 32 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

@@ -100,37 +126,7 @@ await compiled.invoke({
100126
- ref(core): Move ai integrations from utils to tracing ([#18185](https://github.com/getsentry/sentry-javascript/pull/18185))
101127
- ref(core): Optimize `Scope.setTag` bundle size and adjust test ([#18182](https://github.com/getsentry/sentry-javascript/pull/18182))
102128

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)
129+
</details>
134130

135131
## 10.25.0
136132

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)