Skip to content

Commit a2f5af7

Browse files
pragmaticivanpragmaticivan
authored
Merge branch 'main' into dependabot/github_actions/actions-64c4464e6c
2 parents 34b7376 + 14bd5bf commit a2f5af7

File tree

8 files changed

+1074
-986
lines changed

8 files changed

+1074
-986
lines changed

‎nodejs/package-lock.json‎

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

‎nodejs/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
"author": "OpenTelemetry Authors",
3131
"license": "Apache-2.0",
3232
"devDependencies": {
33-
"@typescript-eslint/eslint-plugin": "^8.29.0",
34-
"@typescript-eslint/parser": "^8.29.0",
33+
"@typescript-eslint/eslint-plugin": "^8.44.0",
34+
"@typescript-eslint/parser": "^8.44.0",
3535
"aws-sdk": "2.1692.0",
3636
"bestzip": "2.2.1",
3737
"copyfiles": "2.4.1",
@@ -42,7 +42,7 @@
4242
"lerna": "^8.1.8",
4343
"lerna-changelog": "2.2.0",
4444
"rimraf": "6.0.1",
45-
"typescript": "5.8.3"
45+
"typescript": "5.9.2"
4646
},
4747
"changelog": {
4848
"labels": {

‎nodejs/packages/layer/package.json‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -37,49 +37,49 @@
3737
},
3838
"dependencies": {
3939
"@opentelemetry/api": "^1.9.0",
40-
"@opentelemetry/api-logs": "^0.203.0",
40+
"@opentelemetry/api-logs": "^0.205.0",
4141
"@opentelemetry/core": "^2.0.0",
42-
"@opentelemetry/exporter-logs-otlp-http": "^0.203.0",
43-
"@opentelemetry/exporter-metrics-otlp-http": "^0.203.0",
44-
"@opentelemetry/exporter-trace-otlp-http": "^0.203.0",
45-
"@opentelemetry/instrumentation": "^0.203.0",
46-
"@opentelemetry/instrumentation-amqplib": "^0.50.0",
47-
"@opentelemetry/instrumentation-aws-lambda": "^0.54.0",
48-
"@opentelemetry/instrumentation-aws-sdk": "^0.57.0",
49-
"@opentelemetry/instrumentation-bunyan": "^0.49.0",
50-
"@opentelemetry/instrumentation-cassandra-driver": "^0.49.0",
51-
"@opentelemetry/instrumentation-connect": "^0.47.0",
52-
"@opentelemetry/instrumentation-dataloader": "^0.21.0",
53-
"@opentelemetry/instrumentation-dns": "^0.47.0",
54-
"@opentelemetry/instrumentation-express": "^0.52.0",
55-
"@opentelemetry/instrumentation-fs": "^0.23.0",
56-
"@opentelemetry/instrumentation-graphql": "^0.51.0",
57-
"@opentelemetry/instrumentation-grpc": "^0.203.0",
58-
"@opentelemetry/instrumentation-hapi": "^0.50.0",
59-
"@opentelemetry/instrumentation-http": "^0.203.0",
60-
"@opentelemetry/instrumentation-ioredis": "^0.51.0",
61-
"@opentelemetry/instrumentation-kafkajs": "^0.13.0",
62-
"@opentelemetry/instrumentation-knex": "^0.48.0",
63-
"@opentelemetry/instrumentation-koa": "^0.51.0",
64-
"@opentelemetry/instrumentation-memcached": "^0.47.0",
65-
"@opentelemetry/instrumentation-mongodb": "^0.56.0",
66-
"@opentelemetry/instrumentation-mongoose": "^0.50.0",
67-
"@opentelemetry/instrumentation-mysql": "^0.49.0",
68-
"@opentelemetry/instrumentation-mysql2": "^0.50.0",
69-
"@opentelemetry/instrumentation-nestjs-core": "^0.49.0",
70-
"@opentelemetry/instrumentation-net": "^0.47.0",
71-
"@opentelemetry/instrumentation-pg": "^0.56.0",
72-
"@opentelemetry/instrumentation-pino": "^0.50.0",
73-
"@opentelemetry/instrumentation-redis": "^0.51.0",
74-
"@opentelemetry/instrumentation-restify": "^0.49.0",
75-
"@opentelemetry/instrumentation-socket.io": "^0.50.0",
76-
"@opentelemetry/instrumentation-undici": "^0.14.0",
77-
"@opentelemetry/instrumentation-winston": "^0.48.0",
42+
"@opentelemetry/exporter-logs-otlp-http": "^0.205.0",
43+
"@opentelemetry/exporter-metrics-otlp-http": "^0.205.0",
44+
"@opentelemetry/exporter-trace-otlp-http": "^0.205.0",
45+
"@opentelemetry/instrumentation": "^0.205.0",
46+
"@opentelemetry/instrumentation-amqplib": "^0.52.0",
47+
"@opentelemetry/instrumentation-aws-lambda": "^0.56.0",
48+
"@opentelemetry/instrumentation-aws-sdk": "^0.60.0",
49+
"@opentelemetry/instrumentation-bunyan": "^0.51.0",
50+
"@opentelemetry/instrumentation-cassandra-driver": "^0.51.0",
51+
"@opentelemetry/instrumentation-connect": "^0.49.0",
52+
"@opentelemetry/instrumentation-dataloader": "^0.23.0",
53+
"@opentelemetry/instrumentation-dns": "^0.49.0",
54+
"@opentelemetry/instrumentation-express": "^0.54.0",
55+
"@opentelemetry/instrumentation-fs": "^0.25.0",
56+
"@opentelemetry/instrumentation-graphql": "^0.53.0",
57+
"@opentelemetry/instrumentation-grpc": "^0.205.0",
58+
"@opentelemetry/instrumentation-hapi": "^0.52.0",
59+
"@opentelemetry/instrumentation-http": "^0.205.0",
60+
"@opentelemetry/instrumentation-ioredis": "^0.53.0",
61+
"@opentelemetry/instrumentation-kafkajs": "^0.15.0",
62+
"@opentelemetry/instrumentation-knex": "^0.50.0",
63+
"@opentelemetry/instrumentation-koa": "^0.53.0",
64+
"@opentelemetry/instrumentation-memcached": "^0.49.0",
65+
"@opentelemetry/instrumentation-mongodb": "^0.58.0",
66+
"@opentelemetry/instrumentation-mongoose": "^0.52.0",
67+
"@opentelemetry/instrumentation-mysql": "^0.51.0",
68+
"@opentelemetry/instrumentation-mysql2": "^0.52.0",
69+
"@opentelemetry/instrumentation-nestjs-core": "^0.51.0",
70+
"@opentelemetry/instrumentation-net": "^0.49.0",
71+
"@opentelemetry/instrumentation-pg": "^0.58.0",
72+
"@opentelemetry/instrumentation-pino": "^0.52.0",
73+
"@opentelemetry/instrumentation-redis": "^0.54.1",
74+
"@opentelemetry/instrumentation-restify": "^0.51.0",
75+
"@opentelemetry/instrumentation-socket.io": "^0.52.0",
76+
"@opentelemetry/instrumentation-undici": "^0.16.0",
77+
"@opentelemetry/instrumentation-winston": "^0.50.0",
7878
"@opentelemetry/propagator-aws-xray": "^2.0.0",
7979
"@opentelemetry/propagator-aws-xray-lambda": "^0.55.0",
8080
"@opentelemetry/resource-detector-aws": "^2.0.0",
8181
"@opentelemetry/resources": "^2.0.0",
82-
"@opentelemetry/sdk-logs": "^0.203.0",
82+
"@opentelemetry/sdk-logs": "^0.205.0",
8383
"@opentelemetry/sdk-metrics": "^2.0.0",
8484
"@opentelemetry/sdk-trace-node": "^2.0.0"
8585
},

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
],
3737
"devDependencies": {
3838
"@aws-sdk/client-sts": "^3.826.0",
39-
"@types/aws-lambda": "8.10.150",
40-
"@types/node": "24.0.7",
39+
"@types/aws-lambda": "8.10.152",
40+
"@types/node": "24.4.0",
4141
"aws-cdk-lib": "^2.201.0",
4242
"bestzip": "2.2.1",
4343
"copyfiles": "2.4.1",
4444
"rimraf": "6.0.1",
4545
"ts-node": "10.9.2",
46-
"typescript": "5.8.3"
46+
"typescript": "5.9.2"
4747
}
4848
}

