Skip to content

Commit

Permalink
Merge branch 'main' into python12
Browse files Browse the repository at this point in the history
  • Loading branch information
@gliptak
gliptak authored Nov 1, 2024
2 parents b2297b3 + c5a31d4 commit 21cb542
Show file tree
Hide file tree
Showing 7 changed files with 978 additions and 906 deletions.
1,147 changes: 597 additions & 550 deletions nodejs/package-lock.json
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions nodejs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^8.1.0",
"@typescript-eslint/parser": "^8.1.0",
"@typescript-eslint/eslint-plugin": "^8.11.0",
"@typescript-eslint/parser": "^8.11.0",
"aws-sdk": "2.1691.0",
"bestzip": "2.2.1",
"copyfiles": "2.4.1",
"eslint": "^8.57.0",
"eslint-plugin-header": "3.1.1",
"eslint-plugin-import": "2.30.0",
"gts": "5.3.1",
"eslint-plugin-import": "2.31.0",
"gts": "6.0.2",
"lerna": "^8.1.8",
"lerna-changelog": "2.2.0",
"rimraf": "6.0.1",
"typescript": "5.6.2"
"typescript": "5.6.3"
},
"changelog": {
"labels": {
Expand Down
644 changes: 334 additions & 310 deletions nodejs/packages/layer/package-lock.json
View file

Large diffs are not rendered by default.

60 changes: 30 additions & 30 deletions nodejs/packages/layer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,40 +28,40 @@
},
"dependencies": {
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/api-logs": "^0.53.0",
"@opentelemetry/exporter-logs-otlp-proto": "^0.53.0",
"@opentelemetry/auto-configuration-propagators": "^0.3.0",
"@opentelemetry/core": "^1.26.0",
"@opentelemetry/exporter-metrics-otlp-proto": "^0.53.0",
"@opentelemetry/exporter-trace-otlp-proto": "^0.53.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/instrumentation-aws-lambda": "^0.44.0",
"@opentelemetry/instrumentation-aws-sdk": "^0.44.0",
"@opentelemetry/instrumentation-dns": "^0.39.0",
"@opentelemetry/instrumentation-express": "^0.42.0",
"@opentelemetry/instrumentation-graphql": "^0.43.0",
"@opentelemetry/instrumentation-grpc": "^0.53.0",
"@opentelemetry/instrumentation-hapi": "^0.41.0",
"@opentelemetry/instrumentation-http": "^0.53.0",
"@opentelemetry/instrumentation-ioredis": "^0.43.0",
"@opentelemetry/instrumentation-koa": "^0.43.0",
"@opentelemetry/instrumentation-mongodb": "^0.47.0",
"@opentelemetry/instrumentation-mysql": "^0.41.0",
"@opentelemetry/instrumentation-net": "^0.39.0",
"@opentelemetry/instrumentation-pg": "^0.44.0",
"@opentelemetry/instrumentation-redis": "^0.42.0",
"@opentelemetry/api-logs": "^0.54.0",
"@opentelemetry/exporter-logs-otlp-proto": "^0.54.0",
"@opentelemetry/auto-configuration-propagators": "^0.3.1",
"@opentelemetry/core": "^1.27.0",
"@opentelemetry/exporter-metrics-otlp-proto": "^0.54.0",
"@opentelemetry/exporter-trace-otlp-proto": "^0.54.0",
"@opentelemetry/instrumentation": "^0.54.0",
"@opentelemetry/instrumentation-aws-lambda": "^0.46.0",
"@opentelemetry/instrumentation-aws-sdk": "^0.45.0",
"@opentelemetry/instrumentation-dns": "^0.40.0",
"@opentelemetry/instrumentation-express": "^0.44.0",
"@opentelemetry/instrumentation-graphql": "^0.44.0",
"@opentelemetry/instrumentation-grpc": "^0.54.0",
"@opentelemetry/instrumentation-hapi": "^0.42.0",
"@opentelemetry/instrumentation-http": "^0.54.0",
"@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/propagator-aws-xray": "^1.26.0",
"@opentelemetry/resource-detector-aws": "^1.6.2",
"@opentelemetry/resources": "^1.26.0",
"@opentelemetry/sdk-logs": "^0.53.0",
"@opentelemetry/sdk-metrics": "^1.26.0",
"@opentelemetry/sdk-trace-base": "^1.26.0",
"@opentelemetry/sdk-trace-node": "^1.26.0"
"@opentelemetry/resource-detector-aws": "^1.7.0",
"@opentelemetry/resources": "^1.27.0",
"@opentelemetry/sdk-logs": "^0.54.0",
"@opentelemetry/sdk-metrics": "^1.27.0",
"@opentelemetry/sdk-trace-base": "^1.27.0",
"@opentelemetry/sdk-trace-node": "^1.27.0"
},
"devDependencies": {
"@types/mocha": "^10.0.7",
"@types/mocha": "^10.0.9",
"@types/sinon": "^17.0.3",
"mocha": "^10.7.3",
"mocha": "^10.8.2",
"sinon": "^19.0.2",
"ts-node": "^10.9.2"
}
Expand Down
1 change: 1 addition & 0 deletions nodejs/packages/layer/src/wrapper.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,4 +238,5 @@ async function initializeProvider() {
loggerProvider,
});
}
// eslint-disable-next-line @typescript-eslint/no-floating-promises
initializeProvider();
18 changes: 9 additions & 9 deletions nodejs/sample-apps/aws-sdk/package-lock.json
View file

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

4 changes: 2 additions & 2 deletions nodejs/sample-apps/aws-sdk/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
],
"devDependencies": {
"@types/aws-lambda": "8.10.145",
"@types/node": "22.6.1",
"@types/node": "22.8.6",
"bestzip": "2.2.1",
"copyfiles": "2.4.1",
"rimraf": "6.0.1",
"ts-node": "10.9.2",
"typescript": "5.6.2"
"typescript": "5.6.3"
},
"dependencies": {
"aws-sdk": "2.1691.0"
Expand Down

0 comments on commit 21cb542

Please sign in to comment.