Skip to content

Commit

Permalink
feat: Upgrade OTEL dependencies (#12388)
Browse files Browse the repository at this point in the history
resolves #12242
(although there are still some follow ups)

https://github.com/open-telemetry/opentelemetry-js/releases/tag/v1.25.0

I think this lockfile looks correct, but lmk if this feels off.

resolves #12011
resolves #12059
resolves #12154
resolves #12237
resolves nodejs/import-in-the-middle#77 cc
@mohd-akram
  • Loading branch information
AbhiPrasad committed Jun 6, 2024
1 parent 039aa1d commit a16b557
Show file tree
Hide file tree
Showing 8 changed files with 216 additions and 212 deletions.
4 changes: 2 additions & 2 deletions .size-limit.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ module.exports = [
import: createImport('init'),
ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
gzip: true,
limit: '130 KB',
limit: '135 KB',
},
{
name: '@sentry/node - without tracing',
Expand All @@ -237,7 +237,7 @@ module.exports = [
import: createImport('init'),
ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
gzip: true,
limit: '120 KB',
limit: '125 KB',
},
];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ conditionalTest({ min: 18 })('LocalVariables integration', () => {
child.on('message', msg => {
reportedCount++;
const rssMb = (msg as { memUsage: { rss: number } }).memUsage.rss / 1024 / 1024;
// We shouldn't use more than 120MB of memory
expect(rssMb).toBeLessThan(120);
// We shouldn't use more than 135MB of memory
expect(rssMb).toBeLessThan(135);
});

// Wait for 20 seconds
Expand Down
4 changes: 2 additions & 2 deletions packages/aws-serverless/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
"access": "public"
},
"dependencies": {
"@opentelemetry/instrumentation-aws-lambda": "0.41.1",
"@opentelemetry/instrumentation-aws-sdk": "0.41.0",
"@opentelemetry/instrumentation-aws-lambda": "0.42.0",
"@opentelemetry/instrumentation-aws-sdk": "0.42.0",
"@sentry/core": "8.7.0",
"@sentry/node": "8.7.0",
"@sentry/types": "8.7.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"access": "public"
},
"dependencies": {
"@opentelemetry/instrumentation-http": "0.51.1",
"@opentelemetry/instrumentation-http": "0.52.0",
"@rollup/plugin-commonjs": "24.0.0",
"@sentry/core": "8.7.0",
"@sentry/node": "8.7.0",
Expand Down
44 changes: 22 additions & 22 deletions packages/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,28 +70,28 @@
"access": "public"
},
"dependencies": {
"@opentelemetry/api": "^1.8.0",
"@opentelemetry/context-async-hooks": "^1.24.1",
"@opentelemetry/core": "^1.24.1",
"@opentelemetry/instrumentation": "^0.51.1",
"@opentelemetry/instrumentation-connect": "0.36.1",
"@opentelemetry/instrumentation-express": "0.39.0",
"@opentelemetry/instrumentation-fastify": "0.36.1",
"@opentelemetry/instrumentation-graphql": "0.40.0",
"@opentelemetry/instrumentation-hapi": "0.38.0",
"@opentelemetry/instrumentation-http": "0.51.1",
"@opentelemetry/instrumentation-ioredis": "0.40.0",
"@opentelemetry/instrumentation-koa": "0.40.0",
"@opentelemetry/instrumentation-mongodb": "0.43.0",
"@opentelemetry/instrumentation-mongoose": "0.38.1",
"@opentelemetry/instrumentation-mysql": "0.38.1",
"@opentelemetry/instrumentation-mysql2": "0.38.1",
"@opentelemetry/instrumentation-nestjs-core": "0.37.1",
"@opentelemetry/instrumentation-pg": "0.41.0",
"@opentelemetry/resources": "^1.23.0",
"@opentelemetry/sdk-trace-base": "^1.23.0",
"@opentelemetry/semantic-conventions": "^1.23.0",
"@prisma/instrumentation": "5.14.0",
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/context-async-hooks": "^1.25.0",
"@opentelemetry/core": "^1.25.0",
"@opentelemetry/instrumentation": "^0.52.0",
"@opentelemetry/instrumentation-connect": "0.37.0",
"@opentelemetry/instrumentation-express": "0.40.0",
"@opentelemetry/instrumentation-fastify": "0.37.0",
"@opentelemetry/instrumentation-graphql": "0.41.0",
"@opentelemetry/instrumentation-hapi": "0.39.0",
"@opentelemetry/instrumentation-http": "0.52.0",
"@opentelemetry/instrumentation-ioredis": "0.41.0",
"@opentelemetry/instrumentation-koa": "0.41.0",
"@opentelemetry/instrumentation-mongodb": "0.44.0",
"@opentelemetry/instrumentation-mongoose": "0.39.0",
"@opentelemetry/instrumentation-mysql": "0.39.0",
"@opentelemetry/instrumentation-mysql2": "0.39.0",
"@opentelemetry/instrumentation-nestjs-core": "0.38.0",
"@opentelemetry/instrumentation-pg": "0.42.0",
"@opentelemetry/resources": "^1.25.0",
"@opentelemetry/sdk-trace-base": "^1.25.0",
"@opentelemetry/semantic-conventions": "^1.25.0",
"@prisma/instrumentation": "5.15.0",
"@sentry/core": "8.7.0",
"@sentry/opentelemetry": "8.7.0",
"@sentry/types": "8.7.0",
Expand Down
20 changes: 10 additions & 10 deletions packages/opentelemetry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,18 @@
"@sentry/utils": "8.7.0"
},
"peerDependencies": {
"@opentelemetry/api": "^1.8.0",
"@opentelemetry/core": "^1.24.1",
"@opentelemetry/instrumentation": "^0.51.1",
"@opentelemetry/sdk-trace-base": "^1.23.0",
"@opentelemetry/semantic-conventions": "^1.23.0"
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/core": "^1.25.0",
"@opentelemetry/instrumentation": "^0.52.0",
"@opentelemetry/sdk-trace-base": "^1.25.0",
"@opentelemetry/semantic-conventions": "^1.25.0"
},
"devDependencies": {
"@opentelemetry/api": "^1.8.0",
"@opentelemetry/context-async-hooks": "^1.24.1",
"@opentelemetry/core": "^1.24.1",
"@opentelemetry/sdk-trace-base": "^1.23.0",
"@opentelemetry/semantic-conventions": "^1.23.0"
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/context-async-hooks": "^1.25.0",
"@opentelemetry/core": "^1.25.0",
"@opentelemetry/sdk-trace-base": "^1.25.0",
"@opentelemetry/semantic-conventions": "^1.25.0"
},
"scripts": {
"build": "run-p build:transpile build:types",
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry/src/instrumentation.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { InstrumentationOption } from '@opentelemetry/instrumentation';
import type { Instrumentation } from '@opentelemetry/instrumentation';
import { registerInstrumentations } from '@opentelemetry/instrumentation';

/**
* This method takes an OpenTelemetry instrumentation or
* array of instrumentations and registers them with OpenTelemetry.
*/
export function addOpenTelemetryInstrumentation(...instrumentations: InstrumentationOption[]): void {
export function addOpenTelemetryInstrumentation(...instrumentations: Instrumentation[]): void {
registerInstrumentations({
instrumentations,
});
Expand Down
Loading

0 comments on commit a16b557

Please sign in to comment.