Skip to content

Commit 21cb542

Browse files
authored
Merge branch 'main' into python12
2 parents b2297b3 + c5a31d4 commit 21cb542

File tree

7 files changed

+978
-906
lines changed

7 files changed

+978
-906
lines changed

nodejs/package-lock.json

Lines changed: 597 additions & 550 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nodejs/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@
3030
"author": "OpenTelemetry Authors",
3131
"license": "Apache-2.0",
3232
"devDependencies": {
33-
"@typescript-eslint/eslint-plugin": "^8.1.0",
34-
"@typescript-eslint/parser": "^8.1.0",
33+
"@typescript-eslint/eslint-plugin": "^8.11.0",
34+
"@typescript-eslint/parser": "^8.11.0",
3535
"aws-sdk": "2.1691.0",
3636
"bestzip": "2.2.1",
3737
"copyfiles": "2.4.1",
3838
"eslint": "^8.57.0",
3939
"eslint-plugin-header": "3.1.1",
40-
"eslint-plugin-import": "2.30.0",
41-
"gts": "5.3.1",
40+
"eslint-plugin-import": "2.31.0",
41+
"gts": "6.0.2",
4242
"lerna": "^8.1.8",
4343
"lerna-changelog": "2.2.0",
4444
"rimraf": "6.0.1",
45-
"typescript": "5.6.2"
45+
"typescript": "5.6.3"
4646
},
4747
"changelog": {
4848
"labels": {

nodejs/packages/layer/package-lock.json

Lines changed: 334 additions & 310 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nodejs/packages/layer/package.json

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -28,40 +28,40 @@
2828
},
2929
"dependencies": {
3030
"@opentelemetry/api": "^1.9.0",
31-
"@opentelemetry/api-logs": "^0.53.0",
32-
"@opentelemetry/exporter-logs-otlp-proto": "^0.53.0",
33-
"@opentelemetry/auto-configuration-propagators": "^0.3.0",
34-
"@opentelemetry/core": "^1.26.0",
35-
"@opentelemetry/exporter-metrics-otlp-proto": "^0.53.0",
36-
"@opentelemetry/exporter-trace-otlp-proto": "^0.53.0",
37-
"@opentelemetry/instrumentation": "^0.53.0",
38-
"@opentelemetry/instrumentation-aws-lambda": "^0.44.0",
39-
"@opentelemetry/instrumentation-aws-sdk": "^0.44.0",
40-
"@opentelemetry/instrumentation-dns": "^0.39.0",
41-
"@opentelemetry/instrumentation-express": "^0.42.0",
42-
"@opentelemetry/instrumentation-graphql": "^0.43.0",
43-
"@opentelemetry/instrumentation-grpc": "^0.53.0",
44-
"@opentelemetry/instrumentation-hapi": "^0.41.0",
45-
"@opentelemetry/instrumentation-http": "^0.53.0",
46-
"@opentelemetry/instrumentation-ioredis": "^0.43.0",
47-
"@opentelemetry/instrumentation-koa": "^0.43.0",
48-
"@opentelemetry/instrumentation-mongodb": "^0.47.0",
49-
"@opentelemetry/instrumentation-mysql": "^0.41.0",
50-
"@opentelemetry/instrumentation-net": "^0.39.0",
51-
"@opentelemetry/instrumentation-pg": "^0.44.0",
52-
"@opentelemetry/instrumentation-redis": "^0.42.0",
31+
"@opentelemetry/api-logs": "^0.54.0",
32+
"@opentelemetry/exporter-logs-otlp-proto": "^0.54.0",
33+
"@opentelemetry/auto-configuration-propagators": "^0.3.1",
34+
"@opentelemetry/core": "^1.27.0",
35+
"@opentelemetry/exporter-metrics-otlp-proto": "^0.54.0",
36+
"@opentelemetry/exporter-trace-otlp-proto": "^0.54.0",
37+
"@opentelemetry/instrumentation": "^0.54.0",
38+
"@opentelemetry/instrumentation-aws-lambda": "^0.46.0",
39+
"@opentelemetry/instrumentation-aws-sdk": "^0.45.0",
40+
"@opentelemetry/instrumentation-dns": "^0.40.0",
41+
"@opentelemetry/instrumentation-express": "^0.44.0",
42+
"@opentelemetry/instrumentation-graphql": "^0.44.0",
43+
"@opentelemetry/instrumentation-grpc": "^0.54.0",
44+
"@opentelemetry/instrumentation-hapi": "^0.42.0",
45+
"@opentelemetry/instrumentation-http": "^0.54.0",
46+
"@opentelemetry/instrumentation-ioredis": "^0.44.0",
47+
"@opentelemetry/instrumentation-koa": "^0.44.0",
48+
"@opentelemetry/instrumentation-mongodb": "^0.48.0",
49+
"@opentelemetry/instrumentation-mysql": "^0.42.0",
50+
"@opentelemetry/instrumentation-net": "^0.40.0",
51+
"@opentelemetry/instrumentation-pg": "^0.47.0",
52+
"@opentelemetry/instrumentation-redis": "^0.43.0",
5353
"@opentelemetry/propagator-aws-xray": "^1.26.0",
54-
"@opentelemetry/resource-detector-aws": "^1.6.2",
55-
"@opentelemetry/resources": "^1.26.0",
56-
"@opentelemetry/sdk-logs": "^0.53.0",
57-
"@opentelemetry/sdk-metrics": "^1.26.0",
58-
"@opentelemetry/sdk-trace-base": "^1.26.0",
59-
"@opentelemetry/sdk-trace-node": "^1.26.0"
54+
"@opentelemetry/resource-detector-aws": "^1.7.0",
55+
"@opentelemetry/resources": "^1.27.0",
56+
"@opentelemetry/sdk-logs": "^0.54.0",
57+
"@opentelemetry/sdk-metrics": "^1.27.0",
58+
"@opentelemetry/sdk-trace-base": "^1.27.0",
59+
"@opentelemetry/sdk-trace-node": "^1.27.0"
6060
},
6161
"devDependencies": {
62-
"@types/mocha": "^10.0.7",
62+
"@types/mocha": "^10.0.9",
6363
"@types/sinon": "^17.0.3",
64-
"mocha": "^10.7.3",
64+
"mocha": "^10.8.2",
6565
"sinon": "^19.0.2",
6666
"ts-node": "^10.9.2"
6767
}

nodejs/packages/layer/src/wrapper.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,4 +238,5 @@ async function initializeProvider() {
238238
loggerProvider,
239239
});
240240
}
241+
// eslint-disable-next-line @typescript-eslint/no-floating-promises
241242
initializeProvider();

nodejs/sample-apps/aws-sdk/package-lock.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nodejs/sample-apps/aws-sdk/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636
],
3737
"devDependencies": {
3838
"@types/aws-lambda": "8.10.145",
39-
"@types/node": "22.6.1",
39+
"@types/node": "22.8.6",
4040
"bestzip": "2.2.1",
4141
"copyfiles": "2.4.1",
4242
"rimraf": "6.0.1",
4343
"ts-node": "10.9.2",
44-
"typescript": "5.6.2"
44+
"typescript": "5.6.3"
4545
},
4646
"dependencies": {
4747
"aws-sdk": "2.1691.0"

0 commit comments

Comments
 (0)