Merge branch 'master' into fix-279

open-telemetry · Jan 18, 2021 · 4a0d41f · 4a0d41f
2 parents 102f8db + 0fe7949
commit 4a0d41f
Show file tree

Hide file tree

Showing 63 changed files with 530 additions and 292 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,35 @@
+name: "CodeQL Analysis"
+
+on:
+ workflow_dispatch:
+ schedule:
+ # ┌───────────── minute (0 - 59)
+ # │ ┌───────────── hour (0 - 23)
+ # │ │ ┌───────────── day of the month (1 - 31)
+ # │ │ │ ┌───────────── month (1 - 12 or JAN-DEC)
+ # │ │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
+ # │ │ │ │ │
+ # │ │ │ │ │
+ # │ │ │ │ │
+ # * * * * *
+ - cron: '30 1 * * *'
+
+jobs:
+ CodeQL-Build:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v2
+
+ # Initializes the CodeQL tools for scanning.
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v1
+ with:
+ languages: javascript
+
+ - name: Autobuild
+ uses: github/codeql-action/autobuild@v1
+
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,29 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## 0.12.1
+
+#### :bug: Bug Fix
+
+* [#299](https:/open-telemetry/opentelemetry-js-contrib/pull/299) chore: fixing parent span for graphql ([@obecny](https:/obecny))
+* [#300](https:/open-telemetry/opentelemetry-js-contrib/pull/300) chore: fixing async resolvers for graphql ([@obecny](https:/obecny))
+* [#290](https:/open-telemetry/opentelemetry-js-contrib/pull/290) docs: fix links to examples ([@aabmass](https:/aabmass))
+
+#### :rocket: Enhancement
+
+* [#273](https:/open-telemetry/opentelemetry-js-contrib/pull/273) feat: enable root span route instrumentation without any express layer spans ([@shyimo](https:/shyimo))
+* [#298](https:/open-telemetry/opentelemetry-js-contrib/pull/298) Add CodeQL Security Scans ([@amanbrar1999](https:/amanbrar1999))
+
+#### Committers: 7
+
+* Aaron Abbott ([@aabmass](https:/aabmass))
+* Aman Brar ([@amanbrar1999](https:/amanbrar1999))
+* Bartlomiej Obecny ([@obecny](https:/obecny))
+* Dobes Vandermeer ([@dobesv](https:/dobesv))
+* Gerhard Stöbich ([@Flarna](https:/Flarna))
+* Johannes Würbach ([@johanneswuerbach](https:/johanneswuerbach))
+* Shai Moria ([@shyimo](https:/shyimo))
+
 ## 0.12.0
 
 ### :bug: Bug Fix

diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opentelemetry/resource-detector-github",
- "version": "0.12.0",
+ "version": "0.12.1",
  "description": "OpenTelemetry SDK resource detector for GitHub",
  "main": "build/src/index.js",
  "types": "build/src/index.d.ts",

diff --git a/detectors/node/opentelemetry-resource-detector-github/src/version.ts b/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.12.0';
+export const VERSION = '0.12.1';
diff --git a/examples/dns/package.json b/examples/dns/package.json
@@ -1,7 +1,7 @@
 {
  "name": "dns-example",
  "private": true,
- "version": "0.12.0",
+ "version": "0.12.1",
  "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.12.0",
+ "@opentelemetry/plugin-dns": "^0.12.1",
  "@opentelemetry/tracing": "^0.14.0"
  },
  "homepage": "https:/open-telemetry/opentelemetry-js#readme",

diff --git a/examples/express/package.json b/examples/express/package.json
@@ -1,7 +1,7 @@
 {
  "name": "express-example",
  "private": true,
- "version": "0.12.0",
+ "version": "0.12.1",
  "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.12.0",
+ "@opentelemetry/plugin-express": "^0.12.1",
  "@opentelemetry/plugin-http": "^0.14.0",
  "@opentelemetry/tracing": "^0.14.0",
  "axios": "^0.19.0",

diff --git a/examples/graphql/docker/docker-compose.yaml b/examples/graphql/docker/docker-compose.yaml
@@ -3,7 +3,7 @@ services:
  # Collector
  collector:
 # image: otel/opentelemetry-collector:latest
- image: otel/opentelemetry-collector:0.13.0
+ image: otel/opentelemetry-collector:0.16.0
  command: ["--config=/conf/collector-config.yaml", "--log-level=DEBUG"]
  volumes:
  - ./collector-config.yaml:/conf/collector-config.yaml

diff --git a/examples/graphql/package.json b/examples/graphql/package.json
@@ -1,7 +1,7 @@
 {
  "name": "opentelemetry-plugin-graphql-example",
  "private": true,
- "version": "0.12.0",
+ "version": "0.12.1",
  "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/instrumentation-graphql": "^0.12.1",
  "@opentelemetry/node": "^0.14.0",
- "@opentelemetry/plugin-express": "^0.12.0",
+ "@opentelemetry/plugin-express": "^0.12.1",
  "@opentelemetry/plugin-http": "^0.14.0",
  "@opentelemetry/plugin-https": "^0.14.0",
  "@opentelemetry/tracing": "^0.14.0",

diff --git a/examples/grpc-census-prop/package.json b/examples/grpc-census-prop/package.json
@@ -1,6 +1,6 @@
 {
  "name": "grpc-census-prop-example",
- "version": "0.12.0",
+ "version": "0.12.1",
  "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.12.0",
+ "@opentelemetry/propagator-grpc-census-binary": "^0.12.1",
  "@opentelemetry/tracing": "^0.14.0",
  "grpc": "^1.24.2",
  "node-pre-gyp": "0.12.0"

diff --git a/examples/hapi/package.json b/examples/hapi/package.json
@@ -1,7 +1,7 @@
 {
  "name": "hapi-example",
  "private": true,
- "version": "0.12.0",
+ "version": "0.12.1",
  "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.12.0",
+ "@opentelemetry/hapi-instrumentation": "^0.12.1",
  "@opentelemetry/node": "^0.14.0",
  "@opentelemetry/plugin-http": "^0.14.0",
  "@opentelemetry/tracing": "^0.14.0",

diff --git a/examples/host-metrics/package.json b/examples/host-metrics/package.json
@@ -1,7 +1,7 @@
 {
  "name": "host-metrics-example",
  "private": true,
- "version": "0.12.0",
+ "version": "0.12.1",
  "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.12.0",
+ "@opentelemetry/host-metrics": "^0.12.1",
  "@opentelemetry/metrics": "^0.14.0"
  },
  "homepage": "https:/open-telemetry/opentelemetry-js#readme"

diff --git a/examples/ioredis/package.json b/examples/ioredis/package.json
@@ -1,7 +1,7 @@
 {
  "name": "ioredis-example",
  "private": true,
- "version": "0.12.0",
+ "version": "0.12.1",
  "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.12.0",
+ "@opentelemetry/plugin-ioredis": "^0.12.1",
  "@opentelemetry/tracing": "^0.14.0",
  "ioredis": "^4.14.1"
  },

diff --git a/examples/koa/package.json b/examples/koa/package.json
@@ -1,7 +1,7 @@
 {
  "name": "koa-example",
  "private": true,
- "version": "0.12.0",
+ "version": "0.12.1",
  "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.12.0",
+ "@opentelemetry/koa-instrumentation": "^0.12.1",
  "@opentelemetry/node": "^0.14.0",
  "@opentelemetry/plugin-http": "^0.14.0",
  "@opentelemetry/tracing": "^0.14.0",

diff --git a/examples/mysql/package.json b/examples/mysql/package.json
@@ -1,7 +1,7 @@
 {
  "name": "mysql-example",
  "private": true,
- "version": "0.12.0",
+ "version": "0.12.1",
  "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.12.0",
+ "@opentelemetry/plugin-mysql": "^0.12.1",
  "@opentelemetry/tracing": "^0.14.0",
  "mysql": "*"
  },

diff --git a/examples/postgres/package.json b/examples/postgres/package.json
@@ -1,7 +1,7 @@
 {
  "name": "postgres-example",
  "private": true,
- "version": "0.12.0",
+ "version": "0.12.1",
  "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.12.0",
- "@opentelemetry/plugin-pg-pool": "^0.12.0",
+ "@opentelemetry/plugin-pg": "^0.12.1",
+ "@opentelemetry/plugin-pg-pool": "^0.12.1",
  "@opentelemetry/tracing": "^0.14.0",
  "express": "^4.17.1",
  "pg": "^7.12.1"

diff --git a/examples/redis/package.json b/examples/redis/package.json
@@ -1,7 +1,7 @@
 {
  "name": "redis-example",
  "private": true,
- "version": "0.12.0",
+ "version": "0.12.1",
  "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.12.0",
+ "@opentelemetry/plugin-redis": "^0.12.1",
  "@opentelemetry/tracing": "^0.14.0",
  "axios": "^0.19.0",
  "express": "^4.17.1",

diff --git a/lerna.json b/lerna.json
@@ -9,7 +9,7 @@
  "propagators/*",
  "detectors/node/*"
  ],
- "version": "0.12.0",
+ "version": "0.12.1",
  "changelog": {
  "repo": "open-telemetry/opentelemetry-js-contrib",
  "labels": {

diff --git a/metapackages/plugins-node-core-and-contrib/package.json b/metapackages/plugins-node-core-and-contrib/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opentelemetry/plugins-node-core-and-contrib",
- "version": "0.12.0",
+ "version": "0.12.1",
  "description": "Metapackage which bundles opentelemetry node core and contrib plugins",
  "author": "OpenTelemetry Authors",
  "homepage": "https:/open-telemetry/opentelemetry-js#readme",
@@ -16,13 +16,13 @@
  "url": "https:/open-telemetry/opentelemetry-js/issues"
  },
  "dependencies": {
- "@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/plugin-express": "^0.12.1",
+ "@opentelemetry/plugin-ioredis": "^0.12.1",
+ "@opentelemetry/plugin-mongodb": "^0.12.1",
+ "@opentelemetry/plugin-mysql": "^0.12.1",
+ "@opentelemetry/plugin-pg": "^0.12.1",
+ "@opentelemetry/plugin-pg-pool": "^0.12.1",
+ "@opentelemetry/plugin-redis": "^0.12.1",
  "@opentelemetry/plugins-node-core": "^0.14.0"
  }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "opentelemetry-contrib",
- "version": "0.12.0",
+ "version": "0.12.1",
  "description": "This is a repository for OpenTelemetry JavaScript contributions.",
  "repository": {
  "type": "git",

diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opentelemetry/host-metrics",
- "version": "0.12.0",
+ "version": "0.12.1",
  "description": "OpenTelemetry Host Metrics for Node.js",
  "main": "build/src/index.js",
  "types": "build/src/index.d.ts",

diff --git a/packages/opentelemetry-host-metrics/src/version.ts b/packages/opentelemetry-host-metrics/src/version.ts
@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.12.0';
+export const VERSION = '0.12.1';
diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@opentelemetry/test-utils",
  "private": true,
- "version": "0.12.0",
+ "version": "0.12.1",
  "description": "Test utilities.",
  "main": "build/testUtils.js",
  "scripts": {

diff --git a/plugins/node/opentelemetry-hapi-instrumentation/package.json b/plugins/node/opentelemetry-hapi-instrumentation/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opentelemetry/hapi-instrumentation",
- "version": "0.12.0",
+ "version": "0.12.1",
  "description": "OpenTelemetry Hapi automatic instrumentation package.",
  "main": "build/src/index.js",
  "types": "build/src/index.d.ts",

diff --git a/plugins/node/opentelemetry-hapi-instrumentation/src/version.ts b/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.12.0';
+export const VERSION = '0.12.1';
diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opentelemetry/instrumentation-graphql",
- "version": "0.12.0",
+ "version": "0.12.1",
  "description": "OpenTelemetry @opentelemetry/instrumentation-graphql automatic instrumentation package.",
  "main": "build/src/index.js",
  "types": "build/src/index.d.ts",