From d87c196bb60fce16496b8e64a9c92d6a158e09a2 Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Tue, 17 Aug 2021 09:28:32 -0400 Subject: [PATCH 1/4] chore: hoist dependencies to speed up ci --- .github/workflows/canary.yaml | 4 ++-- .github/workflows/docs.yaml | 4 ++-- .github/workflows/lint.yml | 4 ++-- .github/workflows/unit-test.yml | 8 ++++---- examples/grpc-js/package.json | 2 +- package.json | 2 +- packages/opentelemetry-core/package.json | 2 +- .../opentelemetry-exporter-collector-grpc/package.json | 4 ++-- .../opentelemetry-exporter-collector-proto/package.json | 2 +- packages/opentelemetry-instrumentation-http/package.json | 2 +- packages/opentelemetry-sdk-trace-node/package.json | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/canary.yaml b/.github/workflows/canary.yaml index 2591f0295a..e905410ef6 100644 --- a/.github/workflows/canary.yaml +++ b/.github/workflows/canary.yaml @@ -42,14 +42,14 @@ jobs: if: steps.cache.outputs.cache-hit != 'true' run: | npm install --ignore-scripts - npx lerna bootstrap --no-ci + npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' npm run compile - name: Install and Build (cache hit) 🔧 if: steps.cache.outputs.cache-hit == 'true' run: | npm ci --ignore-scripts - npx lerna bootstrap + npx lerna bootstrap --hoist --nohoist='zone.js' npm run compile - name: Publish diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index f07727a110..79041af47e 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -33,14 +33,14 @@ jobs: if: steps.cache.outputs.cache-hit != 'true' run: | npm install --ignore-scripts - npx lerna bootstrap --no-ci + npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' npm run compile - name: Install and Build (cache hit) 🔧 if: steps.cache.outputs.cache-hit == 'true' run: | npm ci --ignore-scripts - npx lerna bootstrap + npx lerna bootstrap --hoist --nohoist='zone.js' npm run compile - name: Build Docs diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 6514f81e81..537010ec85 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -49,14 +49,14 @@ jobs: if: steps.cache.outputs.cache-hit == 'true' run: | npm ci --ignore-scripts - npx lerna bootstrap --ignore-scripts + npx lerna bootstrap --ignore-scripts --hoist --nohoist='zone.js' # On a cache miss, fall back to a regular install - name: Bootstrap (cache miss) if: steps.cache.outputs.cache-hit != 'true' run: | npm install --ignore-scripts - npx lerna bootstrap --no-ci --ignore-scripts -- --only=dev + npx lerna bootstrap --no-ci --ignore-scripts --hoist --nohoist='zone.js' -- --only=dev - name: Lint run: | diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 3bd874bed0..51ed1b5e14 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -40,14 +40,14 @@ jobs: if: steps.cache.outputs.cache-hit != 'true' run: | npm install --ignore-scripts - npx lerna bootstrap --no-ci + npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' npm run compile - name: Install and Build (cache hit) 🔧 if: steps.cache.outputs.cache-hit == 'true' run: | npm ci --ignore-scripts - npx lerna bootstrap + npx lerna bootstrap --hoist --nohoist='zone.js' npm run compile - name: Unit tests @@ -85,14 +85,14 @@ jobs: if: steps.cache.outputs.cache-hit != 'true' run: | npm install --ignore-scripts - npx lerna bootstrap --no-ci + npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' npm run compile - name: Install and Build (cache hit) 🔧 if: steps.cache.outputs.cache-hit == 'true' run: | npm ci --ignore-scripts - npx lerna bootstrap + npx lerna bootstrap --hoist --nohoist='zone.js' npm run compile - name: Unit tests diff --git a/examples/grpc-js/package.json b/examples/grpc-js/package.json index d850a2b369..09e2a86767 100644 --- a/examples/grpc-js/package.json +++ b/examples/grpc-js/package.json @@ -28,7 +28,7 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@grpc/grpc-js": "^1.2.12", + "@grpc/grpc-js": "^1.3.7", "@opentelemetry/api": "^1.0.2", "@opentelemetry/exporter-jaeger": "0.24.0", "@opentelemetry/exporter-zipkin": "0.24.0", diff --git a/package.json b/package.json index f1d4a154fe..b361a9ddc7 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "test": "lerna run test", "test:browser": "lerna run test:browser", "test:backcompat": "lerna run test:backcompat", - "bootstrap": "lerna bootstrap", + "bootstrap": "lerna bootstrap --hoist --nohoist='zone.js'", "changelog": "lerna-changelog", "codecov": "lerna run codecov", "codecov:browser": "lerna run codecov:browser", diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index cd99ea3f0d..8910950fbd 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -83,6 +83,6 @@ }, "dependencies": { "@opentelemetry/semantic-conventions": "0.24.0", - "semver": "^7.1.3" + "semver": "^7.3.5" } } diff --git a/packages/opentelemetry-exporter-collector-grpc/package.json b/packages/opentelemetry-exporter-collector-grpc/package.json index ab80a0173d..d447d85013 100644 --- a/packages/opentelemetry-exporter-collector-grpc/package.json +++ b/packages/opentelemetry-exporter-collector-grpc/package.json @@ -65,8 +65,8 @@ "@opentelemetry/api": "^1.0.2" }, "dependencies": { - "@grpc/grpc-js": "^1.2.12", - "@grpc/proto-loader": "^0.6.0", + "@grpc/grpc-js": "^1.3.7", + "@grpc/proto-loader": "^0.6.4", "@opentelemetry/core": "0.24.0", "@opentelemetry/exporter-collector": "0.24.0", "@opentelemetry/sdk-metrics-base": "0.24.0", diff --git a/packages/opentelemetry-exporter-collector-proto/package.json b/packages/opentelemetry-exporter-collector-proto/package.json index 03490d9f94..22a8b00b0c 100644 --- a/packages/opentelemetry-exporter-collector-proto/package.json +++ b/packages/opentelemetry-exporter-collector-proto/package.json @@ -65,7 +65,7 @@ "@opentelemetry/api": "^1.0.2" }, "dependencies": { - "@grpc/proto-loader": "^0.6.0", + "@grpc/proto-loader": "^0.6.4", "@opentelemetry/core": "0.24.0", "@opentelemetry/exporter-collector": "0.24.0", "@opentelemetry/sdk-metrics-base": "0.24.0", diff --git a/packages/opentelemetry-instrumentation-http/package.json b/packages/opentelemetry-instrumentation-http/package.json index a83bff8dcf..f18e34206f 100644 --- a/packages/opentelemetry-instrumentation-http/package.json +++ b/packages/opentelemetry-instrumentation-http/package.json @@ -73,6 +73,6 @@ "@opentelemetry/core": "0.24.0", "@opentelemetry/instrumentation": "0.24.0", "@opentelemetry/semantic-conventions": "0.24.0", - "semver": "^7.1.3" + "semver": "^7.3.5" } } diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json index 67ebd637c5..de52149472 100644 --- a/packages/opentelemetry-sdk-trace-node/package.json +++ b/packages/opentelemetry-sdk-trace-node/package.json @@ -67,6 +67,6 @@ "@opentelemetry/propagator-b3": "0.24.0", "@opentelemetry/propagator-jaeger": "0.24.0", "@opentelemetry/sdk-trace-base": "0.24.0", - "semver": "^7.1.3" + "semver": "^7.3.5" } } From dc55c90762cf8320922e3267222809754b13e2da Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Tue, 17 Aug 2021 09:48:10 -0400 Subject: [PATCH 2/4] chore: parallel tests --- .github/workflows/unit-test.yml | 2 +- package.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 51ed1b5e14..66d63e3f0d 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -51,7 +51,7 @@ jobs: npm run compile - name: Unit tests - run: npm run test + run: npm run test:ci - name: Report Coverage run: npm run codecov if: ${{ matrix.node_version == '14' }} diff --git a/package.json b/package.json index b361a9ddc7..103c3641fb 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "protos:copy": "lerna run protos:copy", "version:update": "lerna run version:update", "test": "lerna run test", + "test:ci": "lerna run test --parallel", "test:browser": "lerna run test:browser", "test:backcompat": "lerna run test:backcompat", "bootstrap": "lerna bootstrap --hoist --nohoist='zone.js'", From 21f4c00acd8fa69abf3be9e8f0c6c104a8222262 Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Tue, 17 Aug 2021 09:52:19 -0400 Subject: [PATCH 3/4] Revert "chore: parallel tests" This reverts commit dc55c90762cf8320922e3267222809754b13e2da. --- .github/workflows/unit-test.yml | 2 +- package.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 66d63e3f0d..51ed1b5e14 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -51,7 +51,7 @@ jobs: npm run compile - name: Unit tests - run: npm run test:ci + run: npm run test - name: Report Coverage run: npm run codecov if: ${{ matrix.node_version == '14' }} diff --git a/package.json b/package.json index 103c3641fb..b361a9ddc7 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,6 @@ "protos:copy": "lerna run protos:copy", "version:update": "lerna run version:update", "test": "lerna run test", - "test:ci": "lerna run test --parallel", "test:browser": "lerna run test:browser", "test:backcompat": "lerna run test:backcompat", "bootstrap": "lerna bootstrap --hoist --nohoist='zone.js'", From 08ca33dcd4494e5580a06e8a29c1b98fa969a388 Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Tue, 17 Aug 2021 10:24:17 -0400 Subject: [PATCH 4/4] chore: add missing example deps --- examples/basic-tracer-node/package.json | 2 ++ examples/collector-exporter-node/package.json | 2 ++ examples/grpc-js/package.json | 2 ++ examples/grpc/package.json | 2 ++ examples/http/package.json | 2 ++ examples/https/package.json | 2 ++ 6 files changed, 12 insertions(+) diff --git a/examples/basic-tracer-node/package.json b/examples/basic-tracer-node/package.json index 990c0c4751..d2a126f49d 100644 --- a/examples/basic-tracer-node/package.json +++ b/examples/basic-tracer-node/package.json @@ -26,6 +26,8 @@ "dependencies": { "@opentelemetry/api": "^1.0.2", "@opentelemetry/exporter-jaeger": "0.24.0", + "@opentelemetry/resources": "0.24.0", + "@opentelemetry/semantic-conventions": "0.24.0", "@opentelemetry/sdk-trace-base": "0.24.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme" diff --git a/examples/collector-exporter-node/package.json b/examples/collector-exporter-node/package.json index 042e27b557..19ae16a73d 100644 --- a/examples/collector-exporter-node/package.json +++ b/examples/collector-exporter-node/package.json @@ -33,6 +33,8 @@ "@opentelemetry/exporter-collector": "0.24.0", "@opentelemetry/exporter-collector-grpc": "0.24.0", "@opentelemetry/exporter-collector-proto": "0.24.0", + "@opentelemetry/resources": "0.24.0", + "@opentelemetry/semantic-conventions": "0.24.0", "@opentelemetry/sdk-metrics-base": "0.24.0", "@opentelemetry/sdk-trace-base": "0.24.0" }, diff --git a/examples/grpc-js/package.json b/examples/grpc-js/package.json index 09e2a86767..0c2d0150c3 100644 --- a/examples/grpc-js/package.json +++ b/examples/grpc-js/package.json @@ -34,6 +34,8 @@ "@opentelemetry/exporter-zipkin": "0.24.0", "@opentelemetry/instrumentation": "0.24.0", "@opentelemetry/instrumentation-grpc": "0.24.0", + "@opentelemetry/resources": "0.24.0", + "@opentelemetry/semantic-conventions": "0.24.0", "@opentelemetry/sdk-trace-node": "0.24.0", "@opentelemetry/sdk-trace-base": "0.24.0", "google-protobuf": "^3.9.2" diff --git a/examples/grpc/package.json b/examples/grpc/package.json index 75f772161b..afcbade853 100644 --- a/examples/grpc/package.json +++ b/examples/grpc/package.json @@ -33,6 +33,8 @@ "@opentelemetry/exporter-zipkin": "0.24.0", "@opentelemetry/instrumentation": "0.24.0", "@opentelemetry/instrumentation-grpc": "0.24.0", + "@opentelemetry/resources": "0.24.0", + "@opentelemetry/semantic-conventions": "0.24.0", "@opentelemetry/sdk-trace-node": "0.24.0", "@opentelemetry/sdk-trace-base": "0.24.0", "google-protobuf": "^3.9.2", diff --git a/examples/http/package.json b/examples/http/package.json index 43cbf8b7ae..b05221ae53 100644 --- a/examples/http/package.json +++ b/examples/http/package.json @@ -33,6 +33,8 @@ "@opentelemetry/exporter-zipkin": "0.24.0", "@opentelemetry/instrumentation": "0.24.0", "@opentelemetry/instrumentation-http": "0.24.0", + "@opentelemetry/resources": "0.24.0", + "@opentelemetry/semantic-conventions": "0.24.0", "@opentelemetry/sdk-trace-node": "0.24.0", "@opentelemetry/sdk-trace-base": "0.24.0" }, diff --git a/examples/https/package.json b/examples/https/package.json index 479eb53ffc..46b16003f8 100644 --- a/examples/https/package.json +++ b/examples/https/package.json @@ -34,6 +34,8 @@ "@opentelemetry/exporter-zipkin": "0.24.0", "@opentelemetry/instrumentation": "0.24.0", "@opentelemetry/instrumentation-http": "0.24.0", + "@opentelemetry/resources": "0.24.0", + "@opentelemetry/semantic-conventions": "0.24.0", "@opentelemetry/sdk-trace-node": "0.24.0", "@opentelemetry/sdk-trace-base": "0.24.0" },