Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use Otel SDK 1.2/0.28 #984

Merged
merged 6 commits into from
May 2, 2022
Merged

feat: use Otel SDK 1.2/0.28 #984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1b9b60d
feat: use Otel SDK 1.2/0.28
Flarna Apr 27, 2022
8773294
fixup! chore(deps): update dependency @types/react-dom to v18 (#974)
Flarna Apr 27, 2022
d564db0
host-metrics back to 0.27
Flarna Apr 27, 2022
49e3465
fix: correctly depen on contrib-test-utils
Flarna Apr 27, 2022
e0b2931
fixup! fix: correctly depen on contrib-test-utils
Flarna Apr 27, 2022
49d9ca7
fixup! feat: use Otel SDK 1.2/0.28
Flarna Apr 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"devDependencies": {
"@opentelemetry/api": "1.0.2",
"@opentelemetry/contrib-test-utils": "^0.29.0",
"@opentelemetry/contrib-test-utils": "0.29.0",
"@types/mocha": "8.2.3",
"@types/node": "16.11.21",
"@types/sinon": "10.0.2",
Expand All @@ -57,7 +57,7 @@
"typescript": "4.3.5"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
"@opentelemetry/api": "^1.0.0"
},
"dependencies": {
"@opentelemetry/resources": "^1.0.0",
Expand Down
4 changes: 2 additions & 2 deletions detectors/node/opentelemetry-resource-detector-aws/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
},
"devDependencies": {
"@opentelemetry/api": "1.0.2",
blumamir marked this conversation as resolved.
Show resolved Hide resolved
"@opentelemetry/contrib-test-utils": "^0.29.0",
"@opentelemetry/contrib-test-utils": "0.29.0",
Flarna marked this conversation as resolved.
Show resolved Hide resolved
"@types/mocha": "8.2.3",
"@types/node": "16.11.21",
"@types/sinon": "10.0.2",
Expand All @@ -56,7 +56,7 @@
"typescript": "4.3.5"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
"@opentelemetry/api": "^1.0.0"
},
"dependencies": {
"@opentelemetry/core": "^1.0.0",
Expand Down
4 changes: 2 additions & 2 deletions detectors/node/opentelemetry-resource-detector-docker/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
},
"devDependencies": {
Flarna marked this conversation as resolved.
Show resolved Hide resolved
"@opentelemetry/api": "1.0.4",
"@opentelemetry/contrib-test-utils": "^0.29.0",
"@opentelemetry/contrib-test-utils": "0.29.0",
"@types/mocha": "8.2.3",
"@types/node": "^17.0.14",
"@types/sinon": "10.0.2",
Expand All @@ -51,7 +51,7 @@
"typescript": "^4.5.5"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.4"
"@opentelemetry/api": "^1.0.0"
},
"dependencies": {
"@opentelemetry/resources": "^1.0.1",
Expand Down
6 changes: 3 additions & 3 deletions detectors/node/opentelemetry-resource-detector-gcp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
},
"devDependencies": {
"@opentelemetry/api": "1.0.2",
"@opentelemetry/contrib-test-utils": "^0.29.0",
"@opentelemetry/core": "1.0.1",
"@opentelemetry/contrib-test-utils": "0.29.0",
"@opentelemetry/core": "1.2.0",
"@types/mocha": "8.2.3",
"@types/node": "16.11.21",
"@types/semver": "7.3.8",
Expand All @@ -56,7 +56,7 @@
"typescript": "4.3.5"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
"@opentelemetry/api": "^1.0.0"
},
"dependencies": {
"@opentelemetry/resources": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-github/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"access": "public"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
"@opentelemetry/api": "^1.0.0"
},
"devDependencies": {
"@opentelemetry/api": "1.0.2",
Expand Down
8 changes: 4 additions & 4 deletions metapackages/auto-instrumentations-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
"@opentelemetry/api": "^1.0.0"
},
"devDependencies": {
"@opentelemetry/api": "1.0.2",
Expand All @@ -46,7 +46,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/instrumentation": "^0.28.0",
"@opentelemetry/instrumentation-amqplib": "^0.28.0",
"@opentelemetry/instrumentation-aws-lambda": "^0.30.0",
"@opentelemetry/instrumentation-aws-sdk": "^0.6.0",
Expand All @@ -58,9 +58,9 @@
"@opentelemetry/instrumentation-fastify": "^0.26.0",
"@opentelemetry/instrumentation-generic-pool": "^0.27.2",
"@opentelemetry/instrumentation-graphql": "^0.27.4",
"@opentelemetry/instrumentation-grpc": "^0.27.0",
"@opentelemetry/instrumentation-grpc": "^0.28.0",
"@opentelemetry/instrumentation-hapi": "^0.27.0",
"@opentelemetry/instrumentation-http": "^0.27.0",
"@opentelemetry/instrumentation-http": "^0.28.0",
"@opentelemetry/instrumentation-ioredis": "^0.28.0",
"@opentelemetry/instrumentation-knex": "^0.27.0",
"@opentelemetry/instrumentation-koa": "^0.28.1",
Expand Down
8 changes: 4 additions & 4 deletions metapackages/auto-instrumentations-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
"@opentelemetry/api": "^1.0.0"
},
"devDependencies": {
"@babel/core": "7.15.0",
Expand Down Expand Up @@ -63,10 +63,10 @@
"webpack-merge": "5.8.0"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/instrumentation": "^0.28.0",
"@opentelemetry/instrumentation-document-load": "^0.27.1",
"@opentelemetry/instrumentation-fetch": "^0.27.0",
"@opentelemetry/instrumentation-fetch": "^0.28.0",
"@opentelemetry/instrumentation-user-interaction": "^0.28.1",
"@opentelemetry/instrumentation-xml-http-request": "^0.27.0"
"@opentelemetry/instrumentation-xml-http-request": "^0.28.0"
}
}
24 changes: 12 additions & 12 deletions packages/opentelemetry-browser-extension-autoinjection/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"node": ">=8.12.0"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
"@opentelemetry/api": "^1.0.0"
},
"devDependencies": {
"@opentelemetry/api": "1.0.2",
Expand Down Expand Up @@ -66,18 +66,18 @@
"@material-ui/core": "4.12.3",
"@material-ui/icons": "4.11.2",
"@material-ui/lab": "4.0.0-alpha.60",
"@opentelemetry/context-zone": "1.0.1",
"@opentelemetry/core": "1.0.1",
"@opentelemetry/exporter-trace-otlp-http": "0.27.0",
"@opentelemetry/exporter-zipkin": "1.0.1",
"@opentelemetry/instrumentation": "0.27.0",
"@opentelemetry/context-zone": "1.2.0",
"@opentelemetry/core": "1.2.0",
"@opentelemetry/exporter-trace-otlp-http": "0.28.0",
"@opentelemetry/exporter-zipkin": "1.2.0",
"@opentelemetry/instrumentation": "0.28.0",
"@opentelemetry/instrumentation-document-load": "^0.27.1",
"@opentelemetry/instrumentation-fetch": "0.27.0",
"@opentelemetry/instrumentation-xml-http-request": "0.27.0",
"@opentelemetry/resources": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-web": "1.0.1",
"@opentelemetry/semantic-conventions": "1.0.1",
"@opentelemetry/instrumentation-fetch": "0.28.0",
"@opentelemetry/instrumentation-xml-http-request": "0.28.0",
"@opentelemetry/resources": "1.2.0",
"@opentelemetry/sdk-trace-base": "1.2.0",
"@opentelemetry/sdk-trace-web": "1.2.0",
"@opentelemetry/semantic-conventions": "1.2.0",
"change-case": "4.1.2",
"json5": "2.2.0",
"react": "17.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-host-metrics/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"access": "public"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
"@opentelemetry/api": "^1.0.0"
},
"devDependencies": {
"@opentelemetry/api": "1.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-id-generator-aws-xray/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"README.md"
],
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
"@opentelemetry/api": "^1.0.0"
},
"devDependencies": {
"@jsdevtools/coverage-istanbul-loader": "3.0.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-propagation-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
"peerDependencies": {
"@opentelemetry/api": "^1.0.1"
"@opentelemetry/api": "^1.0.0"
},
"devDependencies": {
"@opentelemetry/api": "1.0.1",
Expand Down
16 changes: 8 additions & 8 deletions packages/opentelemetry-test-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
"@opentelemetry/api": "^1.0.0"
},
"devDependencies": {
"@opentelemetry/api": "1.0.2",
Expand All @@ -47,12 +47,12 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/core": "1.0.1",
"@opentelemetry/exporter-jaeger": "1.0.1",
"@opentelemetry/instrumentation": "0.27.0",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@opentelemetry/resources": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/semantic-conventions": "1.0.1"
"@opentelemetry/core": "1.2.0",
"@opentelemetry/exporter-jaeger": "1.2.0",
"@opentelemetry/instrumentation": "0.28.0",
"@opentelemetry/sdk-trace-node": "1.2.0",
"@opentelemetry/resources": "1.2.0",
"@opentelemetry/sdk-trace-base": "1.2.0",
"@opentelemetry/semantic-conventions": "1.2.0"
}
}
6 changes: 3 additions & 3 deletions plugins/node/instrumentation-amqplib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
"test:docker:run": "docker run -d --hostname demo-amqplib-rabbit --name amqplib-unittests -p 22221:5672 --env RABBITMQ_DEFAULT_USER=username --env RABBITMQ_DEFAULT_PASS=password rabbitmq:3"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.1"
"@opentelemetry/api": "^1.0.0"
},
"dependencies": {
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/instrumentation": "^0.28.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/amqplib": "^0.5.17"
},
Expand All @@ -64,7 +64,7 @@
"ts-mocha": "8.0.0",
"nyc": "15.1.0",
"gts": "3.1.0",
"@opentelemetry/contrib-test-utils": "^0.28.0",
"@opentelemetry/contrib-test-utils": "0.29.0",
"sinon": "13.0.1",
"test-all-versions": "5.0.1",
"typescript": "4.3.5"
Expand Down
12 changes: 6 additions & 6 deletions plugins/node/instrumentation-fs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@
"access": "public"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.4"
"@opentelemetry/api": "^1.0.0"
},
"devDependencies": {
"@opentelemetry/api": "1.0.4",
"@opentelemetry/context-async-hooks": "1.0.1",
"@opentelemetry/resources": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@opentelemetry/context-async-hooks": "1.2.0",
"@opentelemetry/resources": "1.2.0",
"@opentelemetry/sdk-trace-base": "1.2.0",
"@opentelemetry/sdk-trace-node": "1.2.0",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/shimmer": "1.0.2",
Expand All @@ -61,7 +61,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.0.1",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/instrumentation": "^0.28.0",
"@opentelemetry/semantic-conventions": "^1.0.1"
}
}
10 changes: 5 additions & 5 deletions plugins/node/instrumentation-tedious/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
"access": "public"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
"@opentelemetry/api": "^1.0.0"
},
"devDependencies": {
"@opentelemetry/api": "1.0.2",
"@opentelemetry/context-async-hooks": "1.0.1",
"@opentelemetry/contrib-test-utils": "^0.29.0",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/context-async-hooks": "1.2.0",
"@opentelemetry/contrib-test-utils": "0.29.0",
"@opentelemetry/sdk-trace-base": "1.2.0",
"@types/mocha": "7.0.2",
"@types/node": "16.11.21",
"gts": "3.1.0",
Expand All @@ -63,7 +63,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/instrumentation": "^0.28.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/tedious": "^4.0.6"
}
Expand Down
10 changes: 5 additions & 5 deletions plugins/node/opentelemetry-instrumentation-aws-lambda/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@
"access": "public"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
"@opentelemetry/api": "^1.0.0"
},
"devDependencies": {
"@opentelemetry/api": "1.0.2",
"@opentelemetry/core": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@opentelemetry/core": "1.2.0",
"@opentelemetry/sdk-trace-base": "1.2.0",
"@opentelemetry/sdk-trace-node": "1.2.0",
"@types/mocha": "7.0.2",
"@types/node": "16.11.21",
"gts": "3.1.0",
Expand All @@ -59,7 +59,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/instrumentation": "^0.28.0",
"@opentelemetry/propagator-aws-xray": "^1.0.1",
"@opentelemetry/resources": "^1.0.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
Expand Down
8 changes: 4 additions & 4 deletions plugins/node/opentelemetry-instrumentation-aws-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
"watch": "tsc -w"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.1"
"@opentelemetry/api": "^1.0.0"
},
"dependencies": {
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/instrumentation": "^0.28.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@opentelemetry/propagation-utils": "^0.27.0"
},
Expand All @@ -58,8 +58,8 @@
"@aws-sdk/client-sqs": "3.37.0",
"@aws-sdk/types": "3.37.0",
"@opentelemetry/api": "1.0.1",
"@opentelemetry/contrib-test-utils": "^0.29.0",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/contrib-test-utils": "0.29.0",
"@opentelemetry/sdk-trace-base": "1.2.0",
"@types/mocha": "8.2.3",
"@types/node": "16.11.21",
"@types/sinon": "10.0.6",
Expand Down
10 changes: 5 additions & 5 deletions plugins/node/opentelemetry-instrumentation-bunyan/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
"access": "public"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
"@opentelemetry/api": "^1.0.0"
},
"devDependencies": {
"@opentelemetry/api": "1.0.2",
"@opentelemetry/context-async-hooks": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@opentelemetry/context-async-hooks": "1.2.0",
"@opentelemetry/sdk-trace-base": "1.2.0",
"@opentelemetry/sdk-trace-node": "1.2.0",
"@types/mocha": "7.0.2",
"@types/node": "16.11.21",
"@types/sinon": "10.0.2",
Expand All @@ -65,7 +65,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/instrumentation": "^0.28.0",
"@types/bunyan": "1.8.7"
}
}
Loading