Skip to content

Commit

Permalink
Merge branch 'main' into feat/mysql2-instrumentation
Browse files Browse the repository at this point in the history
  • Loading branch information
@rauno56
rauno56 committed Jun 14, 2021
2 parents 6179ab1 + 676dbbc commit 15a555c
Show file tree
Hide file tree
Showing 63 changed files with 412 additions and 395 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Expand Up @@ -3,7 +3,7 @@ on:
pull_request:
branches: [main]
types: [closed]

jobs:
publish_to_npm:
name: Publish to NPM and GitHub
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-pr.yml
View file
Expand Up @@ -10,7 +10,7 @@ jobs:
create_release_pr:
name: Create Release PR and Draft Release
runs-on: ubuntu-latest
steps:
steps:
- name: Checkout Repository
uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -56,8 +56,8 @@ jobs:
branch: release/${{ github.event.inputs.version }}
commit-message: 'chore: ${{ github.event.inputs.version }} release proposal'
title: 'chore: ${{ github.event.inputs.version }} release proposal'
body: |
body: |
This is an auto-generated release PR. If additional changes need to be incorporated before the release, the CHANGELOG must be updated manually.
Merging this PR will automatically release all packages to NPM.
delete-branch: true
8 changes: 5 additions & 3 deletions .github/workflows/unit-test.yml
View file
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false
matrix:
container: ["node:8", "node:10", "node:12", "node:14"]
container: ["node:8", "node:10", "node:12", "node:14", "node:16"]
runs-on: ubuntu-latest
container:
image: ${{ matrix.container }}
Expand Down Expand Up @@ -91,7 +91,9 @@ jobs:
key: ${{ runner.os }}-${{ matrix.container }}-${{ hashFiles('**/package.json') }}
- name: Install Root Dependencies
run: npm install --ignore-scripts
- name: Boostrap Dependencies
- name: Fix npm cache permissions
run: chown -R 1001:121 "/github/home/.npm"
- name: Bootstrap Dependencies
run: npx lerna bootstrap --no-ci
- name: Unit tests
run: npm run test
Expand Down Expand Up @@ -124,7 +126,7 @@ jobs:
key: ${{ runner.os }}-node:12-${{ hashFiles('**/package.json') }}
- name: Install Root Dependencies
run: npm install --ignore-scripts
- name: Boostrap Dependencies
- name: Bootstrap Dependencies
run: npx lerna bootstrap --no-ci
- name: Unit tests
run: npm run test:browser
Expand Down
8 changes: 4 additions & 4 deletions detectors/node/opentelemetry-resource-detector-github/package.json
View file
Expand Up @@ -43,12 +43,12 @@
"access": "public"
},
"peerDependencies": {
"@opentelemetry/api": "^0.20.0"
"@opentelemetry/api": "^0.21.0"
},
"devDependencies": {
"@opentelemetry/api": "0.20.0",
"@opentelemetry/api": "0.21.0",
"@types/mocha": "8.2.2",
"@types/node": "14.17.2",
"@types/node": "14.17.3",
"@types/sinon": "10.0.2",
"codecov": "3.8.2",
"gts": "3.1.0",
Expand All @@ -60,6 +60,6 @@
"typescript": "4.3.2"
},
"dependencies": {
"@opentelemetry/resources": "^0.20.0"
"@opentelemetry/resources": "^0.21.0"
}
}
12 changes: 6 additions & 6 deletions examples/dns/package.json
View file
Expand Up @@ -26,13 +26,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.20.0",
"@opentelemetry/exporter-jaeger": "^0.20.0",
"@opentelemetry/exporter-zipkin": "^0.20.0",
"@opentelemetry/instrumentation": "^0.20.0",
"@opentelemetry/api": "^0.21.0",
"@opentelemetry/exporter-jaeger": "^0.21.0",
"@opentelemetry/exporter-zipkin": "^0.21.0",
"@opentelemetry/instrumentation": "^0.21.0",
"@opentelemetry/instrumentation-dns": "^0.15.0",
"@opentelemetry/node": "^0.20.0",
"@opentelemetry/tracing": "^0.20.0"
"@opentelemetry/node": "^0.21.0",
"@opentelemetry/tracing": "^0.21.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
"devDependencies": {
Expand Down
14 changes: 7 additions & 7 deletions examples/express/package.json
View file
Expand Up @@ -28,14 +28,14 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.20.0",
"@opentelemetry/exporter-jaeger": "^0.20.0",
"@opentelemetry/exporter-zipkin": "^0.20.0",
"@opentelemetry/instrumentation": "^0.20.0",
"@opentelemetry/api": "^0.21.0",
"@opentelemetry/exporter-jaeger": "^0.21.0",
"@opentelemetry/exporter-zipkin": "^0.21.0",
"@opentelemetry/instrumentation": "^0.21.0",
"@opentelemetry/instrumentation-express": "^0.15.0",
"@opentelemetry/instrumentation-http": "^0.20.0",
"@opentelemetry/node": "^0.20.0",
"@opentelemetry/tracing": "^0.20.0",
"@opentelemetry/instrumentation-http": "^0.21.0",
"@opentelemetry/node": "^0.21.0",
"@opentelemetry/tracing": "^0.21.0",
"axios": "^0.21.1",
"cross-env": "^7.0.3",
"express": "^4.17.1"
Expand Down
10 changes: 5 additions & 5 deletions examples/graphql/package.json
View file
Expand Up @@ -31,13 +31,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/exporter-collector": "^0.20.0",
"@opentelemetry/instrumentation": "^0.20.0",
"@opentelemetry/exporter-collector": "^0.21.0",
"@opentelemetry/instrumentation": "^0.21.0",
"@opentelemetry/instrumentation-graphql": "^0.15.0",
"@opentelemetry/node": "^0.20.0",
"@opentelemetry/node": "^0.21.0",
"@opentelemetry/instrumentation-express": "^0.15.0",
"@opentelemetry/instrumentation-http": "^0.20.0",
"@opentelemetry/tracing": "^0.20.0",
"@opentelemetry/instrumentation-http": "^0.21.0",
"@opentelemetry/tracing": "^0.21.0",
"apollo-server": "^2.18.1",
"express": "^4.17.1",
"express-graphql": "^0.11.0",
Expand Down
12 changes: 6 additions & 6 deletions examples/grpc-census-prop/package.json
View file
Expand Up @@ -34,13 +34,13 @@
"@opencensus/instrumentation-grpc": "0.0.21",
"@opencensus/nodejs": "0.0.21",
"@opencensus/propagation-binaryformat": "0.0.21",
"@opentelemetry/api": "^0.20.0",
"@opentelemetry/core": "^0.20.0",
"@opentelemetry/instrumentation": "^0.20.0",
"@opentelemetry/instrumentation-grpc": "^0.20.0",
"@opentelemetry/node": "^0.20.0",
"@opentelemetry/api": "^0.21.0",
"@opentelemetry/core": "^0.21.0",
"@opentelemetry/instrumentation": "^0.21.0",
"@opentelemetry/instrumentation-grpc": "^0.21.0",
"@opentelemetry/node": "^0.21.0",
"@opentelemetry/propagator-grpc-census-binary": "^0.15.0",
"@opentelemetry/tracing": "^0.20.0",
"@opentelemetry/tracing": "^0.21.0",
"grpc": "^1.24.2"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
Expand Down
12 changes: 6 additions & 6 deletions examples/grpc_dynamic_codegen/package.json
View file
Expand Up @@ -28,12 +28,12 @@
},
"dependencies": {
"@grpc/proto-loader": "^0.4.0",
"@opentelemetry/api": "^0.20.0",
"@opentelemetry/exporter-jaeger": "^0.20.0",
"@opentelemetry/exporter-zipkin": "^0.20.0",
"@opentelemetry/node": "^0.20.0",
"@opentelemetry/instrumentation-grpc": "^0.20.0",
"@opentelemetry/tracing": "^0.20.0",
"@opentelemetry/api": "^0.21.0",
"@opentelemetry/exporter-jaeger": "^0.21.0",
"@opentelemetry/exporter-zipkin": "^0.21.0",
"@opentelemetry/node": "^0.21.0",
"@opentelemetry/instrumentation-grpc": "^0.21.0",
"@opentelemetry/tracing": "^0.21.0",
"grpc": "^1.24.6"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
Expand Down
14 changes: 7 additions & 7 deletions examples/hapi/package.json
View file
Expand Up @@ -32,14 +32,14 @@
},
"dependencies": {
"@hapi/hapi": "^19.2.0",
"@opentelemetry/api": "^0.20.0",
"@opentelemetry/exporter-jaeger": "^0.20.0",
"@opentelemetry/exporter-zipkin": "^0.20.0",
"@opentelemetry/instrumentation": "^0.20.0",
"@opentelemetry/api": "^0.21.0",
"@opentelemetry/exporter-jaeger": "^0.21.0",
"@opentelemetry/exporter-zipkin": "^0.21.0",
"@opentelemetry/instrumentation": "^0.21.0",
"@opentelemetry/instrumentation-hapi": "^0.15.0",
"@opentelemetry/instrumentation-http": "^0.20.0",
"@opentelemetry/node": "^0.20.0",
"@opentelemetry/tracing": "^0.20.0",
"@opentelemetry/instrumentation-http": "^0.21.0",
"@opentelemetry/node": "^0.21.0",
"@opentelemetry/tracing": "^0.21.0",
"axios": "^0.21.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
Expand Down
12 changes: 6 additions & 6 deletions examples/host-metrics/package.json
View file
Expand Up @@ -26,13 +26,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.20.0",
"@opentelemetry/core": "^0.20.0",
"@opentelemetry/exporter-collector": "^0.20.0",
"@opentelemetry/exporter-prometheus": "^0.20.0",
"@opentelemetry/api": "^0.21.0",
"@opentelemetry/core": "^0.21.0",
"@opentelemetry/exporter-collector": "^0.21.0",
"@opentelemetry/exporter-prometheus": "^0.21.0",
"@opentelemetry/host-metrics": "^0.15.0",
"@opentelemetry/instrumentation": "^0.20.0",
"@opentelemetry/metrics": "^0.20.0"
"@opentelemetry/instrumentation": "^0.21.0",
"@opentelemetry/metrics": "^0.21.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
}
10 changes: 5 additions & 5 deletions examples/ioredis/package.json
View file
Expand Up @@ -28,12 +28,12 @@
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.20.0",
"@opentelemetry/exporter-jaeger": "^0.20.0",
"@opentelemetry/instrumentation": "^0.20.0",
"@opentelemetry/api": "^0.21.0",
"@opentelemetry/exporter-jaeger": "^0.21.0",
"@opentelemetry/instrumentation": "^0.21.0",
"@opentelemetry/instrumentation-ioredis": "^0.15.0",
"@opentelemetry/node": "^0.20.0",
"@opentelemetry/tracing": "^0.20.0",
"@opentelemetry/node": "^0.21.0",
"@opentelemetry/tracing": "^0.21.0",
"ioredis": "^4.22.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme"
Expand Down
14 changes: 7 additions & 7 deletions examples/koa/package.json
View file
Expand Up @@ -32,14 +32,14 @@
},
"dependencies": {
"@koa/router": "^9.3.1",
"@opentelemetry/api": "^0.20.0",
"@opentelemetry/exporter-jaeger": "^0.20.0",
"@opentelemetry/exporter-zipkin": "^0.20.0",
"@opentelemetry/instrumentation": "^0.20.0",
"@opentelemetry/instrumentation-http": "^0.20.0",
"@opentelemetry/api": "^0.21.0",
"@opentelemetry/exporter-jaeger": "^0.21.0",
"@opentelemetry/exporter-zipkin": "^0.21.0",
"@opentelemetry/instrumentation": "^0.21.0",
"@opentelemetry/instrumentation-http": "^0.21.0",
"@opentelemetry/instrumentation-koa": "^0.15.0",
"@opentelemetry/node": "^0.20.0",
"@opentelemetry/tracing": "^0.20.0",
"@opentelemetry/node": "^0.21.0",
"@opentelemetry/tracing": "^0.21.0",
"axios": "^0.21.1",
"koa": "^2.13.0"
},
Expand Down
10 changes: 5 additions & 5 deletions examples/meta-node/package.json
View file
Expand Up @@ -35,12 +35,12 @@
"eslint": "^7.4.0"
},
"dependencies": {
"@opentelemetry/api": "^0.20.0",
"@opentelemetry/api": "^0.21.0",
"@opentelemetry/auto-instrumentations-node": "^0.15.0",
"@opentelemetry/exporter-collector": "^0.20.0",
"@opentelemetry/instrumentation": "^0.20.0",
"@opentelemetry/node": "^0.20.0",
"@opentelemetry/tracing": "^0.20.0",
"@opentelemetry/exporter-collector": "^0.21.0",
"@opentelemetry/instrumentation": "^0.21.0",
"@opentelemetry/node": "^0.21.0",
"@opentelemetry/tracing": "^0.21.0",
"axios": "^0.21.1",
"express": "^4.17.1"
}
Expand Down
14 changes: 7 additions & 7 deletions examples/mongodb/package.json
View file
Expand Up @@ -28,14 +28,14 @@
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.20.0",
"@opentelemetry/exporter-jaeger": "^0.20.0",
"@opentelemetry/exporter-zipkin": "^0.20.0",
"@opentelemetry/instrumentation": "^0.20.0",
"@opentelemetry/instrumentation-http": "^0.20.0",
"@opentelemetry/api": "^0.21.0",
"@opentelemetry/exporter-jaeger": "^0.21.0",
"@opentelemetry/exporter-zipkin": "^0.21.0",
"@opentelemetry/instrumentation": "^0.21.0",
"@opentelemetry/instrumentation-http": "^0.21.0",
"@opentelemetry/instrumentation-mongodb": "^0.15.0",
"@opentelemetry/node": "^0.20.0",
"@opentelemetry/tracing": "^0.20.0",
"@opentelemetry/node": "^0.21.0",
"@opentelemetry/tracing": "^0.21.0",
"mongodb": "^3.5.7"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
Expand Down
14 changes: 7 additions & 7 deletions examples/mysql/package.json
View file
Expand Up @@ -28,14 +28,14 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.20.0",
"@opentelemetry/exporter-jaeger": "^0.20.0",
"@opentelemetry/exporter-zipkin": "^0.20.0",
"@opentelemetry/instrumentation": "^0.20.0",
"@opentelemetry/instrumentation-http": "^0.20.0",
"@opentelemetry/api": "^0.21.0",
"@opentelemetry/exporter-jaeger": "^0.21.0",
"@opentelemetry/exporter-zipkin": "^0.21.0",
"@opentelemetry/instrumentation": "^0.21.0",
"@opentelemetry/instrumentation-http": "^0.21.0",
"@opentelemetry/instrumentation-mysql": "^0.15.0",
"@opentelemetry/node": "^0.20.0",
"@opentelemetry/tracing": "^0.20.0",
"@opentelemetry/node": "^0.21.0",
"@opentelemetry/tracing": "^0.21.0",
"mysql": "*"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
Expand Down
14 changes: 7 additions & 7 deletions examples/network/package.json
View file
Expand Up @@ -27,15 +27,15 @@
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.20.0",
"@opentelemetry/exporter-jaeger": "^0.20.0",
"@opentelemetry/exporter-zipkin": "^0.20.0",
"@opentelemetry/instrumentation": "^0.20.0",
"@opentelemetry/api": "^0.21.0",
"@opentelemetry/exporter-jaeger": "^0.21.0",
"@opentelemetry/exporter-zipkin": "^0.21.0",
"@opentelemetry/instrumentation": "^0.21.0",
"@opentelemetry/instrumentation-net": "file:../../plugins/node/opentelemetry-instrumentation-net",
"@opentelemetry/instrumentation-http": "^0.20.0",
"@opentelemetry/instrumentation-http": "^0.21.0",
"@opentelemetry/instrumentation-dns": "^0.15.0",
"@opentelemetry/node": "^0.20.0",
"@opentelemetry/tracing": "^0.20.0"
"@opentelemetry/node": "^0.21.0",
"@opentelemetry/tracing": "^0.21.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
"devDependencies": {
Expand Down
14 changes: 7 additions & 7 deletions examples/postgres/package.json
View file
Expand Up @@ -30,14 +30,14 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.20.0",
"@opentelemetry/exporter-jaeger": "^0.20.0",
"@opentelemetry/exporter-zipkin": "^0.20.0",
"@opentelemetry/instrumentation": "^0.20.0",
"@opentelemetry/instrumentation-http": "^0.20.0",
"@opentelemetry/api": "^0.21.0",
"@opentelemetry/exporter-jaeger": "^0.21.0",
"@opentelemetry/exporter-zipkin": "^0.21.0",
"@opentelemetry/instrumentation": "^0.21.0",
"@opentelemetry/instrumentation-http": "^0.21.0",
"@opentelemetry/instrumentation-pg": "^0.16.0",
"@opentelemetry/node": "^0.20.0",
"@opentelemetry/tracing": "^0.20.0",
"@opentelemetry/node": "^0.21.0",
"@opentelemetry/tracing": "^0.21.0",
"express": "^4.17.1",
"pg": "^8.6.0"
},
Expand Down
8 changes: 4 additions & 4 deletions examples/react-load/preact/package.json
View file
Expand Up @@ -37,11 +37,11 @@
"sirv-cli": "1.0.3"
},
"dependencies": {
"@opentelemetry/context-zone": "^0.20.0",
"@opentelemetry/exporter-collector": "^0.20.0",
"@opentelemetry/context-zone": "^0.21.0",
"@opentelemetry/exporter-collector": "^0.21.0",
"@opentelemetry/plugin-react-load": "^0.15.0",
"@opentelemetry/tracing": "^0.20.0",
"@opentelemetry/web": "^0.20.0",
"@opentelemetry/tracing": "^0.21.0",
"@opentelemetry/web": "^0.21.0",
"preact": "^10.3.2",
"preact-render-to-string": "^5.1.4",
"preact-router": "^3.2.1"
Expand Down

0 comments on commit 15a555c

Please sign in to comment.