Merge branch 'main' into refactor/instrumentation-grpc

open-telemetry · Jan 17, 2024 · e9e8885 · e9e8885
2 parents dedfc3a + bf8714e
commit e9e8885
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,8 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 ### :house: (Internal)
 
+* chore(opentelemetry-context-zone-peer-dep): support zone.js ^v0.13.0 [#4320](https://github.com/open-telemetry/opentelemetry-js/pull/4320)
+
 ## 1.20.0
 
 ### :rocket: (Enhancement)

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json
@@ -79,11 +79,11 @@
     "typescript": "4.4.4",
     "webpack": "5.89.0",
     "webpack-cli": "5.1.4",
-    "zone.js": "0.11.4"
+    "zone.js": "0.13.3"
   },
   "peerDependencies": {
     "@opentelemetry/api": ">=1.0.0 <1.8.0",
-    "zone.js": "^0.10.2 || ^0.11.0"
+    "zone.js": "^0.10.2 || ^0.11.0 || ^0.13.0"
   },
   "sideEffects": false,
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-context-zone-peer-dep"

diff --git a/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts b/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import 'zone.js';
+import 'zone.js/dist/zone';
 import * as sinon from 'sinon';
 import * as assert from 'assert';
 import { ZoneContextManager } from '../src';