Merge 08ca33d into 40d0423

open-telemetry · Aug 17, 2021 · 5961f55 · 5961f55
2 parents 40d0423 + 08ca33d
commit 5961f55
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -28,12 +28,14 @@
     "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",
     "@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
@@ -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
@@ -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
@@ -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"
   },

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
   }
 }