Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/gradle/java/java-other-e756f21ee9
Browse files Browse the repository at this point in the history
  • Loading branch information
rapphil authored Dec 23, 2024
2 parents 87511d5 + 8d05d4b commit 5c0fc68
Show file tree
Hide file tree
Showing 15 changed files with 2,279 additions and 1,542 deletions.
246 changes: 124 additions & 122 deletions collector/go.mod

Large diffs are not rendered by default.

512 changes: 260 additions & 252 deletions collector/go.sum

Large diffs are not rendered by default.

222 changes: 112 additions & 110 deletions collector/lambdacomponents/go.mod

Large diffs are not rendered by default.

480 changes: 244 additions & 236 deletions collector/lambdacomponents/go.sum

Large diffs are not rendered by default.

721 changes: 274 additions & 447 deletions nodejs/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion nodejs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"lerna": "^8.1.8",
"lerna-changelog": "2.2.0",
"rimraf": "6.0.1",
"typescript": "5.6.3"
"typescript": "5.7.2"
},
"changelog": {
"labels": {
Expand Down
1,478 changes: 1,184 additions & 294 deletions nodejs/packages/layer/package-lock.json

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions nodejs/packages/layer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,40 +32,40 @@
},
"dependencies": {
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/api-logs": "^0.54.2",
"@opentelemetry/api-logs": "^0.57.0",
"@opentelemetry/exporter-logs-otlp-proto": "^0.54.2",
"@opentelemetry/auto-configuration-propagators": "^0.3.1",
"@opentelemetry/core": "^1.27.0",
"@opentelemetry/core": "^1.30.0",
"@opentelemetry/exporter-metrics-otlp-proto": "^0.54.2",
"@opentelemetry/exporter-trace-otlp-proto": "^0.54.2",
"@opentelemetry/instrumentation": "^0.54.2",
"@opentelemetry/instrumentation-aws-lambda": "^0.47.0",
"@opentelemetry/instrumentation-aws-sdk": "^0.46.0",
"@opentelemetry/instrumentation-dns": "^0.40.0",
"@opentelemetry/instrumentation-express": "^0.44.0",
"@opentelemetry/instrumentation-graphql": "^0.44.0",
"@opentelemetry/instrumentation-aws-lambda": "^0.50.0",
"@opentelemetry/instrumentation-aws-sdk": "^0.49.0",
"@opentelemetry/instrumentation-dns": "^0.43.0",
"@opentelemetry/instrumentation-express": "^0.47.0",
"@opentelemetry/instrumentation-graphql": "^0.47.0",
"@opentelemetry/instrumentation-grpc": "^0.54.2",
"@opentelemetry/instrumentation-hapi": "^0.42.0",
"@opentelemetry/instrumentation-hapi": "^0.45.0",
"@opentelemetry/instrumentation-http": "^0.54.2",
"@opentelemetry/instrumentation-ioredis": "^0.44.0",
"@opentelemetry/instrumentation-koa": "^0.44.0",
"@opentelemetry/instrumentation-mongodb": "^0.48.0",
"@opentelemetry/instrumentation-mysql": "^0.42.0",
"@opentelemetry/instrumentation-net": "^0.40.0",
"@opentelemetry/instrumentation-pg": "^0.47.0",
"@opentelemetry/instrumentation-redis": "^0.43.0",
"@opentelemetry/instrumentation-ioredis": "^0.47.0",
"@opentelemetry/instrumentation-koa": "^0.47.0",
"@opentelemetry/instrumentation-mongodb": "^0.51.0",
"@opentelemetry/instrumentation-mysql": "^0.45.0",
"@opentelemetry/instrumentation-net": "^0.43.0",
"@opentelemetry/instrumentation-pg": "^0.50.0",
"@opentelemetry/instrumentation-redis": "^0.46.0",
"@opentelemetry/propagator-aws-xray": "^1.26.0",
"@opentelemetry/resource-detector-aws": "^1.7.0",
"@opentelemetry/resources": "^1.27.0",
"@opentelemetry/resource-detector-aws": "^1.10.0",
"@opentelemetry/resources": "^1.30.0",
"@opentelemetry/sdk-logs": "^0.54.2",
"@opentelemetry/sdk-metrics": "^1.27.0",
"@opentelemetry/sdk-trace-base": "^1.27.0",
"@opentelemetry/sdk-trace-node": "^1.27.0"
"@opentelemetry/sdk-metrics": "^1.30.0",
"@opentelemetry/sdk-trace-base": "^1.30.0",
"@opentelemetry/sdk-trace-node": "^1.30.0"
},
"devDependencies": {
"@types/mocha": "^10.0.9",
"@types/sinon": "^17.0.3",
"mocha": "^10.8.2",
"mocha": "^11.0.1",
"sinon": "^19.0.2",
"ts-node": "^10.9.2"
}
Expand Down
32 changes: 16 additions & 16 deletions nodejs/sample-apps/aws-sdk/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions nodejs/sample-apps/aws-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
"README.md"
],
"devDependencies": {
"@types/aws-lambda": "8.10.145",
"@types/node": "22.9.0",
"@types/aws-lambda": "8.10.146",
"@types/node": "22.10.2",
"bestzip": "2.2.1",
"copyfiles": "2.4.1",
"rimraf": "6.0.1",
"ts-node": "10.9.2",
"typescript": "5.6.3"
"typescript": "5.7.2"
},
"dependencies": {
"aws-sdk": "2.1692.0"
Expand Down
4 changes: 2 additions & 2 deletions python/src/otel/otel_sdk/nodeps-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# TODO: move these dependencies to requirements.txt when they stopped relying on a pinned version of
# opentelemetry-propagator-aws-xray
opentelemetry-instrumentation-aws-lambda==0.49b1
opentelemetry-instrumentation-botocore==0.49b1
opentelemetry-instrumentation-aws-lambda==0.50b0
opentelemetry-instrumentation-botocore==0.50b0
66 changes: 33 additions & 33 deletions python/src/otel/otel_sdk/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
opentelemetry-sdk==1.28.1
opentelemetry-exporter-otlp-proto-http==1.28.1
opentelemetry-distro==0.49b1
opentelemetry-instrumentation==0.49b1
opentelemetry-semantic-conventions==0.49b1
opentelemetry-sdk==1.29.0
opentelemetry-exporter-otlp-proto-http==1.29.0
opentelemetry-distro==0.50b0
opentelemetry-instrumentation==0.50b0
opentelemetry-semantic-conventions==0.50b0
opentelemetry-propagator-aws-xray==1.0.2

# Instrumentation dependencies
opentelemetry-instrumentation-aiohttp-client==0.49b1
opentelemetry-util-http==0.49b1
opentelemetry-instrumentation-asgi==0.49b1
opentelemetry-instrumentation-asyncpg==0.49b1
opentelemetry-instrumentation-boto==0.49b1
opentelemetry-instrumentation-boto3sqs==0.49b1
opentelemetry-instrumentation-celery==0.49b1
opentelemetry-instrumentation-dbapi==0.49b1
opentelemetry-instrumentation-django==0.49b1
opentelemetry-instrumentation-elasticsearch==0.49b1
opentelemetry-instrumentation-fastapi==0.49b1
opentelemetry-instrumentation-falcon==0.49b1
opentelemetry-instrumentation-flask==0.49b1
opentelemetry-instrumentation-grpc==0.49b1
opentelemetry-instrumentation-jinja2==0.49b1
opentelemetry-instrumentation-mysql==0.49b1
opentelemetry-instrumentation-psycopg2==0.49b1
opentelemetry-instrumentation-pymemcache==0.49b1
opentelemetry-instrumentation-pymongo==0.49b1
opentelemetry-instrumentation-pymysql==0.49b1
opentelemetry-instrumentation-pyramid==0.49b1
opentelemetry-instrumentation-redis==0.49b1
opentelemetry-instrumentation-requests==0.49b1
opentelemetry-instrumentation-sqlalchemy==0.49b1
opentelemetry-instrumentation-sqlite3==0.49b1
opentelemetry-instrumentation-starlette==0.49b1
opentelemetry-instrumentation-tornado==0.49b1
opentelemetry-instrumentation-wsgi==0.49b1
opentelemetry-instrumentation-aiohttp-client==0.50b0
opentelemetry-util-http==0.50b0
opentelemetry-instrumentation-asgi==0.50b0
opentelemetry-instrumentation-asyncpg==0.50b0
opentelemetry-instrumentation-boto==0.50b0
opentelemetry-instrumentation-boto3sqs==0.50b0
opentelemetry-instrumentation-celery==0.50b0
opentelemetry-instrumentation-dbapi==0.50b0
opentelemetry-instrumentation-django==0.50b0
opentelemetry-instrumentation-elasticsearch==0.50b0
opentelemetry-instrumentation-fastapi==0.50b0
opentelemetry-instrumentation-falcon==0.50b0
opentelemetry-instrumentation-flask==0.50b0
opentelemetry-instrumentation-grpc==0.50b0
opentelemetry-instrumentation-jinja2==0.50b0
opentelemetry-instrumentation-mysql==0.50b0
opentelemetry-instrumentation-psycopg2==0.50b0
opentelemetry-instrumentation-pymemcache==0.50b0
opentelemetry-instrumentation-pymongo==0.50b0
opentelemetry-instrumentation-pymysql==0.50b0
opentelemetry-instrumentation-pyramid==0.50b0
opentelemetry-instrumentation-redis==0.50b0
opentelemetry-instrumentation-requests==0.50b0
opentelemetry-instrumentation-sqlalchemy==0.50b0
opentelemetry-instrumentation-sqlite3==0.50b0
opentelemetry-instrumentation-starlette==0.50b0
opentelemetry-instrumentation-tornado==0.50b0
opentelemetry-instrumentation-wsgi==0.50b0
2 changes: 1 addition & 1 deletion python/src/otel/tests/nodeps-requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
opentelemetry-instrumentation-aws-lambda==0.49b1
opentelemetry-instrumentation-aws-lambda==0.50b0
6 changes: 3 additions & 3 deletions python/src/otel/tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Dependencies used in tests only
opentelemetry-test-utils==0.49b1
opentelemetry-instrumentation == 0.49b1
opentelemetry-semantic-conventions == 0.49b1
opentelemetry-test-utils==0.50b0
opentelemetry-instrumentation == 0.50b0
opentelemetry-semantic-conventions == 0.50b0
opentelemetry-propagator-aws-xray == 1.0.2
2 changes: 1 addition & 1 deletion python/src/tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tox]
envlist =
; opentelemetry-instrumentation-aws-lambda
py3{8,9,10}-test-instrumentation-aws-lambda
py3{8,9,10,11,12}-test-instrumentation-aws-lambda

minversion = 3.8

Expand Down

0 comments on commit 5c0fc68

Please sign in to comment.