Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into pin-deps
  • Loading branch information
dyladan committed Apr 5, 2021
commit be91faa9286220412d8c3232934140c3ecf495bd
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"compile": "tsc --build"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/context-async-hooks": "0.18.2",
"@opentelemetry/core": "0.18.2",
"@opentelemetry/tracing": "0.18.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
},
"dependencies": {
"@grpc/proto-loader": "^0.5.4",
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/core": "0.18.2",
"@opentelemetry/exporter-collector": "0.18.2",
"@opentelemetry/metrics": "0.18.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
},
"dependencies": {
"@grpc/proto-loader": "^0.5.4",
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/core": "0.18.2",
"@opentelemetry/exporter-collector": "0.18.2",
"@opentelemetry/metrics": "0.18.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-collector/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"webpack-merge": "5.7.3"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/api-metrics": "0.18.2",
"@opentelemetry/core": "0.18.2",
"@opentelemetry/metrics": "0.18.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-jaeger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"typescript": "4.2.3"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/core": "0.18.2",
"@opentelemetry/tracing": "0.18.2",
"jaeger-client": "^3.15.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-prometheus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"typescript": "4.2.3"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/api-metrics": "0.18.2",
"@opentelemetry/core": "0.18.2",
"@opentelemetry/metrics": "0.18.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-zipkin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"webpack-merge": "5.7.3"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/core": "0.18.2",
"@opentelemetry/resources": "0.18.2",
"@opentelemetry/tracing": "0.18.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-grpc-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"typescript": "4.2.3"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/core": "0.18.2",
"@opentelemetry/semantic-conventions": "0.18.2",
"shimmer": "1.2.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"webpack-merge": "5.7.3"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/core": "0.18.2",
"@opentelemetry/instrumentation": "0.18.2",
"@opentelemetry/semantic-conventions": "0.18.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-instrumentation-grpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"typescript": "4.2.3"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/api-metrics": "0.18.2",
"@opentelemetry/instrumentation": "0.18.2",
"@opentelemetry/semantic-conventions": "0.18.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-instrumentation-http/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"typescript": "4.2.3"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/instrumentation": "0.18.2",
"@opentelemetry/semantic-conventions": "0.18.2",
"semver": "^7.1.3"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"webpack-merge": "5.7.3"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/core": "0.18.2",
"@opentelemetry/instrumentation": "0.18.2",
"@opentelemetry/semantic-conventions": "0.18.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-instrumentation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/api-metrics": "0.18.2",
"require-in-the-middle": "^5.0.3",
"semver": "^7.3.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-metrics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"typescript": "4.2.3"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/api-metrics": "0.18.2",
"@opentelemetry/core": "0.18.2",
"@opentelemetry/resources": "0.18.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"typescript": "4.2.3"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/context-async-hooks": "0.18.2",
"@opentelemetry/core": "0.18.2",
"@opentelemetry/tracing": "0.18.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-plugin-grpc-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"typescript": "4.2.3"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/core": "0.18.2",
"@opentelemetry/semantic-conventions": "0.18.2",
"shimmer": "1.2.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-plugin-grpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"typescript": "4.2.3"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/core": "0.18.2",
"@opentelemetry/semantic-conventions": "0.18.2",
"shimmer": "^1.2.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-plugin-http/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"typescript": "4.2.3"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/core": "0.18.2",
"@opentelemetry/semantic-conventions": "0.18.2",
"semver": "^7.1.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-plugin-https/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"typescript": "4.2.3"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/core": "0.18.2",
"@opentelemetry/plugin-http": "0.18.2",
"@opentelemetry/semantic-conventions": "0.18.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-propagator-jaeger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"webpack": "4.46.0"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/core": "0.18.2"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"typescript": "4.2.3"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/core": "0.18.2",
"@opentelemetry/resources": "0.18.2"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"typescript": "4.2.3"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/resources": "0.18.2",
"gcp-metadata": "^4.1.4",
"semver": "7.3.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"typescript": "4.2.3"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/core": "0.18.2"
}
}
2 changes: 1 addition & 1 deletion packages/opentelemetry-sdk-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"access": "public"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/api-metrics": "0.18.2",
"@opentelemetry/core": "0.18.2",
"@opentelemetry/instrumentation": "0.18.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-shim-opentracing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"typescript": "4.2.3"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/core": "0.18.2",
"opentracing": "^0.14.4"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-tracing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"webpack": "4.46.0"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/core": "0.18.2",
"@opentelemetry/resources": "0.18.2",
"@opentelemetry/semantic-conventions": "0.18.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"webpack-merge": "5.7.3"
},
"dependencies": {
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/core": "0.18.2",
"@opentelemetry/semantic-conventions": "0.18.2",
"@opentelemetry/tracing": "0.18.2"
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.