Merge branch 'master' into fix-express-async-layer

open-telemetry · Aug 31, 2020 · 0071af0 · 0071af0
2 parents 5ec7473 + 5634e04
commit 0071af0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -78,3 +78,7 @@ package.json.lerna_backup
 
 # VsCode configs
 .vscode/
+
+*.iml
+.idea
+
diff --git a/README.md b/README.md
@@ -88,6 +88,8 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
 
 [node-gitter-url]: https://gitter.im/open-telemetry/opentelemetry-node?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
 [license-url]: https://github.com/open-telemetry/opentelemetry-js-contrib/blob/master/LICENSE
+[up-for-grabs-issues]: https://github.com/open-telemetry/opentelemetry-js-contrib/issues?q=is%3Aissue+is%3Aopen+label%3Aup-for-grabs
+[good-first-issues]: https://github.com/open-telemetry/openTelemetry-js-contrib/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22
 [otel-plugin-grpc]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-grpc
 [otel-plugin-http]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-http
 [otel-plugin-https]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-https
@@ -101,5 +103,5 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
 [otel-plugin-pg]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-pg
 [otel-plugin-redis]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-redis
 [otel-plugin-user-interaction]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web/opentelemetry-plugin-user-interaction
-[otel-plugin-xml-http-request]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web/opentelemetry-plugin-xml-http-request
+[otel-plugin-xml-http-request]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-xml-http-request
 [otel-plugin-express]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-express
diff --git a/plugins/node/opentelemetry-hapi-instrumentation/src/version.ts b/plugins/node/opentelemetry-hapi-instrumentation/src/version.ts
@@ -13,4 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+// this is autogenerated file, see scripts/version-update.js
 export const VERSION = '0.9.0';
diff --git a/plugins/node/opentelemetry-koa-instrumentation/src/version.ts b/plugins/node/opentelemetry-koa-instrumentation/src/version.ts
@@ -13,4 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+// this is autogenerated file, see scripts/version-update.js
 export const VERSION = '0.9.0';
diff --git a/plugins/web/opentelemetry-plugin-user-interaction/package.json b/plugins/web/opentelemetry-plugin-user-interaction/package.json
@@ -77,7 +77,8 @@
     "typescript": "3.9.7",
     "webpack": "4.44.1",
     "webpack-cli": "3.3.12",
-    "webpack-merge": "5.1.1"
+    "webpack-merge": "5.1.1",
+    "zone.js": "0.10.3"
   },
   "dependencies": {
     "@opentelemetry/api": "^0.10.2",
@@ -86,7 +87,7 @@
     "shimmer": "^1.2.1"
   },
   "peerDependencies": {
-    "zone.js": "^0.10.3"
+    "zone.js": "0.10.3"
   },
   "sideEffects": false
 }