From 2875e4236cf3a9678c0377f5a33983a48edda420 Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Wed, 13 May 2020 14:47:51 -0400 Subject: [PATCH 1/8] chore: bump otel dependencies to 0.8.0 --- packages/opentelemetry-test-utils/package.json | 6 +++--- plugins/node/opentelemetry-plugin-dns/package.json | 8 ++++---- .../test/functionals/utils.test.ts | 2 +- .../node/opentelemetry-plugin-express/package.json | 10 +++++----- .../node/opentelemetry-plugin-ioredis/package.json | 10 +++++----- .../node/opentelemetry-plugin-mongodb/package.json | 10 +++++----- plugins/node/opentelemetry-plugin-mysql/package.json | 10 +++++----- .../node/opentelemetry-plugin-pg-pool/package.json | 10 +++++----- plugins/node/opentelemetry-plugin-pg/package.json | 10 +++++----- plugins/node/opentelemetry-plugin-redis/package.json | 10 +++++----- .../opentelemetry-plugin-document-load/package.json | 9 ++++----- .../test/documentLoad.test.ts | 2 +- .../package.json | 12 ++++++------ .../opentelemetry-propagator-jaeger/package.json | 4 ++-- 14 files changed, 56 insertions(+), 57 deletions(-) diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json index 74f192f8ed..13c9520929 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/opentelemetry-test-utils/package.json @@ -23,9 +23,9 @@ }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", "devDependencies": { - "@opentelemetry/api": "^0.6.1", - "@opentelemetry/core": "^0.6.1", - "@opentelemetry/tracing": "^0.6.1", + "@opentelemetry/api": "^0.8.0", + "@opentelemetry/core": "^0.8.0", + "@opentelemetry/tracing": "^0.8.0", "gts": "^1.1.2", "ts-node": "^8.6.2", "tslint-consistent-codestyle": "^1.16.0", diff --git a/plugins/node/opentelemetry-plugin-dns/package.json b/plugins/node/opentelemetry-plugin-dns/package.json index 2ed8f90497..c188377ba3 100644 --- a/plugins/node/opentelemetry-plugin-dns/package.json +++ b/plugins/node/opentelemetry-plugin-dns/package.json @@ -41,8 +41,8 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/node": "^0.6.1", - "@opentelemetry/tracing": "^0.6.1", + "@opentelemetry/node": "^0.8.0", + "@opentelemetry/tracing": "^0.8.0", "@types/mocha": "^7.0.0", "@types/node": "^12.7.12", "@types/semver": "^6.2.0", @@ -61,8 +61,8 @@ "typescript": "3.7.2" }, "dependencies": { - "@opentelemetry/api": "^0.6.1", - "@opentelemetry/core": "^0.6.1", + "@opentelemetry/api": "^0.8.0", + "@opentelemetry/core": "^0.8.0", "semver": "^7.1.3", "shimmer": "^1.2.1" } diff --git a/plugins/node/opentelemetry-plugin-dns/test/functionals/utils.test.ts b/plugins/node/opentelemetry-plugin-dns/test/functionals/utils.test.ts index b113c99b0a..ade65de7c0 100644 --- a/plugins/node/opentelemetry-plugin-dns/test/functionals/utils.test.ts +++ b/plugins/node/opentelemetry-plugin-dns/test/functionals/utils.test.ts @@ -168,7 +168,7 @@ describe('Utility', () => { SpanKind.INTERNAL ); utils.setError(new Error(errorMessage), span, process.versions.node); - const attributes = span.toReadableSpan().attributes; + const attributes = span.attributes; assert.strictEqual( attributes[AttributeNames.DNS_ERROR_MESSAGE], errorMessage diff --git a/plugins/node/opentelemetry-plugin-express/package.json b/plugins/node/opentelemetry-plugin-express/package.json index c708611c9d..d105b21311 100644 --- a/plugins/node/opentelemetry-plugin-express/package.json +++ b/plugins/node/opentelemetry-plugin-express/package.json @@ -41,9 +41,9 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "^0.6.1", - "@opentelemetry/node": "^0.6.1", - "@opentelemetry/tracing": "^0.6.1", + "@opentelemetry/context-async-hooks": "^0.8.0", + "@opentelemetry/node": "^0.8.0", + "@opentelemetry/tracing": "^0.8.0", "@types/express": "^4.17.2", "@types/mocha": "^7.0.0", "@types/node": "^12.12.38", @@ -61,8 +61,8 @@ "typescript": "3.7.2" }, "dependencies": { - "@opentelemetry/api": "^0.6.1", - "@opentelemetry/core": "^0.6.1", + "@opentelemetry/api": "^0.8.0", + "@opentelemetry/core": "^0.8.0", "shimmer": "^1.2.1" } } diff --git a/plugins/node/opentelemetry-plugin-ioredis/package.json b/plugins/node/opentelemetry-plugin-ioredis/package.json index 30a15b415d..c2752901a4 100644 --- a/plugins/node/opentelemetry-plugin-ioredis/package.json +++ b/plugins/node/opentelemetry-plugin-ioredis/package.json @@ -44,10 +44,10 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "^0.6.1", - "@opentelemetry/node": "^0.6.1", + "@opentelemetry/context-async-hooks": "^0.8.0", + "@opentelemetry/node": "^0.8.0", "@opentelemetry/test-utils": "^0.7.0", - "@opentelemetry/tracing": "^0.6.1", + "@opentelemetry/tracing": "^0.8.0", "@types/ioredis": "^4.14.3", "@types/mocha": "^7.0.0", "@types/node": "^13.1.0", @@ -66,8 +66,8 @@ "typescript": "3.7.4" }, "dependencies": { - "@opentelemetry/api": "^0.6.1", - "@opentelemetry/core": "^0.6.1", + "@opentelemetry/api": "^0.8.0", + "@opentelemetry/core": "^0.8.0", "shimmer": "^1.2.1" } } diff --git a/plugins/node/opentelemetry-plugin-mongodb/package.json b/plugins/node/opentelemetry-plugin-mongodb/package.json index 37b2d1b890..bad548967d 100644 --- a/plugins/node/opentelemetry-plugin-mongodb/package.json +++ b/plugins/node/opentelemetry-plugin-mongodb/package.json @@ -41,9 +41,9 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "^0.6.1", - "@opentelemetry/node": "^0.6.1", - "@opentelemetry/tracing": "^0.6.1", + "@opentelemetry/context-async-hooks": "^0.8.0", + "@opentelemetry/node": "^0.8.0", + "@opentelemetry/tracing": "^0.8.0", "@types/mocha": "^7.0.0", "@types/mongodb": "^3.2.3", "@types/node": "^12.7.2", @@ -61,8 +61,8 @@ "typescript": "3.7.2" }, "dependencies": { - "@opentelemetry/api": "^0.6.1", - "@opentelemetry/core": "^0.6.1", + "@opentelemetry/api": "^0.8.0", + "@opentelemetry/core": "^0.8.0", "shimmer": "^1.2.1" } } diff --git a/plugins/node/opentelemetry-plugin-mysql/package.json b/plugins/node/opentelemetry-plugin-mysql/package.json index afbf24d5a6..a8d25e8964 100644 --- a/plugins/node/opentelemetry-plugin-mysql/package.json +++ b/plugins/node/opentelemetry-plugin-mysql/package.json @@ -41,10 +41,10 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "^0.6.1", - "@opentelemetry/node": "^0.6.1", + "@opentelemetry/context-async-hooks": "^0.8.0", + "@opentelemetry/node": "^0.8.0", "@opentelemetry/test-utils": "^0.7.0", - "@opentelemetry/tracing": "^0.6.1", + "@opentelemetry/tracing": "^0.8.0", "@types/mocha": "^7.0.0", "@types/mysql": "^2.15.4", "@types/node": "^12.6.9", @@ -62,8 +62,8 @@ "typescript": "3.7.2" }, "dependencies": { - "@opentelemetry/api": "^0.6.1", - "@opentelemetry/core": "^0.6.1", + "@opentelemetry/api": "^0.8.0", + "@opentelemetry/core": "^0.8.0", "shimmer": "^1.2.1" } } diff --git a/plugins/node/opentelemetry-plugin-pg-pool/package.json b/plugins/node/opentelemetry-plugin-pg-pool/package.json index 0939849e54..ea7925eb7f 100644 --- a/plugins/node/opentelemetry-plugin-pg-pool/package.json +++ b/plugins/node/opentelemetry-plugin-pg-pool/package.json @@ -46,7 +46,7 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "^0.6.1", + "@opentelemetry/context-async-hooks": "^0.8.0", "@opentelemetry/plugin-pg": "^0.7.0", "@opentelemetry/test-utils": "^0.7.0", "@types/mocha": "^7.0.0", @@ -69,10 +69,10 @@ "typescript": "3.7.2" }, "dependencies": { - "@opentelemetry/api": "^0.6.1", - "@opentelemetry/core": "^0.6.1", - "@opentelemetry/node": "^0.6.1", - "@opentelemetry/tracing": "^0.6.1", + "@opentelemetry/api": "^0.8.0", + "@opentelemetry/core": "^0.8.0", + "@opentelemetry/node": "^0.8.0", + "@opentelemetry/tracing": "^0.8.0", "shimmer": "^1.2.1" } } diff --git a/plugins/node/opentelemetry-plugin-pg/package.json b/plugins/node/opentelemetry-plugin-pg/package.json index f67befcde3..7874ab6963 100644 --- a/plugins/node/opentelemetry-plugin-pg/package.json +++ b/plugins/node/opentelemetry-plugin-pg/package.json @@ -45,10 +45,10 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "^0.6.1", - "@opentelemetry/node": "^0.6.1", + "@opentelemetry/context-async-hooks": "^0.8.0", + "@opentelemetry/node": "^0.8.0", "@opentelemetry/test-utils": "^0.7.0", - "@opentelemetry/tracing": "^0.6.1", + "@opentelemetry/tracing": "^0.8.0", "@types/mocha": "^7.0.0", "@types/node": "^12.6.9", "@types/pg": "^7.11.2", @@ -66,8 +66,8 @@ "typescript": "3.7.2" }, "dependencies": { - "@opentelemetry/api": "^0.6.1", - "@opentelemetry/core": "^0.6.1", + "@opentelemetry/api": "^0.8.0", + "@opentelemetry/core": "^0.8.0", "shimmer": "^1.2.1" } } diff --git a/plugins/node/opentelemetry-plugin-redis/package.json b/plugins/node/opentelemetry-plugin-redis/package.json index 42f21a0f3f..411fa177bd 100644 --- a/plugins/node/opentelemetry-plugin-redis/package.json +++ b/plugins/node/opentelemetry-plugin-redis/package.json @@ -43,10 +43,10 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "^0.6.1", - "@opentelemetry/node": "^0.6.1", + "@opentelemetry/context-async-hooks": "^0.8.0", + "@opentelemetry/node": "^0.8.0", "@opentelemetry/test-utils": "^0.7.0", - "@opentelemetry/tracing": "^0.6.1", + "@opentelemetry/tracing": "^0.8.0", "@types/mocha": "^7.0.0", "@types/node": "^12.6.9", "@types/redis": "^2.8.14", @@ -65,8 +65,8 @@ "typescript": "3.7.2" }, "dependencies": { - "@opentelemetry/api": "^0.6.1", - "@opentelemetry/core": "^0.6.1", + "@opentelemetry/api": "^0.8.0", + "@opentelemetry/core": "^0.8.0", "shimmer": "^1.2.1" } } diff --git a/plugins/web/opentelemetry-plugin-document-load/package.json b/plugins/web/opentelemetry-plugin-document-load/package.json index d02c140b4a..b48292bd46 100644 --- a/plugins/web/opentelemetry-plugin-document-load/package.json +++ b/plugins/web/opentelemetry-plugin-document-load/package.json @@ -43,7 +43,6 @@ }, "devDependencies": { "@babel/core": "^7.6.0", - "@opentelemetry/base": "^0.6.1", "@types/mocha": "^7.0.0", "@types/node": "^12.6.8", "@types/sinon": "^7.0.13", @@ -73,9 +72,9 @@ "webpack-merge": "^4.2.2" }, "dependencies": { - "@opentelemetry/api": "^0.6.1", - "@opentelemetry/core": "^0.6.1", - "@opentelemetry/tracing": "^0.6.1", - "@opentelemetry/web": "^0.6.1" + "@opentelemetry/api": "^0.8.0", + "@opentelemetry/core": "^0.8.0", + "@opentelemetry/tracing": "^0.8.0", + "@opentelemetry/web": "^0.8.0" } } diff --git a/plugins/web/opentelemetry-plugin-document-load/test/documentLoad.test.ts b/plugins/web/opentelemetry-plugin-document-load/test/documentLoad.test.ts index 623e6cbfcf..ad6787cc0b 100644 --- a/plugins/web/opentelemetry-plugin-document-load/test/documentLoad.test.ts +++ b/plugins/web/opentelemetry-plugin-document-load/test/documentLoad.test.ts @@ -42,7 +42,7 @@ import { } from '@opentelemetry/web'; import * as assert from 'assert'; import * as sinon from 'sinon'; -import { ExportResult } from '@opentelemetry/base'; +import { ExportResult } from '@opentelemetry/core'; import { DocumentLoad } from '../src'; export class DummyExporter implements SpanExporter { diff --git a/plugins/web/opentelemetry-plugin-user-interaction/package.json b/plugins/web/opentelemetry-plugin-user-interaction/package.json index ff43446f7a..48c5ab0b3d 100644 --- a/plugins/web/opentelemetry-plugin-user-interaction/package.json +++ b/plugins/web/opentelemetry-plugin-user-interaction/package.json @@ -43,9 +43,9 @@ }, "devDependencies": { "@babel/core": "^7.6.0", - "@opentelemetry/context-zone-peer-dep": "^0.6.1", - "@opentelemetry/plugin-xml-http-request": "^0.6.1", - "@opentelemetry/tracing": "^0.6.1", + "@opentelemetry/context-zone-peer-dep": "^0.8.0", + "@opentelemetry/plugin-xml-http-request": "^0.8.0", + "@opentelemetry/tracing": "^0.8.0", "@types/jquery": "^3.3.31", "@types/mocha": "^7.0.0", "@types/node": "^12.6.8", @@ -79,9 +79,9 @@ "webpack-merge": "^4.2.2" }, "dependencies": { - "@opentelemetry/api": "^0.6.1", - "@opentelemetry/core": "^0.6.1", - "@opentelemetry/web": "^0.6.1", + "@opentelemetry/api": "^0.8.0", + "@opentelemetry/core": "^0.8.0", + "@opentelemetry/web": "^0.8.0", "shimmer": "^1.2.1" }, "peerDependencies": { diff --git a/propagators/opentelemetry-propagator-jaeger/package.json b/propagators/opentelemetry-propagator-jaeger/package.json index dfe266cf23..477dde1a22 100644 --- a/propagators/opentelemetry-propagator-jaeger/package.json +++ b/propagators/opentelemetry-propagator-jaeger/package.json @@ -70,7 +70,7 @@ "webpack": "^4.35.2" }, "dependencies": { - "@opentelemetry/api": "^0.6.1", - "@opentelemetry/core": "^0.6.1" + "@opentelemetry/api": "^0.8.0", + "@opentelemetry/core": "^0.8.0" } } From bd9bda952eec3155ad690bed8002d701e1a9eb5c Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Wed, 13 May 2020 14:57:34 -0400 Subject: [PATCH 2/8] chore: bump otel in examples --- examples/basic-tracer-node/package.json | 6 +++--- examples/dns/package.json | 10 +++++----- examples/express/package.json | 12 ++++++------ examples/grpc_dynamic_codegen/package.json | 12 ++++++------ examples/ioredis/package.json | 8 ++++---- examples/mysql/package.json | 12 ++++++------ examples/postgres/package.json | 12 ++++++------ examples/redis/package.json | 12 ++++++------ 8 files changed, 42 insertions(+), 42 deletions(-) diff --git a/examples/basic-tracer-node/package.json b/examples/basic-tracer-node/package.json index 9331a91b8d..eb834005ae 100644 --- a/examples/basic-tracer-node/package.json +++ b/examples/basic-tracer-node/package.json @@ -24,9 +24,9 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.6.1", - "@opentelemetry/exporter-jaeger": "^0.6.1", - "@opentelemetry/tracing": "^0.6.1" + "@opentelemetry/api": "^0.8.0", + "@opentelemetry/exporter-jaeger": "^0.8.0", + "@opentelemetry/tracing": "^0.8.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme" } diff --git a/examples/dns/package.json b/examples/dns/package.json index 0de9cde2df..02b6548366 100644 --- a/examples/dns/package.json +++ b/examples/dns/package.json @@ -26,12 +26,12 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.6.1", - "@opentelemetry/exporter-jaeger": "^0.6.1", - "@opentelemetry/exporter-zipkin": "^0.6.1", - "@opentelemetry/node": "^0.6.1", + "@opentelemetry/api": "^0.8.0", + "@opentelemetry/exporter-jaeger": "^0.8.0", + "@opentelemetry/exporter-zipkin": "^0.8.0", + "@opentelemetry/node": "^0.8.0", "@opentelemetry/plugin-dns": "^0.7.0", - "@opentelemetry/tracing": "^0.6.1" + "@opentelemetry/tracing": "^0.8.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", "devDependencies": { diff --git a/examples/express/package.json b/examples/express/package.json index eda0239354..efa73dfd90 100644 --- a/examples/express/package.json +++ b/examples/express/package.json @@ -28,13 +28,13 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.6.1", - "@opentelemetry/exporter-jaeger": "^0.6.1", - "@opentelemetry/exporter-zipkin": "^0.6.1", - "@opentelemetry/node": "^0.6.1", + "@opentelemetry/api": "^0.8.0", + "@opentelemetry/exporter-jaeger": "^0.8.0", + "@opentelemetry/exporter-zipkin": "^0.8.0", + "@opentelemetry/node": "^0.8.0", "@opentelemetry/plugin-express": "^0.7.0", - "@opentelemetry/plugin-http": "^0.6.1", - "@opentelemetry/tracing": "^0.6.1", + "@opentelemetry/plugin-http": "^0.8.0", + "@opentelemetry/tracing": "^0.8.0", "axios": "^0.19.0", "express": "^4.17.1" }, diff --git a/examples/grpc_dynamic_codegen/package.json b/examples/grpc_dynamic_codegen/package.json index d97b1e23b6..cd82422390 100644 --- a/examples/grpc_dynamic_codegen/package.json +++ b/examples/grpc_dynamic_codegen/package.json @@ -28,12 +28,12 @@ }, "dependencies": { "@grpc/proto-loader": "^0.4.0", - "@opentelemetry/api": "^0.6.1", - "@opentelemetry/exporter-jaeger": "^0.6.1", - "@opentelemetry/exporter-zipkin": "^0.6.1", - "@opentelemetry/node": "^0.6.1", - "@opentelemetry/plugin-grpc": "^0.6.1", - "@opentelemetry/tracing": "^0.6.1", + "@opentelemetry/api": "^0.8.0", + "@opentelemetry/exporter-jaeger": "^0.8.0", + "@opentelemetry/exporter-zipkin": "^0.8.0", + "@opentelemetry/node": "^0.8.0", + "@opentelemetry/plugin-grpc": "^0.8.0", + "@opentelemetry/tracing": "^0.8.0", "grpc": "^1.23.3", "node-pre-gyp": "0.12.0" }, diff --git a/examples/ioredis/package.json b/examples/ioredis/package.json index a1f5d735e6..88b3241174 100644 --- a/examples/ioredis/package.json +++ b/examples/ioredis/package.json @@ -28,11 +28,11 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.6.1", - "@opentelemetry/exporter-jaeger": "^0.6.1", - "@opentelemetry/node": "^0.6.1", + "@opentelemetry/api": "^0.8.0", + "@opentelemetry/exporter-jaeger": "^0.8.0", + "@opentelemetry/node": "^0.8.0", "@opentelemetry/plugin-ioredis": "^0.7.0", - "@opentelemetry/tracing": "^0.6.1", + "@opentelemetry/tracing": "^0.8.0", "ioredis": "^4.14.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme" diff --git a/examples/mysql/package.json b/examples/mysql/package.json index 81ca5ab64a..6516131b20 100644 --- a/examples/mysql/package.json +++ b/examples/mysql/package.json @@ -28,13 +28,13 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.6.1", - "@opentelemetry/exporter-jaeger": "^0.6.1", - "@opentelemetry/exporter-zipkin": "^0.6.1", - "@opentelemetry/node": "^0.6.1", - "@opentelemetry/plugin-http": "^0.6.1", + "@opentelemetry/api": "^0.8.0", + "@opentelemetry/exporter-jaeger": "^0.8.0", + "@opentelemetry/exporter-zipkin": "^0.8.0", + "@opentelemetry/node": "^0.8.0", + "@opentelemetry/plugin-http": "^0.8.0", "@opentelemetry/plugin-mysql": "^0.7.0", - "@opentelemetry/tracing": "^0.6.1", + "@opentelemetry/tracing": "^0.8.0", "mysql": "*" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", diff --git a/examples/postgres/package.json b/examples/postgres/package.json index cc6a384a97..61154b6f67 100644 --- a/examples/postgres/package.json +++ b/examples/postgres/package.json @@ -30,14 +30,14 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.6.1", - "@opentelemetry/exporter-jaeger": "^0.6.1", - "@opentelemetry/exporter-zipkin": "^0.6.1", - "@opentelemetry/node": "^0.6.1", - "@opentelemetry/plugin-http": "^0.6.1", + "@opentelemetry/api": "^0.8.0", + "@opentelemetry/exporter-jaeger": "^0.8.0", + "@opentelemetry/exporter-zipkin": "^0.8.0", + "@opentelemetry/node": "^0.8.0", + "@opentelemetry/plugin-http": "^0.8.0", "@opentelemetry/plugin-pg": "^0.7.0", "@opentelemetry/plugin-pg-pool": "^0.7.0", - "@opentelemetry/tracing": "^0.6.1", + "@opentelemetry/tracing": "^0.8.0", "express": "^4.17.1", "pg": "^7.12.1" }, diff --git a/examples/redis/package.json b/examples/redis/package.json index fa497c3f9b..2f2151d926 100644 --- a/examples/redis/package.json +++ b/examples/redis/package.json @@ -30,13 +30,13 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.6.1", - "@opentelemetry/exporter-jaeger": "^0.6.1", - "@opentelemetry/exporter-zipkin": "^0.6.1", - "@opentelemetry/node": "^0.6.1", - "@opentelemetry/plugin-http": "^0.6.1", + "@opentelemetry/api": "^0.8.0", + "@opentelemetry/exporter-jaeger": "^0.8.0", + "@opentelemetry/exporter-zipkin": "^0.8.0", + "@opentelemetry/node": "^0.8.0", + "@opentelemetry/plugin-http": "^0.8.0", "@opentelemetry/plugin-redis": "^0.7.0", - "@opentelemetry/tracing": "^0.6.1", + "@opentelemetry/tracing": "^0.8.0", "axios": "^0.19.0", "express": "^4.17.1", "redis": "^2.8.0" From b1e67bc4e85bc245c39cc3994544985eaec2465c Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Thu, 28 May 2020 14:31:22 -0400 Subject: [PATCH 3/8] chore: bump webpack env --- plugins/web/opentelemetry-plugin-user-interaction/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/web/opentelemetry-plugin-user-interaction/package.json b/plugins/web/opentelemetry-plugin-user-interaction/package.json index 58026b2ae8..61a4d5a464 100644 --- a/plugins/web/opentelemetry-plugin-user-interaction/package.json +++ b/plugins/web/opentelemetry-plugin-user-interaction/package.json @@ -51,7 +51,7 @@ "@types/node": "^12.6.8", "@types/shimmer": "^1.0.1", "@types/sinon": "^7.0.13", - "@types/webpack-env": "1.13.9", + "@types/webpack-env": "^1.15.2", "@types/zone.js": "^0.5.12", "babel-loader": "^8.0.6", "codecov": "^3.6.1", From 54ba08bce8b2b65a711cc52bea491946e3a9e7ee Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Thu, 28 May 2020 14:35:40 -0400 Subject: [PATCH 4/8] chore: skip lib check for incompatible types --- .../web/opentelemetry-plugin-user-interaction/tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/web/opentelemetry-plugin-user-interaction/tsconfig.json b/plugins/web/opentelemetry-plugin-user-interaction/tsconfig.json index aeb71bc448..ea1dd61b2c 100644 --- a/plugins/web/opentelemetry-plugin-user-interaction/tsconfig.json +++ b/plugins/web/opentelemetry-plugin-user-interaction/tsconfig.json @@ -2,7 +2,8 @@ "extends": "../../../tsconfig.base", "compilerOptions": { "rootDir": ".", - "outDir": "build" + "outDir": "build", + "skipLibCheck": true }, "files": [ "node_modules/zone.js/dist/zone.js.d.ts"], "include": [ From 1c19276990224839ebf042c94061e3fa131d13c9 Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Fri, 29 May 2020 07:38:32 -0400 Subject: [PATCH 5/8] chore: use basic tracer provider in pg tests --- .../node/opentelemetry-plugin-pg-pool/test/pg-pool.test.ts | 4 ++-- plugins/node/opentelemetry-plugin-pg/test/pg.test.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/node/opentelemetry-plugin-pg-pool/test/pg-pool.test.ts b/plugins/node/opentelemetry-plugin-pg-pool/test/pg-pool.test.ts index 9dddc3b659..5118fea88c 100644 --- a/plugins/node/opentelemetry-plugin-pg-pool/test/pg-pool.test.ts +++ b/plugins/node/opentelemetry-plugin-pg-pool/test/pg-pool.test.ts @@ -24,7 +24,7 @@ import { TimedEvent, } from '@opentelemetry/api'; import { NoopLogger } from '@opentelemetry/core'; -import { NodeTracerProvider } from '@opentelemetry/node'; +import { BasicTracerProvider } from '@opentelemetry/tracing'; import { plugin as pgPlugin, PostgresPlugin } from '@opentelemetry/plugin-pg'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; import * as testUtils from '@opentelemetry/test-utils'; @@ -95,7 +95,7 @@ const runCallbackTest = ( describe('pg-pool@2.x', () => { let pool: pgPool; let contextManager: AsyncHooksContextManager; - const provider = new NodeTracerProvider(); + const provider = new BasicTracerProvider(); const logger = new NoopLogger(); const testPostgres = process.env.RUN_POSTGRES_TESTS; // For CI: assumes local postgres db is already available const testPostgresLocally = process.env.RUN_POSTGRES_TESTS_LOCAL; // For local: spins up local postgres db via docker diff --git a/plugins/node/opentelemetry-plugin-pg/test/pg.test.ts b/plugins/node/opentelemetry-plugin-pg/test/pg.test.ts index 7acfa4b97a..f477fbc089 100644 --- a/plugins/node/opentelemetry-plugin-pg/test/pg.test.ts +++ b/plugins/node/opentelemetry-plugin-pg/test/pg.test.ts @@ -23,11 +23,11 @@ import { Status, TimedEvent, } from '@opentelemetry/api'; -import { NoopLogger } from '@opentelemetry/core'; -import { NodeTracerProvider } from '@opentelemetry/node'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; +import { NoopLogger } from '@opentelemetry/core'; import * as testUtils from '@opentelemetry/test-utils'; import { + BasicTracerProvider, InMemorySpanExporter, SimpleSpanProcessor, } from '@opentelemetry/tracing'; @@ -84,7 +84,7 @@ const runCallbackTest = ( describe('pg@7.x', () => { let client: pg.Client; let contextManager: AsyncHooksContextManager; - const provider = new NodeTracerProvider(); + const provider = new BasicTracerProvider(); const tracer = provider.getTracer('external'); const logger = new NoopLogger(); const testPostgres = process.env.RUN_POSTGRES_TESTS; // For CI: assumes local postgres db is already available From 6d0c45477abe1ba30b053e3399312c43afc936fb Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Fri, 29 May 2020 08:20:01 -0400 Subject: [PATCH 6/8] chore: bump dependency to be explicitly 8.3 --- examples/basic-tracer-node/package.json | 6 +++--- examples/dns/package.json | 10 +++++----- examples/express/package.json | 12 ++++++------ examples/grpc_dynamic_codegen/package.json | 12 ++++++------ examples/ioredis/package.json | 8 ++++---- examples/mysql/package.json | 12 ++++++------ examples/postgres/package.json | 12 ++++++------ examples/redis/package.json | 12 ++++++------ packages/opentelemetry-test-utils/package.json | 6 +++--- plugins/node/opentelemetry-plugin-dns/package.json | 8 ++++---- .../node/opentelemetry-plugin-express/package.json | 10 +++++----- .../node/opentelemetry-plugin-ioredis/package.json | 10 +++++----- .../node/opentelemetry-plugin-mongodb/package.json | 10 +++++----- plugins/node/opentelemetry-plugin-mysql/package.json | 10 +++++----- .../node/opentelemetry-plugin-pg-pool/package.json | 10 +++++----- plugins/node/opentelemetry-plugin-pg/package.json | 10 +++++----- plugins/node/opentelemetry-plugin-redis/package.json | 10 +++++----- .../opentelemetry-plugin-document-load/package.json | 8 ++++---- .../package.json | 12 ++++++------ .../opentelemetry-propagator-jaeger/package.json | 4 ++-- 20 files changed, 96 insertions(+), 96 deletions(-) diff --git a/examples/basic-tracer-node/package.json b/examples/basic-tracer-node/package.json index eb834005ae..c9fe1d08f2 100644 --- a/examples/basic-tracer-node/package.json +++ b/examples/basic-tracer-node/package.json @@ -24,9 +24,9 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.8.0", - "@opentelemetry/exporter-jaeger": "^0.8.0", - "@opentelemetry/tracing": "^0.8.0" + "@opentelemetry/api": "^0.8.3", + "@opentelemetry/exporter-jaeger": "^0.8.3", + "@opentelemetry/tracing": "^0.8.3" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme" } diff --git a/examples/dns/package.json b/examples/dns/package.json index 02b6548366..19fa8129fd 100644 --- a/examples/dns/package.json +++ b/examples/dns/package.json @@ -26,12 +26,12 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.8.0", - "@opentelemetry/exporter-jaeger": "^0.8.0", - "@opentelemetry/exporter-zipkin": "^0.8.0", - "@opentelemetry/node": "^0.8.0", + "@opentelemetry/api": "^0.8.3", + "@opentelemetry/exporter-jaeger": "^0.8.3", + "@opentelemetry/exporter-zipkin": "^0.8.3", + "@opentelemetry/node": "^0.8.3", "@opentelemetry/plugin-dns": "^0.7.0", - "@opentelemetry/tracing": "^0.8.0" + "@opentelemetry/tracing": "^0.8.3" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", "devDependencies": { diff --git a/examples/express/package.json b/examples/express/package.json index efa73dfd90..622cbe67c1 100644 --- a/examples/express/package.json +++ b/examples/express/package.json @@ -28,13 +28,13 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.8.0", - "@opentelemetry/exporter-jaeger": "^0.8.0", - "@opentelemetry/exporter-zipkin": "^0.8.0", - "@opentelemetry/node": "^0.8.0", + "@opentelemetry/api": "^0.8.3", + "@opentelemetry/exporter-jaeger": "^0.8.3", + "@opentelemetry/exporter-zipkin": "^0.8.3", + "@opentelemetry/node": "^0.8.3", "@opentelemetry/plugin-express": "^0.7.0", - "@opentelemetry/plugin-http": "^0.8.0", - "@opentelemetry/tracing": "^0.8.0", + "@opentelemetry/plugin-http": "^0.8.3", + "@opentelemetry/tracing": "^0.8.3", "axios": "^0.19.0", "express": "^4.17.1" }, diff --git a/examples/grpc_dynamic_codegen/package.json b/examples/grpc_dynamic_codegen/package.json index cd82422390..35b58a29fd 100644 --- a/examples/grpc_dynamic_codegen/package.json +++ b/examples/grpc_dynamic_codegen/package.json @@ -28,12 +28,12 @@ }, "dependencies": { "@grpc/proto-loader": "^0.4.0", - "@opentelemetry/api": "^0.8.0", - "@opentelemetry/exporter-jaeger": "^0.8.0", - "@opentelemetry/exporter-zipkin": "^0.8.0", - "@opentelemetry/node": "^0.8.0", - "@opentelemetry/plugin-grpc": "^0.8.0", - "@opentelemetry/tracing": "^0.8.0", + "@opentelemetry/api": "^0.8.3", + "@opentelemetry/exporter-jaeger": "^0.8.3", + "@opentelemetry/exporter-zipkin": "^0.8.3", + "@opentelemetry/node": "^0.8.3", + "@opentelemetry/plugin-grpc": "^0.8.3", + "@opentelemetry/tracing": "^0.8.3", "grpc": "^1.23.3", "node-pre-gyp": "0.12.0" }, diff --git a/examples/ioredis/package.json b/examples/ioredis/package.json index 88b3241174..f8099653d2 100644 --- a/examples/ioredis/package.json +++ b/examples/ioredis/package.json @@ -28,11 +28,11 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.8.0", - "@opentelemetry/exporter-jaeger": "^0.8.0", - "@opentelemetry/node": "^0.8.0", + "@opentelemetry/api": "^0.8.3", + "@opentelemetry/exporter-jaeger": "^0.8.3", + "@opentelemetry/node": "^0.8.3", "@opentelemetry/plugin-ioredis": "^0.7.0", - "@opentelemetry/tracing": "^0.8.0", + "@opentelemetry/tracing": "^0.8.3", "ioredis": "^4.14.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme" diff --git a/examples/mysql/package.json b/examples/mysql/package.json index 6516131b20..05fa176e55 100644 --- a/examples/mysql/package.json +++ b/examples/mysql/package.json @@ -28,13 +28,13 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.8.0", - "@opentelemetry/exporter-jaeger": "^0.8.0", - "@opentelemetry/exporter-zipkin": "^0.8.0", - "@opentelemetry/node": "^0.8.0", - "@opentelemetry/plugin-http": "^0.8.0", + "@opentelemetry/api": "^0.8.3", + "@opentelemetry/exporter-jaeger": "^0.8.3", + "@opentelemetry/exporter-zipkin": "^0.8.3", + "@opentelemetry/node": "^0.8.3", + "@opentelemetry/plugin-http": "^0.8.3", "@opentelemetry/plugin-mysql": "^0.7.0", - "@opentelemetry/tracing": "^0.8.0", + "@opentelemetry/tracing": "^0.8.3", "mysql": "*" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", diff --git a/examples/postgres/package.json b/examples/postgres/package.json index 61154b6f67..1d6fcf3fb2 100644 --- a/examples/postgres/package.json +++ b/examples/postgres/package.json @@ -30,14 +30,14 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.8.0", - "@opentelemetry/exporter-jaeger": "^0.8.0", - "@opentelemetry/exporter-zipkin": "^0.8.0", - "@opentelemetry/node": "^0.8.0", - "@opentelemetry/plugin-http": "^0.8.0", + "@opentelemetry/api": "^0.8.3", + "@opentelemetry/exporter-jaeger": "^0.8.3", + "@opentelemetry/exporter-zipkin": "^0.8.3", + "@opentelemetry/node": "^0.8.3", + "@opentelemetry/plugin-http": "^0.8.3", "@opentelemetry/plugin-pg": "^0.7.0", "@opentelemetry/plugin-pg-pool": "^0.7.0", - "@opentelemetry/tracing": "^0.8.0", + "@opentelemetry/tracing": "^0.8.3", "express": "^4.17.1", "pg": "^7.12.1" }, diff --git a/examples/redis/package.json b/examples/redis/package.json index 2f2151d926..270374eddb 100644 --- a/examples/redis/package.json +++ b/examples/redis/package.json @@ -30,13 +30,13 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.8.0", - "@opentelemetry/exporter-jaeger": "^0.8.0", - "@opentelemetry/exporter-zipkin": "^0.8.0", - "@opentelemetry/node": "^0.8.0", - "@opentelemetry/plugin-http": "^0.8.0", + "@opentelemetry/api": "^0.8.3", + "@opentelemetry/exporter-jaeger": "^0.8.3", + "@opentelemetry/exporter-zipkin": "^0.8.3", + "@opentelemetry/node": "^0.8.3", + "@opentelemetry/plugin-http": "^0.8.3", "@opentelemetry/plugin-redis": "^0.7.0", - "@opentelemetry/tracing": "^0.8.0", + "@opentelemetry/tracing": "^0.8.3", "axios": "^0.19.0", "express": "^4.17.1", "redis": "^2.8.0" diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json index 13c9520929..ec07155a91 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/opentelemetry-test-utils/package.json @@ -23,9 +23,9 @@ }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", "devDependencies": { - "@opentelemetry/api": "^0.8.0", - "@opentelemetry/core": "^0.8.0", - "@opentelemetry/tracing": "^0.8.0", + "@opentelemetry/api": "^0.8.3", + "@opentelemetry/core": "^0.8.3", + "@opentelemetry/tracing": "^0.8.3", "gts": "^1.1.2", "ts-node": "^8.6.2", "tslint-consistent-codestyle": "^1.16.0", diff --git a/plugins/node/opentelemetry-plugin-dns/package.json b/plugins/node/opentelemetry-plugin-dns/package.json index ec4478b102..ecb8842c53 100644 --- a/plugins/node/opentelemetry-plugin-dns/package.json +++ b/plugins/node/opentelemetry-plugin-dns/package.json @@ -41,8 +41,8 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/node": "^0.8.0", - "@opentelemetry/tracing": "^0.8.0", + "@opentelemetry/node": "^0.8.3", + "@opentelemetry/tracing": "^0.8.3", "@types/mocha": "^7.0.0", "@types/node": "^12.7.12", "@types/semver": "^6.2.0", @@ -61,8 +61,8 @@ "typescript": "3.7.2" }, "dependencies": { - "@opentelemetry/api": "^0.8.0", - "@opentelemetry/core": "^0.8.0", + "@opentelemetry/api": "^0.8.3", + "@opentelemetry/core": "^0.8.3", "semver": "^7.1.3", "shimmer": "^1.2.1" } diff --git a/plugins/node/opentelemetry-plugin-express/package.json b/plugins/node/opentelemetry-plugin-express/package.json index ef5c21d139..1d79f396c7 100644 --- a/plugins/node/opentelemetry-plugin-express/package.json +++ b/plugins/node/opentelemetry-plugin-express/package.json @@ -41,9 +41,9 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "^0.8.0", - "@opentelemetry/node": "^0.8.0", - "@opentelemetry/tracing": "^0.8.0", + "@opentelemetry/context-async-hooks": "^0.8.3", + "@opentelemetry/node": "^0.8.3", + "@opentelemetry/tracing": "^0.8.3", "@types/express": "^4.17.2", "@types/mocha": "^7.0.0", "@types/node": "^12.12.38", @@ -61,8 +61,8 @@ "typescript": "3.7.2" }, "dependencies": { - "@opentelemetry/api": "^0.8.0", - "@opentelemetry/core": "^0.8.0", + "@opentelemetry/api": "^0.8.3", + "@opentelemetry/core": "^0.8.3", "shimmer": "^1.2.1" } } diff --git a/plugins/node/opentelemetry-plugin-ioredis/package.json b/plugins/node/opentelemetry-plugin-ioredis/package.json index 3011c658b1..7168a36970 100644 --- a/plugins/node/opentelemetry-plugin-ioredis/package.json +++ b/plugins/node/opentelemetry-plugin-ioredis/package.json @@ -44,10 +44,10 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "^0.8.0", - "@opentelemetry/node": "^0.8.0", + "@opentelemetry/context-async-hooks": "^0.8.3", + "@opentelemetry/node": "^0.8.3", "@opentelemetry/test-utils": "^0.7.0", - "@opentelemetry/tracing": "^0.8.0", + "@opentelemetry/tracing": "^0.8.3", "@types/ioredis": "^4.14.3", "@types/mocha": "^7.0.0", "@types/node": "^13.1.0", @@ -66,8 +66,8 @@ "typescript": "3.7.4" }, "dependencies": { - "@opentelemetry/api": "^0.8.0", - "@opentelemetry/core": "^0.8.0", + "@opentelemetry/api": "^0.8.3", + "@opentelemetry/core": "^0.8.3", "shimmer": "^1.2.1" } } diff --git a/plugins/node/opentelemetry-plugin-mongodb/package.json b/plugins/node/opentelemetry-plugin-mongodb/package.json index 089a34412b..e971b84f12 100644 --- a/plugins/node/opentelemetry-plugin-mongodb/package.json +++ b/plugins/node/opentelemetry-plugin-mongodb/package.json @@ -41,9 +41,9 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "^0.8.0", - "@opentelemetry/node": "^0.8.0", - "@opentelemetry/tracing": "^0.8.0", + "@opentelemetry/context-async-hooks": "^0.8.3", + "@opentelemetry/node": "^0.8.3", + "@opentelemetry/tracing": "^0.8.3", "@types/mocha": "^7.0.0", "@types/mongodb": "^3.2.3", "@types/node": "^12.7.2", @@ -61,8 +61,8 @@ "typescript": "3.7.2" }, "dependencies": { - "@opentelemetry/api": "^0.8.0", - "@opentelemetry/core": "^0.8.0", + "@opentelemetry/api": "^0.8.3", + "@opentelemetry/core": "^0.8.3", "shimmer": "^1.2.1" } } diff --git a/plugins/node/opentelemetry-plugin-mysql/package.json b/plugins/node/opentelemetry-plugin-mysql/package.json index 217d76b41a..cf2fc660e2 100644 --- a/plugins/node/opentelemetry-plugin-mysql/package.json +++ b/plugins/node/opentelemetry-plugin-mysql/package.json @@ -41,10 +41,10 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "^0.8.0", - "@opentelemetry/node": "^0.8.0", + "@opentelemetry/context-async-hooks": "^0.8.3", + "@opentelemetry/node": "^0.8.3", "@opentelemetry/test-utils": "^0.7.0", - "@opentelemetry/tracing": "^0.8.0", + "@opentelemetry/tracing": "^0.8.3", "@types/mocha": "^7.0.0", "@types/mysql": "^2.15.4", "@types/node": "^12.6.9", @@ -62,8 +62,8 @@ "typescript": "3.7.2" }, "dependencies": { - "@opentelemetry/api": "^0.8.0", - "@opentelemetry/core": "^0.8.0", + "@opentelemetry/api": "^0.8.3", + "@opentelemetry/core": "^0.8.3", "shimmer": "^1.2.1" } } diff --git a/plugins/node/opentelemetry-plugin-pg-pool/package.json b/plugins/node/opentelemetry-plugin-pg-pool/package.json index d93356b0ce..90010fa885 100644 --- a/plugins/node/opentelemetry-plugin-pg-pool/package.json +++ b/plugins/node/opentelemetry-plugin-pg-pool/package.json @@ -46,7 +46,7 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "^0.8.0", + "@opentelemetry/context-async-hooks": "^0.8.3", "@opentelemetry/plugin-pg": "^0.7.0", "@opentelemetry/test-utils": "^0.7.0", "@types/mocha": "^7.0.0", @@ -69,10 +69,10 @@ "typescript": "3.7.2" }, "dependencies": { - "@opentelemetry/api": "^0.8.0", - "@opentelemetry/core": "^0.8.0", - "@opentelemetry/node": "^0.8.0", - "@opentelemetry/tracing": "^0.8.0", + "@opentelemetry/api": "^0.8.3", + "@opentelemetry/core": "^0.8.3", + "@opentelemetry/node": "^0.8.3", + "@opentelemetry/tracing": "^0.8.3", "shimmer": "^1.2.1" } } diff --git a/plugins/node/opentelemetry-plugin-pg/package.json b/plugins/node/opentelemetry-plugin-pg/package.json index 617879e10c..9cc5a8a799 100644 --- a/plugins/node/opentelemetry-plugin-pg/package.json +++ b/plugins/node/opentelemetry-plugin-pg/package.json @@ -45,10 +45,10 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "^0.8.0", - "@opentelemetry/node": "^0.8.0", + "@opentelemetry/context-async-hooks": "^0.8.3", + "@opentelemetry/node": "^0.8.3", "@opentelemetry/test-utils": "^0.7.0", - "@opentelemetry/tracing": "^0.8.0", + "@opentelemetry/tracing": "^0.8.3", "@types/mocha": "^7.0.0", "@types/node": "^12.6.9", "@types/pg": "^7.11.2", @@ -67,8 +67,8 @@ "typescript": "3.7.2" }, "dependencies": { - "@opentelemetry/api": "^0.8.0", - "@opentelemetry/core": "^0.8.0", + "@opentelemetry/api": "^0.8.3", + "@opentelemetry/core": "^0.8.3", "shimmer": "^1.2.1" } } diff --git a/plugins/node/opentelemetry-plugin-redis/package.json b/plugins/node/opentelemetry-plugin-redis/package.json index 7c7f8e32fe..86e29adef9 100644 --- a/plugins/node/opentelemetry-plugin-redis/package.json +++ b/plugins/node/opentelemetry-plugin-redis/package.json @@ -43,10 +43,10 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "^0.8.0", - "@opentelemetry/node": "^0.8.0", + "@opentelemetry/context-async-hooks": "^0.8.3", + "@opentelemetry/node": "^0.8.3", "@opentelemetry/test-utils": "^0.7.0", - "@opentelemetry/tracing": "^0.8.0", + "@opentelemetry/tracing": "^0.8.3", "@types/mocha": "^7.0.0", "@types/node": "^12.6.9", "@types/redis": "^2.8.14", @@ -65,8 +65,8 @@ "typescript": "3.7.2" }, "dependencies": { - "@opentelemetry/api": "^0.8.0", - "@opentelemetry/core": "^0.8.0", + "@opentelemetry/api": "^0.8.3", + "@opentelemetry/core": "^0.8.3", "shimmer": "^1.2.1" } } diff --git a/plugins/web/opentelemetry-plugin-document-load/package.json b/plugins/web/opentelemetry-plugin-document-load/package.json index 82ba33eef6..7b510649ba 100644 --- a/plugins/web/opentelemetry-plugin-document-load/package.json +++ b/plugins/web/opentelemetry-plugin-document-load/package.json @@ -72,9 +72,9 @@ "webpack-merge": "^4.2.2" }, "dependencies": { - "@opentelemetry/api": "^0.8.0", - "@opentelemetry/core": "^0.8.0", - "@opentelemetry/tracing": "^0.8.0", - "@opentelemetry/web": "^0.8.0" + "@opentelemetry/api": "^0.8.3", + "@opentelemetry/core": "^0.8.3", + "@opentelemetry/tracing": "^0.8.3", + "@opentelemetry/web": "^0.8.3" } } diff --git a/plugins/web/opentelemetry-plugin-user-interaction/package.json b/plugins/web/opentelemetry-plugin-user-interaction/package.json index 61a4d5a464..5761e59de4 100644 --- a/plugins/web/opentelemetry-plugin-user-interaction/package.json +++ b/plugins/web/opentelemetry-plugin-user-interaction/package.json @@ -43,9 +43,9 @@ }, "devDependencies": { "@babel/core": "^7.6.0", - "@opentelemetry/context-zone-peer-dep": "^0.8.0", - "@opentelemetry/plugin-xml-http-request": "^0.8.0", - "@opentelemetry/tracing": "^0.8.0", + "@opentelemetry/context-zone-peer-dep": "^0.8.3", + "@opentelemetry/plugin-xml-http-request": "^0.8.3", + "@opentelemetry/tracing": "^0.8.3", "@types/jquery": "^3.3.31", "@types/mocha": "^7.0.0", "@types/node": "^12.6.8", @@ -79,9 +79,9 @@ "webpack-merge": "^4.2.2" }, "dependencies": { - "@opentelemetry/api": "^0.8.0", - "@opentelemetry/core": "^0.8.0", - "@opentelemetry/web": "^0.8.0", + "@opentelemetry/api": "^0.8.3", + "@opentelemetry/core": "^0.8.3", + "@opentelemetry/web": "^0.8.3", "shimmer": "^1.2.1" }, "peerDependencies": { diff --git a/propagators/opentelemetry-propagator-jaeger/package.json b/propagators/opentelemetry-propagator-jaeger/package.json index 477dde1a22..445154fa1c 100644 --- a/propagators/opentelemetry-propagator-jaeger/package.json +++ b/propagators/opentelemetry-propagator-jaeger/package.json @@ -70,7 +70,7 @@ "webpack": "^4.35.2" }, "dependencies": { - "@opentelemetry/api": "^0.8.0", - "@opentelemetry/core": "^0.8.0" + "@opentelemetry/api": "^0.8.3", + "@opentelemetry/core": "^0.8.3" } } From c04ed2476cec72e2df9951a0f6aca0c658b06787 Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Fri, 29 May 2020 08:20:17 -0400 Subject: [PATCH 7/8] chore: ensure context is disabled after each pg test --- plugins/node/opentelemetry-plugin-pg/test/pg.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/node/opentelemetry-plugin-pg/test/pg.test.ts b/plugins/node/opentelemetry-plugin-pg/test/pg.test.ts index f477fbc089..31093950b4 100644 --- a/plugins/node/opentelemetry-plugin-pg/test/pg.test.ts +++ b/plugins/node/opentelemetry-plugin-pg/test/pg.test.ts @@ -127,7 +127,7 @@ describe('pg@7.x', () => { afterEach(() => { memoryExporter.reset(); plugin.disable(); - contextManager.disable(); + context.disable(); }); it('should return a plugin', () => { From 48327d7d83390a062c6443d0ed1f880a75cd9e69 Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Fri, 29 May 2020 08:29:13 -0400 Subject: [PATCH 8/8] chore: disable context after all tests --- plugins/node/opentelemetry-plugin-express/test/express.test.ts | 2 +- plugins/node/opentelemetry-plugin-ioredis/test/ioredis.test.ts | 2 +- plugins/node/opentelemetry-plugin-mongodb/test/mongodb.test.ts | 2 +- .../opentelemetry-plugin-mongodb/test/multiple_versions.test.ts | 2 +- plugins/node/opentelemetry-plugin-mysql/test/mysql.test.ts | 2 +- plugins/node/opentelemetry-plugin-pg-pool/test/pg-pool.test.ts | 2 +- plugins/node/opentelemetry-plugin-redis/test/redis.test.ts | 2 +- .../test/documentLoad.test.ts | 2 +- .../test/userInteraction.nozone.test.ts | 2 +- .../test/userInteraction.test.ts | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/node/opentelemetry-plugin-express/test/express.test.ts b/plugins/node/opentelemetry-plugin-express/test/express.test.ts index 65dbfe14b9..e107170ee6 100644 --- a/plugins/node/opentelemetry-plugin-express/test/express.test.ts +++ b/plugins/node/opentelemetry-plugin-express/test/express.test.ts @@ -72,7 +72,7 @@ describe('Express Plugin', () => { afterEach(() => { memoryExporter.reset(); - contextManager.disable(); + context.disable(); }); describe('Instrumenting normal get operations', () => { diff --git a/plugins/node/opentelemetry-plugin-ioredis/test/ioredis.test.ts b/plugins/node/opentelemetry-plugin-ioredis/test/ioredis.test.ts index b31318816b..ca7309b6a5 100644 --- a/plugins/node/opentelemetry-plugin-ioredis/test/ioredis.test.ts +++ b/plugins/node/opentelemetry-plugin-ioredis/test/ioredis.test.ts @@ -63,7 +63,7 @@ describe('ioredis', () => { }); afterEach(() => { - contextManager.disable(); + context.disable(); }); before(function() { diff --git a/plugins/node/opentelemetry-plugin-mongodb/test/mongodb.test.ts b/plugins/node/opentelemetry-plugin-mongodb/test/mongodb.test.ts index 3b0a37cd87..d2bd52f79e 100644 --- a/plugins/node/opentelemetry-plugin-mongodb/test/mongodb.test.ts +++ b/plugins/node/opentelemetry-plugin-mongodb/test/mongodb.test.ts @@ -88,7 +88,7 @@ describe('MongoDBPlugin', () => { afterEach(done => { collection.deleteOne({}, done); - contextManager.disable(); + context.disable(); }); after(() => { diff --git a/plugins/node/opentelemetry-plugin-mongodb/test/multiple_versions.test.ts b/plugins/node/opentelemetry-plugin-mongodb/test/multiple_versions.test.ts index 819493aeb2..b04e6cae9e 100644 --- a/plugins/node/opentelemetry-plugin-mongodb/test/multiple_versions.test.ts +++ b/plugins/node/opentelemetry-plugin-mongodb/test/multiple_versions.test.ts @@ -85,7 +85,7 @@ describe('Multiple enable on the plugin', () => { afterEach(done => { collection.deleteOne({}, done); - contextManager.disable(); + context.disable(); }); after(() => { diff --git a/plugins/node/opentelemetry-plugin-mysql/test/mysql.test.ts b/plugins/node/opentelemetry-plugin-mysql/test/mysql.test.ts index 9e1c608cb4..aec297e35f 100644 --- a/plugins/node/opentelemetry-plugin-mysql/test/mysql.test.ts +++ b/plugins/node/opentelemetry-plugin-mysql/test/mysql.test.ts @@ -101,7 +101,7 @@ describe('mysql@2.x', () => { }); afterEach(done => { - contextManager.disable(); + context.disable(); memoryExporter.reset(); plugin.disable(); connection.end(() => { diff --git a/plugins/node/opentelemetry-plugin-pg-pool/test/pg-pool.test.ts b/plugins/node/opentelemetry-plugin-pg-pool/test/pg-pool.test.ts index 5118fea88c..aaa38c5c69 100644 --- a/plugins/node/opentelemetry-plugin-pg-pool/test/pg-pool.test.ts +++ b/plugins/node/opentelemetry-plugin-pg-pool/test/pg-pool.test.ts @@ -136,7 +136,7 @@ describe('pg-pool@2.x', () => { memoryExporter.reset(); plugin.disable(); pgPlugin.disable(); - contextManager.disable(); + context.disable(); }); it('should return a plugin', () => { diff --git a/plugins/node/opentelemetry-plugin-redis/test/redis.test.ts b/plugins/node/opentelemetry-plugin-redis/test/redis.test.ts index 6d03a14d85..d7332b9beb 100644 --- a/plugins/node/opentelemetry-plugin-redis/test/redis.test.ts +++ b/plugins/node/opentelemetry-plugin-redis/test/redis.test.ts @@ -62,7 +62,7 @@ describe('redis@2.x', () => { }); afterEach(() => { - contextManager.disable(); + context.disable(); }); before(function() { diff --git a/plugins/web/opentelemetry-plugin-document-load/test/documentLoad.test.ts b/plugins/web/opentelemetry-plugin-document-load/test/documentLoad.test.ts index ad6787cc0b..2015bdb40d 100644 --- a/plugins/web/opentelemetry-plugin-document-load/test/documentLoad.test.ts +++ b/plugins/web/opentelemetry-plugin-document-load/test/documentLoad.test.ts @@ -229,7 +229,7 @@ describe('DocumentLoad Plugin', () => { }); afterEach(() => { - contextManager.disable(); + context.disable(); Object.defineProperty(window.document, 'readyState', { writable: true, value: 'complete', diff --git a/plugins/web/opentelemetry-plugin-user-interaction/test/userInteraction.nozone.test.ts b/plugins/web/opentelemetry-plugin-user-interaction/test/userInteraction.nozone.test.ts index 0fc1b6456a..3ac0fd7a4f 100644 --- a/plugins/web/opentelemetry-plugin-user-interaction/test/userInteraction.nozone.test.ts +++ b/plugins/web/opentelemetry-plugin-user-interaction/test/userInteraction.nozone.test.ts @@ -89,7 +89,7 @@ describe('UserInteractionPlugin', () => { requests = []; sandbox.restore(); exportSpy.restore(); - contextManager.disable(); + context.disable(); }); it('should handle task without async operation', () => { diff --git a/plugins/web/opentelemetry-plugin-user-interaction/test/userInteraction.test.ts b/plugins/web/opentelemetry-plugin-user-interaction/test/userInteraction.test.ts index e4b773edad..c96321e9f0 100644 --- a/plugins/web/opentelemetry-plugin-user-interaction/test/userInteraction.test.ts +++ b/plugins/web/opentelemetry-plugin-user-interaction/test/userInteraction.test.ts @@ -87,7 +87,7 @@ describe('UserInteractionPlugin', () => { requests = []; sandbox.restore(); exportSpy.restore(); - contextManager.disable(); + context.disable(); }); it('should handle task without async operation', () => {