Merge pull request open-telemetry#30 from dynatrace-oss-contrib/bump-8

dyladan · web-flow · commit e47397feeb0e · 2020-05-29T09:51:16.000-04:00
diff --git 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.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
@@ -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.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.6.1"
+    "@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
@@ -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.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.6.1",
-    "@opentelemetry/tracing": "^0.6.1",
+    "@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
@@ -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.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
@@ -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.3",
+    "@opentelemetry/exporter-jaeger": "^0.8.3",
+    "@opentelemetry/node": "^0.8.3",
     "@opentelemetry/plugin-ioredis": "^0.7.0",
-    "@opentelemetry/tracing": "^0.6.1",
+    "@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
@@ -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.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.6.1",
+    "@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
@@ -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.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.6.1",
+    "@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
@@ -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.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.6.1",
+    "@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
@@ -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.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
@@ -41,8 +41,8 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opentelemetry/node": "^0.6.1",
-    "@opentelemetry/tracing": "^0.6.1",
+    "@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.6.1",
-    "@opentelemetry/core": "^0.6.1",
+    "@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-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
@@ -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.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.6.1",
-    "@opentelemetry/core": "^0.6.1",
+    "@opentelemetry/api": "^0.8.3",
+    "@opentelemetry/core": "^0.8.3",
     "shimmer": "^1.2.1"
   }
 }
diff --git 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/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.3",
+    "@opentelemetry/node": "^0.8.3",
     "@opentelemetry/test-utils": "^0.7.0",
-    "@opentelemetry/tracing": "^0.6.1",
+    "@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.6.1",
-    "@opentelemetry/core": "^0.6.1",
+    "@opentelemetry/api": "^0.8.3",
+    "@opentelemetry/core": "^0.8.3",
     "shimmer": "^1.2.1"
   }
 }
diff --git 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/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.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.6.1",
-    "@opentelemetry/core": "^0.6.1",
+    "@opentelemetry/api": "^0.8.3",
+    "@opentelemetry/core": "^0.8.3",
     "shimmer": "^1.2.1"
   }
 }
diff --git 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
@@ -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/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.3",
+    "@opentelemetry/node": "^0.8.3",
     "@opentelemetry/test-utils": "^0.7.0",
-    "@opentelemetry/tracing": "^0.6.1",
+    "@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.6.1",
-    "@opentelemetry/core": "^0.6.1",
+    "@opentelemetry/api": "^0.8.3",
+    "@opentelemetry/core": "^0.8.3",
     "shimmer": "^1.2.1"
   }
 }
diff --git 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/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.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.6.1",
-    "@opentelemetry/core": "^0.6.1",
-    "@opentelemetry/node": "^0.6.1",
-    "@opentelemetry/tracing": "^0.6.1",
+    "@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-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<pg.Client>;
   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
@@ -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-pg/package.json b/plugins/node/opentelemetry-plugin-pg/package.json
diff --git a/plugins/node/opentelemetry-plugin-pg/test/pg.test.ts b/plugins/node/opentelemetry-plugin-pg/test/pg.test.ts
diff --git a/plugins/node/opentelemetry-plugin-redis/package.json b/plugins/node/opentelemetry-plugin-redis/package.json
diff --git a/plugins/node/opentelemetry-plugin-redis/test/redis.test.ts b/plugins/node/opentelemetry-plugin-redis/test/redis.test.ts
diff --git a/plugins/web/opentelemetry-plugin-document-load/package.json b/plugins/web/opentelemetry-plugin-document-load/package.json
diff --git a/plugins/web/opentelemetry-plugin-document-load/test/documentLoad.test.ts b/plugins/web/opentelemetry-plugin-document-load/test/documentLoad.test.ts
diff --git a/plugins/web/opentelemetry-plugin-user-interaction/package.json b/plugins/web/opentelemetry-plugin-user-interaction/package.json
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
diff --git a/plugins/web/opentelemetry-plugin-user-interaction/test/userInteraction.test.ts b/plugins/web/opentelemetry-plugin-user-interaction/test/userInteraction.test.ts
diff --git a/plugins/web/opentelemetry-plugin-user-interaction/tsconfig.json b/plugins/web/opentelemetry-plugin-user-interaction/tsconfig.json
diff --git a/propagators/opentelemetry-propagator-jaeger/package.json b/propagators/opentelemetry-propagator-jaeger/package.json