‎python/src/otel/otel_sdk/nodeps-requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# TODO: move these dependencies to requirements.txt when they stopped relying on a pinned version of
22
# opentelemetry-propagator-aws-xray
3-
opentelemetry-instrumentation-aws-lambda==0.57b0
4-
opentelemetry-instrumentation-botocore==0.57b0
3+
opentelemetry-instrumentation-aws-lambda==0.58b0
4+
opentelemetry-instrumentation-botocore==0.58b0

‎python/src/otel/otel_sdk/requirements.txt‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
opentelemetry-sdk==1.36.0
2-
opentelemetry-exporter-otlp-proto-http==1.36.0
3-
opentelemetry-distro==0.57b0
4-
opentelemetry-instrumentation==0.57b0
5-
opentelemetry-semantic-conventions==0.57b0
1+
opentelemetry-sdk==1.37.0
2+
opentelemetry-exporter-otlp-proto-http==1.37.0
3+
opentelemetry-distro==0.58b0
4+
opentelemetry-instrumentation==0.58b0
5+
opentelemetry-semantic-conventions==0.58b0
66
opentelemetry-propagator-aws-xray==1.0.2
77

88
# Instrumentation dependencies
9-
opentelemetry-instrumentation-aiohttp-client==0.57b0
10-
opentelemetry-util-http==0.57b0
11-
opentelemetry-instrumentation-asgi==0.57b0
12-
opentelemetry-instrumentation-asyncpg==0.57b0
13-
opentelemetry-instrumentation-boto==0.57b0
14-
opentelemetry-instrumentation-boto3sqs==0.57b0
15-
opentelemetry-instrumentation-celery==0.57b0
16-
opentelemetry-instrumentation-dbapi==0.57b0
17-
opentelemetry-instrumentation-django==0.57b0
18-
opentelemetry-instrumentation-elasticsearch==0.57b0
19-
opentelemetry-instrumentation-fastapi==0.57b0
20-
opentelemetry-instrumentation-falcon==0.57b0
21-
opentelemetry-instrumentation-flask==0.57b0
22-
opentelemetry-instrumentation-grpc==0.57b0
23-
opentelemetry-instrumentation-jinja2==0.57b0
24-
opentelemetry-instrumentation-mysql==0.57b0
25-
opentelemetry-instrumentation-psycopg2==0.57b0
26-
opentelemetry-instrumentation-pymemcache==0.57b0
27-
opentelemetry-instrumentation-pymongo==0.57b0
28-
opentelemetry-instrumentation-pymysql==0.57b0
29-
opentelemetry-instrumentation-pyramid==0.57b0
30-
opentelemetry-instrumentation-redis==0.57b0
31-
opentelemetry-instrumentation-requests==0.57b0
32-
opentelemetry-instrumentation-sqlalchemy==0.57b0
33-
opentelemetry-instrumentation-sqlite3==0.57b0
34-
opentelemetry-instrumentation-starlette==0.57b0
35-
opentelemetry-instrumentation-tornado==0.57b0
36-
opentelemetry-instrumentation-wsgi==0.57b0
9+
opentelemetry-instrumentation-aiohttp-client==0.58b0
10+
opentelemetry-util-http==0.58b0
11+
opentelemetry-instrumentation-asgi==0.58b0
12+
opentelemetry-instrumentation-asyncpg==0.58b0
13+
opentelemetry-instrumentation-boto==0.58b0
14+
opentelemetry-instrumentation-boto3sqs==0.58b0
15+
opentelemetry-instrumentation-celery==0.58b0
16+
opentelemetry-instrumentation-dbapi==0.58b0
17+
opentelemetry-instrumentation-django==0.58b0
18+
opentelemetry-instrumentation-elasticsearch==0.58b0
19+
opentelemetry-instrumentation-fastapi==0.58b0
20+
opentelemetry-instrumentation-falcon==0.58b0
21+
opentelemetry-instrumentation-flask==0.58b0
22+
opentelemetry-instrumentation-grpc==0.58b0
23+
opentelemetry-instrumentation-jinja2==0.58b0
24+
opentelemetry-instrumentation-mysql==0.58b0
25+
opentelemetry-instrumentation-psycopg2==0.58b0
26+
opentelemetry-instrumentation-pymemcache==0.58b0
27+
opentelemetry-instrumentation-pymongo==0.58b0
28+
opentelemetry-instrumentation-pymysql==0.58b0
29+
opentelemetry-instrumentation-pyramid==0.58b0
30+
opentelemetry-instrumentation-redis==0.58b0
31+
opentelemetry-instrumentation-requests==0.58b0
32+
opentelemetry-instrumentation-sqlalchemy==0.58b0
33+
opentelemetry-instrumentation-sqlite3==0.58b0
34+
opentelemetry-instrumentation-starlette==0.58b0
35+
opentelemetry-instrumentation-tornado==0.58b0
36+
opentelemetry-instrumentation-wsgi==0.58b0

‎python/src/otel/tests/nodeps-requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
opentelemetry-instrumentation-aws-lambda==0.57b0
1+
opentelemetry-instrumentation-aws-lambda==0.58b0

‎python/src/otel/tests/requirements.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Dependencies used in tests only
2-
opentelemetry-test-utils==0.57b0
3-
opentelemetry-instrumentation == 0.57b0
4-
opentelemetry-semantic-conventions == 0.57b0
2+
opentelemetry-test-utils==0.58b0
3+
opentelemetry-instrumentation == 0.58b0
4+
opentelemetry-semantic-conventions == 0.58b0
55
opentelemetry-propagator-aws-xray == 1.0.2

0 commit comments

Comments
 (0)