Merge branch 'main' into patch-2

open-telemetry · Mar 24, 2021 · 0e73dd2 · 0e73dd2
2 parents a94e3b8 + 69f2d3c
commit 0e73dd2
Show file tree

Hide file tree

Showing 111 changed files with 511 additions and 666 deletions.
diff --git a/README.md b/README.md
@@ -48,6 +48,7 @@ This is the JavaScript version of [OpenTelemetry](https://opentelemetry.io/), a
 
 | API Version | Core version | Contrib Version         |
 | ----------- |--------------|-------------------------|
+| v1.0.0-rc.0 | ------       | ------                  |
 | 0.18.x      | 0.18.x       | 0.14.x                  |
 |             | 0.17.x       | ------                  |
 |             | 0.16.x       | ------                  |
@@ -219,8 +220,8 @@ These plugins are hosted at <https://github.com/open-telemetry/opentelemetry-js-
 - [@opentelemetry/plugin-ioredis][otel-contrib-plugin-ioredis]
 - [@opentelemetry/plugin-express][otel-contrib-plugin-express]
 - [@opentelemetry/plugin-dns][otel-contrib-plugin-dns]
-- [@opentelemetry/hapi-instrumentation][otel-contrib-hapi-instrumentation]
-- [@opentelemetry/koa-instrumentation][otel-contrib-koa-instrumentation]
+- [@opentelemetry/instrumentation-hapi][otel-contrib-instrumentation-hapi]
+- [@opentelemetry/instrumentation-koa][otel-contrib-instrumentation-koa]
 
 #### Web Plugins
 
@@ -233,8 +234,8 @@ These plugins are hosted at <https://github.com/open-telemetry/opentelemetry-js-
 
 These plugins are hosted at <https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web>
 
-- [@opentelemetry/plugin-document-load][otel-contrib-plugin-document-load]
-- [@opentelemetry/plugin-user-interaction][otel-contrib-plugin-user-interaction]
+- [@opentelemetry/instrumentation-document-load][otel-contrib-instrumentation-document-load]
+- [@opentelemetry/instrumentation-user-interaction][otel-contrib-instrumentation-user-interaction]
 
 To request automatic tracing support for a module not on this list, please [file an issue](https://github.com/open-telemetry/opentelemetry-js/issues). Alternatively, you can [write an instrumentation yourself](https://github.com/open-telemetry/opentelemetry-js/blob/main/doc/instrumentation-guide.md).
 
@@ -435,7 +436,7 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
 [otel-contrib-plugin-pg]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-pg
 [otel-contrib-plugin-redis]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-redis
 [otel-contrib-plugin-express]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-express
-[otel-contrib-plugin-user-interaction]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web/opentelemetry-plugin-user-interaction
-[otel-contrib-plugin-document-load]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web/opentelemetry-plugin-document-load
-[otel-contrib-hapi-instrumentation]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-hapi-instrumentation
-[otel-contrib-koa-instrumentation]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-koa-instrumentation
+[otel-contrib-instrumentation-user-interaction]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web/opentelemetry-instrumentation-user-interaction
+[otel-contrib-instrumentation-document-load]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web/opentelemetry-instrumentation-document-load
+[otel-contrib-instrumentation-hapi]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-instrumentation-hapi
+[otel-contrib-instrumentation-koa]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-instrumentation-koa
diff --git a/backwards-compatability/node10/package.json b/backwards-compatability/node10/package.json
@@ -12,8 +12,8 @@
     "@opentelemetry/tracing": "^0.18.0"
   },
   "devDependencies": {
-    "@types/node": "10.17.50",
-    "typescript": "4.1.3"
+    "@types/node": "10.17.55",
+    "typescript": "4.2.3"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0"

diff --git a/backwards-compatability/node12/package.json b/backwards-compatability/node12/package.json
@@ -12,8 +12,8 @@
     "@opentelemetry/tracing": "^0.18.0"
   },
   "devDependencies": {
-    "@types/node": "12.19.13",
-    "typescript": "4.1.3"
+    "@types/node": "12.20.6",
+    "typescript": "4.2.3"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0"

diff --git a/backwards-compatability/node8/package.json b/backwards-compatability/node8/package.json
@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "@types/node": "8.10.66",
-    "typescript": "4.1.3"
+    "typescript": "4.2.3"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0"

diff --git a/eslint.config.js b/eslint.config.js
@@ -26,6 +26,7 @@ module.exports = {
           "leadingUnderscore": "require"
         }
     ],
+    "no-console": "error",
     "no-shadow": "off",
     "@typescript-eslint/no-shadow": ["warn"],
     "@typescript-eslint/no-unused-vars": ["error", {"argsIgnorePattern": "^_", "args": "after-used"}],

diff --git a/examples/basic-tracer-node/package.json b/examples/basic-tracer-node/package.json
@@ -24,7 +24,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.18.0",
+    "@opentelemetry/api": "^1.0.0-rc.0",
     "@opentelemetry/exporter-jaeger": "^0.18.0",
     "@opentelemetry/tracing": "^0.18.0"
   },

