Merge branch 'master' into fix-express-example

.gitattributes

@@ -0,0 +1,39 @@
+## This .gitattributes file automatically formats the EOL character in certain filetypes within the repository
+
+## Source code
+# JavaScript, TypeScript, c, and h source files
+*.js                    text eol=lf
+*.ts                    text eol=lf
+*.h                     text eol=lf diff=cpp
+*.c                     text eol=lf diff=cpp
+
+# Shell scripts
+*.sh                    text eol=lf
+*.bash                  text eol=lf
+
+# Windows batch and PowerShell scripts
+*.bat                   text eol=crlf
+*.cmd                   text eol=crlf
+*.ps1                   text eol=crlf
+
+##### Other file types #####
+
+## Text files and documentation
+*.txt                   text
+README*                 text
+RELEASING*              text
+CHANGELOG*              text
+CONTRIBUTING*           text
+INSTALL*                text
+LICENSE*                text
+
+## Non-text documentation
+*.html                  text diff=html
+*.pdf                   binary
+*.json                  text
+*.rtf                   binary
+
+## Git Properties
+.gitignore              text
+.gitmodules             text
+.gitattributes          text

CHANGELOG.md

@@ -4,6 +4,39 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## 0.12.0
+
+### :bug: Bug Fix
+
+* [#241](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/241) fix(ioredis): set `net.peer.name` attribute according to spec ([@blumamir](https://github.com/blumamir))
+
+### :rocket: Enhancement
+
+* Other
+  * [#265](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/265) feat: Add GitHub Actions Resource Detector ([@smithclay](https://github.com/smithclay))
+  * [#268](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/268) fix: missing .fields() method in jaeger propagator ([@jtmalinowski](https://github.com/jtmalinowski))
+* `opentelemetry-host-metrics`
+  * [#266](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/266) chore: refactoring host metrics, aligning with semantic conventions ([@obecny](https://github.com/obecny))
+
+### :house: Internal
+
+* `opentelemetry-host-metrics`, `opentelemetry-test-utils`
+  * [#283](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/283) chore: update to OTel v0.14.0 ([@Flarna](https://github.com/Flarna))
+  * [#277](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/277) updating to core v.0.13.0 ([@obecny](https://github.com/obecny))
+* Other
+  * [#259](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/259) fix(plugin-document-load): check if getEntriesByType is available before using it ([@mhennoch](https://github.com/mhennoch))
+  * [#257](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/257) docs(readme): add @opentelemetry/instrumentation-graphql ([@Hongbo-Miao](https://github.com/Hongbo-Miao))
+
+### Committers: 7
+
+* Amir Blum ([@blumamir](https://github.com/blumamir))
+* Bartlomiej Obecny ([@obecny](https://github.com/obecny))
+* Clay Smith ([@smithclay](https://github.com/smithclay))
+* Gerhard Stöbich ([@Flarna](https://github.com/Flarna))
+* Hongbo Miao ([@Hongbo-Miao](https://github.com/Hongbo-Miao))
+* Jakub Malinowski ([@jtmalinowski](https://github.com/jtmalinowski))
+* MartenH ([@mhennoch](https://github.com/mhennoch))
+
 ## 0.11.0
 
 #### :bug: Bug Fix

detectors/node/opentelemetry-resource-detector-github/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-github",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "OpenTelemetry SDK resource detector for GitHub",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -51,7 +51,7 @@
     "codecov": "3.7.2",
     "gts": "2.0.2",
     "mocha": "7.2.0",
-    "nock": "12.0.3",
+    "nock": "13.0.5",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
     "sinon": "9.0.2",

detectors/node/opentelemetry-resource-detector-github/src/version.ts

@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.11.0';
+export const VERSION = '0.12.0';

examples/dns/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dns-example",
   "private": true,
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Example of DNS integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -30,7 +30,7 @@
     "@opentelemetry/exporter-jaeger": "^0.14.0",
     "@opentelemetry/exporter-zipkin": "^0.14.0",
     "@opentelemetry/node": "^0.14.0",
-    "@opentelemetry/plugin-dns": "^0.11.0",
+    "@opentelemetry/plugin-dns": "^0.12.0",
     "@opentelemetry/tracing": "^0.14.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",

examples/express/package.json

@@ -1,7 +1,7 @@
 {
   "name": "express-example",
   "private": true,
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Example of Express integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -32,7 +32,7 @@
     "@opentelemetry/exporter-jaeger": "^0.14.0",
     "@opentelemetry/exporter-zipkin": "^0.14.0",
     "@opentelemetry/node": "^0.14.0",
-    "@opentelemetry/plugin-express": "^0.11.0",
+    "@opentelemetry/plugin-express": "^0.12.0",
     "@opentelemetry/plugin-http": "^0.14.0",
     "@opentelemetry/tracing": "^0.14.0",
     "axios": "^0.19.0",

examples/graphql/package.json

@@ -1,7 +1,7 @@
 {
   "name": "opentelemetry-plugin-graphql-example",
   "private": true,
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Example of using @opentelemetry/plugin-graphql with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -33,9 +33,9 @@
   "dependencies": {
     "@opentelemetry/api": "^0.14.0",
     "@opentelemetry/exporter-collector": "^0.14.0",
+    "@opentelemetry/instrumentation-graphql": "^0.12.0",
     "@opentelemetry/node": "^0.14.0",
-    "@opentelemetry/plugin-express": "^0.11.0",
-    "@opentelemetry/instrumentation-graphql": "^0.11.0",
+    "@opentelemetry/plugin-express": "^0.12.0",
     "@opentelemetry/plugin-http": "^0.14.0",
     "@opentelemetry/plugin-https": "^0.14.0",
     "@opentelemetry/tracing": "^0.14.0",

examples/grpc-census-prop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grpc-census-prop-example",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Example of using propagator-grpc-census-binary",
   "main": "index.js",
   "scripts": {
@@ -38,7 +38,7 @@
     "@opentelemetry/core": "^0.14.0",
     "@opentelemetry/node": "^0.14.0",
     "@opentelemetry/plugin-grpc": "^0.14.0",
-    "@opentelemetry/propagator-grpc-census-binary": "^0.11.0",
+    "@opentelemetry/propagator-grpc-census-binary": "^0.12.0",
     "@opentelemetry/tracing": "^0.14.0",
     "grpc": "^1.24.2",
     "node-pre-gyp": "0.12.0"

examples/hapi/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hapi-example",
   "private": true,
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Example of Hapi auto-instrumentation with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -35,7 +35,7 @@
     "@opentelemetry/api": "^0.14.0",
     "@opentelemetry/exporter-jaeger": "^0.14.0",
     "@opentelemetry/exporter-zipkin": "^0.14.0",
-    "@opentelemetry/hapi-instrumentation": "^0.11.0",
+    "@opentelemetry/hapi-instrumentation": "^0.12.0",
     "@opentelemetry/node": "^0.14.0",
     "@opentelemetry/plugin-http": "^0.14.0",
     "@opentelemetry/tracing": "^0.14.0",

examples/host-metrics/package.json

@@ -1,7 +1,7 @@
 {
   "name": "host-metrics-example",
   "private": true,
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Example of using @opentelemetry/host-metrics",
   "main": "index.js",
   "scripts": {
@@ -30,7 +30,7 @@
     "@opentelemetry/core": "^0.14.0",
     "@opentelemetry/exporter-collector": "^0.14.0",
     "@opentelemetry/exporter-prometheus": "^0.14.0",
-    "@opentelemetry/host-metrics": "^0.11.0",
+    "@opentelemetry/host-metrics": "^0.12.0",
     "@opentelemetry/metrics": "^0.14.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"

examples/ioredis/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ioredis-example",
   "private": true,
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Example of HTTP integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -31,7 +31,7 @@
     "@opentelemetry/api": "^0.14.0",
     "@opentelemetry/exporter-jaeger": "^0.14.0",
     "@opentelemetry/node": "^0.14.0",
-    "@opentelemetry/plugin-ioredis": "^0.11.0",
+    "@opentelemetry/plugin-ioredis": "^0.12.0",
     "@opentelemetry/tracing": "^0.14.0",
     "ioredis": "^4.14.1"
   },

examples/koa/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koa-example",
   "private": true,
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Example of Koa and @koa/router integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -35,7 +35,7 @@
     "@opentelemetry/api": "^0.14.0",
     "@opentelemetry/exporter-jaeger": "^0.14.0",
     "@opentelemetry/exporter-zipkin": "^0.14.0",
-    "@opentelemetry/koa-instrumentation": "^0.11.0",
+    "@opentelemetry/koa-instrumentation": "^0.12.0",
     "@opentelemetry/node": "^0.14.0",
     "@opentelemetry/plugin-http": "^0.14.0",
     "@opentelemetry/tracing": "^0.14.0",

examples/mysql/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mysql-example",
   "private": true,
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Example of mysql integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -33,7 +33,7 @@
     "@opentelemetry/exporter-zipkin": "^0.14.0",
     "@opentelemetry/node": "^0.14.0",
     "@opentelemetry/plugin-http": "^0.14.0",
-    "@opentelemetry/plugin-mysql": "^0.11.0",
+    "@opentelemetry/plugin-mysql": "^0.12.0",
     "@opentelemetry/tracing": "^0.14.0",
     "mysql": "*"
   },

examples/postgres/package.json

@@ -1,7 +1,7 @@
 {
   "name": "postgres-example",
   "private": true,
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Example of Postgres integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -35,8 +35,8 @@
     "@opentelemetry/exporter-zipkin": "^0.14.0",
     "@opentelemetry/node": "^0.14.0",
     "@opentelemetry/plugin-http": "^0.14.0",
-    "@opentelemetry/plugin-pg": "^0.11.0",
-    "@opentelemetry/plugin-pg-pool": "^0.11.0",
+    "@opentelemetry/plugin-pg": "^0.12.0",
+    "@opentelemetry/plugin-pg-pool": "^0.12.0",
     "@opentelemetry/tracing": "^0.14.0",
     "express": "^4.17.1",
     "pg": "^7.12.1"

examples/redis/package.json

@@ -1,7 +1,7 @@
 {
   "name": "redis-example",
   "private": true,
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Example of HTTP integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -35,7 +35,7 @@
     "@opentelemetry/exporter-zipkin": "^0.14.0",
     "@opentelemetry/node": "^0.14.0",
     "@opentelemetry/plugin-http": "^0.14.0",
-    "@opentelemetry/plugin-redis": "^0.11.0",
+    "@opentelemetry/plugin-redis": "^0.12.0",
     "@opentelemetry/tracing": "^0.14.0",
     "axios": "^0.19.0",
     "express": "^4.17.1",

lerna.json

@@ -9,7 +9,7 @@
     "propagators/*",
     "detectors/node/*"
   ],
-  "version": "0.11.0",
+  "version": "0.12.0",
   "changelog": {
     "repo": "open-telemetry/opentelemetry-js-contrib",
     "labels": {

metapackages/plugins-node-core-and-contrib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@opentelemetry/plugins-node-core-and-contrib",
-    "version": "0.11.0",
+    "version": "0.12.0",
     "description": "Metapackage which bundles opentelemetry node core and contrib plugins",
     "author": "OpenTelemetry Authors",
     "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
@@ -16,13 +16,13 @@
         "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
     },
     "dependencies": {
-        "@opentelemetry/plugin-express": "^0.11.0",
-        "@opentelemetry/plugin-ioredis": "^0.11.0",
-        "@opentelemetry/plugin-mongodb": "^0.11.0",
-        "@opentelemetry/plugin-mysql": "^0.11.0",
-        "@opentelemetry/plugin-pg": "^0.11.0",
-        "@opentelemetry/plugin-pg-pool": "^0.11.0",
-        "@opentelemetry/plugin-redis": "^0.11.0",
+        "@opentelemetry/plugin-express": "^0.12.0",
+        "@opentelemetry/plugin-ioredis": "^0.12.0",
+        "@opentelemetry/plugin-mongodb": "^0.12.0",
+        "@opentelemetry/plugin-mysql": "^0.12.0",
+        "@opentelemetry/plugin-pg": "^0.12.0",
+        "@opentelemetry/plugin-pg-pool": "^0.12.0",
+        "@opentelemetry/plugin-redis": "^0.12.0",
         "@opentelemetry/plugins-node-core": "^0.14.0"
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "opentelemetry-contrib",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "This is a repository for OpenTelemetry JavaScript contributions.",
   "repository": {
     "type": "git",

packages/opentelemetry-host-metrics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/host-metrics",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "OpenTelemetry Host Metrics for Node.js",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",

packages/opentelemetry-host-metrics/src/version.ts

@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.11.0';
+export const VERSION = '0.12.0';

packages/opentelemetry-test-utils/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opentelemetry/test-utils",
   "private": true,
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Test utilities.",
   "main": "build/testUtils.js",
   "scripts": {

plugins/node/opentelemetry-hapi-instrumentation/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/hapi-instrumentation",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "OpenTelemetry Hapi automatic instrumentation package.",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",

plugins/node/opentelemetry-hapi-instrumentation/src/version.ts

@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.11.0';
+export const VERSION = '0.12.0';

plugins/node/opentelemetry-instrumentation-graphql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/instrumentation-graphql",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "OpenTelemetry @opentelemetry/instrumentation-graphql automatic instrumentation package.",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",