Skip to content

Commit bd72fe0

Browse files
rapphilrapphil
authored
Merge branch 'main' into dependabot/go_modules/collector/lambdacomponents/go_modules-49c4f29de4
2 parents c79da80 + df408bd commit bd72fe0

File tree

12 files changed

+1544
-827
lines changed

12 files changed

+1544
-827
lines changed

‎java/dependencyManagement/build.gradle.kts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ plugins {
99
data class DependencySet(val group: String, val version: String, val modules: List<String>)
1010

1111
val DEPENDENCY_BOMS = listOf(
12-
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha",
13-
"org.apache.logging.log4j:log4j-bom:2.24.1",
14-
"software.amazon.awssdk:bom:2.29.10"
12+
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.10.0-alpha",
13+
"org.apache.logging.log4j:log4j-bom:2.24.3",
14+
"software.amazon.awssdk:bom:2.29.39"
1515
)
1616

1717
val DEPENDENCIES = listOf(
1818
"com.amazonaws:aws-lambda-java-core:1.2.3",
1919
"com.amazonaws:aws-lambda-java-events:3.14.0",
2020
"com.squareup.okhttp3:okhttp:4.12.0",
21-
"io.opentelemetry.javaagent:opentelemetry-javaagent:2.9.0",
21+
"io.opentelemetry.javaagent:opentelemetry-javaagent:2.10.0",
2222
"io.opentelemetry:opentelemetry-sdk-extension-aws:1.19.0",
23-
"io.opentelemetry.contrib:opentelemetry-aws-resources:1.40.0-alpha",
23+
"io.opentelemetry.contrib:opentelemetry-aws-resources:1.42.0-alpha",
2424
)
2525

2626
javaPlatform {

‎nodejs/package-lock.json‎

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

‎nodejs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"lerna": "^8.1.8",
4343
"lerna-changelog": "2.2.0",
4444
"rimraf": "6.0.1",
45-
"typescript": "5.6.3"
45+
"typescript": "5.7.2"
4646
},
4747
"changelog": {
4848
"labels": {

‎nodejs/packages/layer/package-lock.json‎

Lines changed: 1184 additions & 294 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: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,40 +32,40 @@
3232
},
3333
"dependencies": {
3434
"@opentelemetry/api": "^1.9.0",
35-
"@opentelemetry/api-logs": "^0.54.2",
35+
"@opentelemetry/api-logs": "^0.57.0",
3636
"@opentelemetry/exporter-logs-otlp-proto": "^0.54.2",
3737
"@opentelemetry/auto-configuration-propagators": "^0.3.1",
38-
"@opentelemetry/core": "^1.27.0",
38+
"@opentelemetry/core": "^1.30.0",
3939
"@opentelemetry/exporter-metrics-otlp-proto": "^0.54.2",
4040
"@opentelemetry/exporter-trace-otlp-proto": "^0.54.2",
4141
"@opentelemetry/instrumentation": "^0.54.2",
42-
"@opentelemetry/instrumentation-aws-lambda": "^0.47.0",
43-
"@opentelemetry/instrumentation-aws-sdk": "^0.46.0",
44-
"@opentelemetry/instrumentation-dns": "^0.40.0",
45-
"@opentelemetry/instrumentation-express": "^0.44.0",
46-
"@opentelemetry/instrumentation-graphql": "^0.44.0",
42+
"@opentelemetry/instrumentation-aws-lambda": "^0.50.0",
43+
"@opentelemetry/instrumentation-aws-sdk": "^0.49.0",
44+
"@opentelemetry/instrumentation-dns": "^0.43.0",
45+
"@opentelemetry/instrumentation-express": "^0.47.0",
46+
"@opentelemetry/instrumentation-graphql": "^0.47.0",
4747
"@opentelemetry/instrumentation-grpc": "^0.54.2",
48-
"@opentelemetry/instrumentation-hapi": "^0.42.0",
48+
"@opentelemetry/instrumentation-hapi": "^0.45.0",
4949
"@opentelemetry/instrumentation-http": "^0.54.2",
50-
"@opentelemetry/instrumentation-ioredis": "^0.44.0",
51-
"@opentelemetry/instrumentation-koa": "^0.44.0",
52-
"@opentelemetry/instrumentation-mongodb": "^0.48.0",
53-
"@opentelemetry/instrumentation-mysql": "^0.42.0",
54-
"@opentelemetry/instrumentation-net": "^0.40.0",
55-
"@opentelemetry/instrumentation-pg": "^0.47.0",
56-
"@opentelemetry/instrumentation-redis": "^0.43.0",
50+
"@opentelemetry/instrumentation-ioredis": "^0.47.0",
51+
"@opentelemetry/instrumentation-koa": "^0.47.0",
52+
"@opentelemetry/instrumentation-mongodb": "^0.51.0",
53+
"@opentelemetry/instrumentation-mysql": "^0.45.0",
54+
"@opentelemetry/instrumentation-net": "^0.43.0",
55+
"@opentelemetry/instrumentation-pg": "^0.50.0",
56+
"@opentelemetry/instrumentation-redis": "^0.46.0",
5757
"@opentelemetry/propagator-aws-xray": "^1.26.0",
58-
"@opentelemetry/resource-detector-aws": "^1.7.0",
59-
"@opentelemetry/resources": "^1.27.0",
58+
"@opentelemetry/resource-detector-aws": "^1.10.0",
59+
"@opentelemetry/resources": "^1.30.0",
6060
"@opentelemetry/sdk-logs": "^0.54.2",
61-
"@opentelemetry/sdk-metrics": "^1.27.0",
62-
"@opentelemetry/sdk-trace-base": "^1.27.0",
63-
"@opentelemetry/sdk-trace-node": "^1.27.0"
61+
"@opentelemetry/sdk-metrics": "^1.30.0",
62+
"@opentelemetry/sdk-trace-base": "^1.30.0",
63+
"@opentelemetry/sdk-trace-node": "^1.30.0"
6464
},
6565
"devDependencies": {
6666
"@types/mocha": "^10.0.9",
6767
"@types/sinon": "^17.0.3",
68-
"mocha": "^10.8.2",
68+
"mocha": "^11.0.1",
6969
"sinon": "^19.0.2",
7070
"ts-node": "^10.9.2"
7171
}

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

Lines changed: 16 additions & 16 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
"README.md"
3636
],
3737
"devDependencies": {
38-
"@types/aws-lambda": "8.10.145",
39-
"@types/node": "22.9.0",
38+
"@types/aws-lambda": "8.10.146",
39+
"@types/node": "22.10.2",
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.3"
44+
"typescript": "5.7.2"
4545
},
4646
"dependencies": {
4747
"aws-sdk": "2.1692.0"

‎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.49b1
4-
opentelemetry-instrumentation-botocore==0.49b1
3+
opentelemetry-instrumentation-aws-lambda==0.50b0
4+
opentelemetry-instrumentation-botocore==0.50b0

‎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.28.1
2-
opentelemetry-exporter-otlp-proto-http==1.28.1
3-
opentelemetry-distro==0.49b1
4-
opentelemetry-instrumentation==0.49b1
5-
opentelemetry-semantic-conventions==0.49b1
1+
opentelemetry-sdk==1.29.0
2+
opentelemetry-exporter-otlp-proto-http==1.29.0
3+
opentelemetry-distro==0.50b0
4+
opentelemetry-instrumentation==0.50b0
5+
opentelemetry-semantic-conventions==0.50b0
66
opentelemetry-propagator-aws-xray==1.0.2
77

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

‎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.49b1
1+
opentelemetry-instrumentation-aws-lambda==0.50b0

0 commit comments

Comments
 (0)