diff --git a/examples/collector-exporter-node/package.json b/examples/collector-exporter-node/package.json
@@ -28,7 +28,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.18.0",
+    "@opentelemetry/api": "^1.0.0-rc.0",
     "@opentelemetry/core": "^0.18.0",
     "@opentelemetry/exporter-collector": "^0.18.0",
     "@opentelemetry/exporter-collector-grpc": "^0.18.0",

diff --git a/examples/grpc-js/package.json b/examples/grpc-js/package.json
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.0.5",
-    "@opentelemetry/api": "^0.18.0",
+    "@opentelemetry/api": "^1.0.0-rc.0",
     "@opentelemetry/exporter-jaeger": "^0.18.0",
     "@opentelemetry/exporter-zipkin": "^0.18.0",
     "@opentelemetry/instrumentation": "^0.18.0",

diff --git a/examples/grpc/package.json b/examples/grpc/package.json
@@ -28,7 +28,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.18.0",
+    "@opentelemetry/api": "^1.0.0-rc.0",
     "@opentelemetry/exporter-jaeger": "^0.18.0",
     "@opentelemetry/exporter-zipkin": "^0.18.0",
     "@opentelemetry/instrumentation": "^0.18.0",

diff --git a/examples/http/package.json b/examples/http/package.json
@@ -28,7 +28,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.18.0",
+    "@opentelemetry/api": "^1.0.0-rc.0",
     "@opentelemetry/exporter-jaeger": "^0.18.0",
     "@opentelemetry/exporter-zipkin": "^0.18.0",
     "@opentelemetry/instrumentation": "^0.18.0",

diff --git a/examples/https/package.json b/examples/https/package.json
@@ -29,7 +29,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.18.0",
+    "@opentelemetry/api": "^1.0.0-rc.0",
     "@opentelemetry/exporter-jaeger": "^0.18.0",
     "@opentelemetry/exporter-zipkin": "^0.18.0",
     "@opentelemetry/instrumentation": "^0.18.0",

diff --git a/examples/tracer-web/README.md b/examples/tracer-web/README.md
@@ -20,14 +20,6 @@ By default, the application will run on port `8090`.
 
 ## Examples
 
-### Document Load
-
-To see the results, open the browser at <http://localhost:8090/document-load/> and make sure you have the browser console open. The application is using the `ConsoleSpanExporter` and will post the created spans to the browser console.
-
-The screen will look as follows:
-
-![Screenshot of the running example](images/document-load.png)
-
 ### XMLHttpRequest
 
 To see the results, open the browser at <http://localhost:8090/xml-http-request/> and make sure you have the browser console open. The application is using the `ConsoleSpanExporter` and will post the created spans to the browser console.

diff --git a/examples/tracer-web/examples/document-load/index.html b/examples/tracer-web/examples/document-load/index.html
diff --git a/examples/tracer-web/examples/document-load/index.js b/examples/tracer-web/examples/document-load/index.js
diff --git a/examples/tracer-web/examples/user-interaction/index.html b/examples/tracer-web/examples/user-interaction/index.html