diff --git a/common/config/rush/common-versions.json b/common/config/rush/common-versions.json
index 98ee83e5af85..83304b3912fd 100644
--- a/common/config/rush/common-versions.json
+++ b/common/config/rush/common-versions.json
@@ -56,7 +56,8 @@
// ]
// Following is required to allow for backward compatibility with Event Processor Host Track 1
"@azure/event-hubs": ["^2.1.4"],
- "@opentelemetry/api": ["^0.18.1"],
+ // Monitor-opentelemetry-exporter and monitor-query both depend on different versions of @opentelemetry and need to be updated
+ "@opentelemetry/api": ["^0.18.1", "0.21.0"],
// Monitor: Allow node 10 types until Timeout / Timer conflict is resolved in OpenTelemetry repo
// TODO: remove when released https://github.com/open-telemetry/opentelemetry-js/pull/1352
// eslint v7.15 needs node v10.12
@@ -74,7 +75,8 @@
// Issue #14771 tracks updating to these versions
"@microsoft/api-extractor": ["7.13.2"],
"prettier": ["2.2.1"],
- // All packages should move to 1.0.0-preview.12 once core-rest-pipeline 1.1.0 GAs
+ // All packages should move to 1.0.0 once core-rest-pipeline 1.1.0 GAs
"@azure/core-tracing": ["1.0.0-preview.11"]
+
}
}
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 6e5303ec974d..83efa376954e 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -344,7 +344,7 @@ packages:
integrity: sha512-CxaMaEjwtsmIhWtjHyGimKO7RmES0YxPqGQ9+jKqGygNlhG5NYHktDaiQu6w7k3g+I51VaLXtVSt+BVFd6VWfQ==
/@azure/identity/1.2.5_debug@4.3.1:
dependencies:
- '@azure/core-http': 1.2.3
+ '@azure/core-http': 1.2.6
'@azure/core-tracing': 1.0.0-preview.9
'@azure/logger': 1.0.2
'@azure/msal-node': 1.0.0-beta.6_debug@4.3.1
@@ -1047,28 +1047,34 @@ packages:
node: '>=8.0.0'
resolution:
integrity: sha512-pKNxHe3AJ5T2N5G3AlT9gx6FyF5K2FS9ZNc+FipC+f1CpVF/EY+JHTJ749dnM2kWIgZTbDJFiGMuc0FYjNSCOg==
- /@opentelemetry/api/0.20.0:
+ /@opentelemetry/api/0.21.0:
+ dev: false
+ engines:
+ node: '>=8.0.0'
+ resolution:
+ integrity: sha512-Q7hHb3nidPgnBS2fi+y3K64F3EV48d9v09/6EtigIgVF43NFNhw/dboDKC7gECEkbTwuvFeLCbwKs9JaC8LDEw==
+ /@opentelemetry/api/1.0.0:
dev: false
engines:
node: '>=8.0.0'
resolution:
- integrity: sha512-n06MtDYEc2H07S/NTvGMlxF2Ijp0YbNrI/rBgLcxpEh3hxOkPZA12gxlUoZkBHWCZYau2j3b/uL+QFpiQKOjSw==
+ integrity: sha512-TcdhrGy+ehLIFs79/TcWiHiPujishrhSgQ7wxvWvk8WY2YT8Np/pYXmRP94voG3N8GJ/5nIVyzacfViwhN50AQ==
/@opentelemetry/api/1.0.0-rc.0:
dev: false
engines:
node: '>=8.0.0'
resolution:
integrity: sha512-iXKByCMfrlO5S6Oh97BuM56tM2cIBB0XsL/vWF/AtJrJEKx4MC/Xdu0xDsGXMGcNWpqF7ujMsjjnp0+UHBwnDQ==
- /@opentelemetry/context-async-hooks/0.20.0_@opentelemetry+api@0.20.0:
+ /@opentelemetry/context-async-hooks/0.21.0_@opentelemetry+api@0.21.0:
dependencies:
- '@opentelemetry/api': 0.20.0
+ '@opentelemetry/api': 0.21.0
dev: false
engines:
node: '>=8.1.0'
peerDependencies:
- '@opentelemetry/api': ^0.20.0
+ '@opentelemetry/api': ^0.21.0
resolution:
- integrity: sha512-4cuTIPpufWRDdShtvT0c30/jHfO9eXzUh6tU087J8aO8J/hckyCIlN03eB7pfqPwQzLnWONGdHOpGjLSY7q4tg==
+ integrity: sha512-3XxzT7jiDLbohUy66NWsYuWFtXsMI0qMhetWVlFmmBfMPLMR+U6xWA4xhfRMb6kMEjR5XJHbyDSxYwzxrd10sg==
/@opentelemetry/context-base/0.10.2:
dev: false
engines:
@@ -1084,56 +1090,56 @@ packages:
node: '>=8.5.0'
resolution:
integrity: sha512-WG8veOEd8xZHuBaOHddzWQg5yj794lrEPAe6W1qI0YkV7pyqYXvhJdCxOU5Lyo1SWzTAjI5xrCUQ9J2WlrqzYA==
- /@opentelemetry/core/0.20.0_@opentelemetry+api@0.20.0:
+ /@opentelemetry/core/0.21.0_@opentelemetry+api@0.21.0:
dependencies:
- '@opentelemetry/api': 0.20.0
- '@opentelemetry/semantic-conventions': 0.20.0
+ '@opentelemetry/api': 0.21.0
+ '@opentelemetry/semantic-conventions': 0.21.0
semver: 7.3.5
dev: false
engines:
node: '>=8.5.0'
peerDependencies:
- '@opentelemetry/api': ^0.20.0
+ '@opentelemetry/api': ^0.21.0
resolution:
- integrity: sha512-09zQqB4vp2jcyBnglA/TFklDQoVgWrFKtr9pDm0q3Oa1bD2Hwpq+JapBAw18YdMQsLNQM/qsXhFlS3gFDVEy4A==
- /@opentelemetry/node/0.20.0_@opentelemetry+api@0.20.0:
+ integrity: sha512-sZZQThBuqhCdBPgzPq4y9L4dhnpXXCCEqNsR6IUmMc/kQ8Bcw3lmI5fymLlliSt+lnTc26xJPVKZlwoQfwhThg==
+ /@opentelemetry/node/0.21.0_@opentelemetry+api@0.21.0:
dependencies:
- '@opentelemetry/api': 0.20.0
- '@opentelemetry/context-async-hooks': 0.20.0_@opentelemetry+api@0.20.0
- '@opentelemetry/core': 0.20.0_@opentelemetry+api@0.20.0
- '@opentelemetry/propagator-b3': 0.20.0_@opentelemetry+api@0.20.0
- '@opentelemetry/propagator-jaeger': 0.20.0_@opentelemetry+api@0.20.0
- '@opentelemetry/tracing': 0.20.0_@opentelemetry+api@0.20.0
+ '@opentelemetry/api': 0.21.0
+ '@opentelemetry/context-async-hooks': 0.21.0_@opentelemetry+api@0.21.0
+ '@opentelemetry/core': 0.21.0_@opentelemetry+api@0.21.0
+ '@opentelemetry/propagator-b3': 0.21.0_@opentelemetry+api@0.21.0
+ '@opentelemetry/propagator-jaeger': 0.21.0_@opentelemetry+api@0.21.0
+ '@opentelemetry/tracing': 0.21.0_@opentelemetry+api@0.21.0
semver: 7.3.5
dev: false
engines:
node: '>=8.0.0'
peerDependencies:
- '@opentelemetry/api': ^0.20.0
+ '@opentelemetry/api': ^0.21.0
resolution:
- integrity: sha512-MVwnH/AoHQTz1jOhJTYXoAoQD4CA/3L7QQkiiA93f6QGaWKIHjI/+3fUtA/GCfPR9Kf0sItQ/aag8KtCJClPCw==
- /@opentelemetry/propagator-b3/0.20.0_@opentelemetry+api@0.20.0:
+ integrity: sha512-PCA3pFmzTMN3iIlZ6Bz2BgPe8jEIdKRK7WyjfT9qqrLrHZ/dXNmX4MIz2IKTyQtS6tGt2jayD0IpWsVFctPOIA==
+ /@opentelemetry/propagator-b3/0.21.0_@opentelemetry+api@0.21.0:
dependencies:
- '@opentelemetry/api': 0.20.0
- '@opentelemetry/core': 0.20.0_@opentelemetry+api@0.20.0
+ '@opentelemetry/api': 0.21.0
+ '@opentelemetry/core': 0.21.0_@opentelemetry+api@0.21.0
dev: false
engines:
node: '>=8.0.0'
peerDependencies:
- '@opentelemetry/api': ^0.20.0
+ '@opentelemetry/api': ^0.21.0
resolution:
- integrity: sha512-TGI2D45oUVlbXVEWDedqxwO0WUtzchN/tuYghEHjRTNcVLLKT2ci9JwzHormC+ls98SYPDfvuzpB0+ParoexPQ==
- /@opentelemetry/propagator-jaeger/0.20.0_@opentelemetry+api@0.20.0:
+ integrity: sha512-KXQKXa76ilzBNdwr7hze9251g0AqBmwhCPnt17UCgb+97DFcOyEy5Rc7nnjZNxNGYYqUbk8116MK9hMZO2icGw==
+ /@opentelemetry/propagator-jaeger/0.21.0_@opentelemetry+api@0.21.0:
dependencies:
- '@opentelemetry/api': 0.20.0
- '@opentelemetry/core': 0.20.0_@opentelemetry+api@0.20.0
+ '@opentelemetry/api': 0.21.0
+ '@opentelemetry/core': 0.21.0_@opentelemetry+api@0.21.0
dev: false
engines:
node: '>=8.5.0'
peerDependencies:
- '@opentelemetry/api': ^0.20.0
+ '@opentelemetry/api': ^0.21.0
resolution:
- integrity: sha512-6kdnd1ePADx4XDaFw4Ea47fdIZohhJbd30Fc4yvl0DO+RR5WEAiAho0IsoTj6L/qvOb/+LAfvjvdk2UOXgb/3Q==
+ integrity: sha512-H0TaYBvDi4stz19UJNPFR1IRikQYjoKYuV6tZV4V5NnPAFTjBhvj/Heb0fNDUWK5G1tVB5NPrEsNSZjjdfvjLw==
/@opentelemetry/resources/0.18.2:
dependencies:
'@opentelemetry/api': 0.18.1
@@ -1143,30 +1149,30 @@ packages:
node: '>=8.0.0'
resolution:
integrity: sha512-EBPqFsreXgFaqkMmWCE8vh6pFhbWExRHSO24qSeGhxFmM5SQP/D1jJqMp/jVUSmrF97fPkMS0aEH5z7NOWdxQA==
- /@opentelemetry/resources/0.20.0_@opentelemetry+api@0.20.0:
+ /@opentelemetry/resources/0.21.0_@opentelemetry+api@0.21.0:
dependencies:
- '@opentelemetry/api': 0.20.0
- '@opentelemetry/core': 0.20.0_@opentelemetry+api@0.20.0
- '@opentelemetry/semantic-conventions': 0.20.0
+ '@opentelemetry/api': 0.21.0
+ '@opentelemetry/core': 0.21.0_@opentelemetry+api@0.21.0
+ '@opentelemetry/semantic-conventions': 0.21.0
dev: false
engines:
node: '>=8.0.0'
peerDependencies:
- '@opentelemetry/api': ^0.20.0
+ '@opentelemetry/api': ^0.21.0
resolution:
- integrity: sha512-nnd3vIM+A9ih6kOVBc2CF5NkTYmdNci5aQ+A5lQjf3HqjEptcGubpg1J1Q84LSFVoITvuH2O6+GhPBrdxYBt8g==
+ integrity: sha512-xQUL2/2npP/isH8sbOSdynIRWmlM6p02L9Ex8x/BhUuSkGrMoxO2ezLPPYnfYam1py6ubaz8m1C54O2IRCmgQQ==
/@opentelemetry/semantic-conventions/0.18.2:
dev: false
engines:
node: '>=8.0.0'
resolution:
integrity: sha512-+0P+PrP9qSFVaayNdek4P1OAGE+PEl2SsufuHDRmUpOY25Wzjo7Atyar56Trjc32jkNy4lID6ZFT6BahsR9P9A==
- /@opentelemetry/semantic-conventions/0.20.0:
+ /@opentelemetry/semantic-conventions/0.21.0:
dev: false
engines:
node: '>=8.0.0'
resolution:
- integrity: sha512-x40C3vQMttFlnNEfhFwO49jHrY6AoWnntL35TCem3LINr/aw1W0hGhdKY/zweC64CBJEyiHumaae480rqF8eOA==
+ integrity: sha512-qQtZJ8Q+bO/gemBELsZbz5s//tNnyc+mQD/0RHc77XhI6ZBb+tprU6KN/7l0fl5z29smmai0hcJ9UNILC/7nIw==
/@opentelemetry/tracing/0.18.2:
dependencies:
'@opentelemetry/api': 0.18.1
@@ -1179,20 +1185,20 @@ packages:
node: '>=8.0.0'
resolution:
integrity: sha512-IQSu+NwMhX8O9Wkjc4HjNqs/aKfkcInCE3dQuAOBBec/saLrM6jqd+Fa5QUzg03WMOqpDuZm5KTkr5+6DUrr0g==
- /@opentelemetry/tracing/0.20.0_@opentelemetry+api@0.20.0:
+ /@opentelemetry/tracing/0.21.0_@opentelemetry+api@0.21.0:
dependencies:
- '@opentelemetry/api': 0.20.0
- '@opentelemetry/core': 0.20.0_@opentelemetry+api@0.20.0
- '@opentelemetry/resources': 0.20.0_@opentelemetry+api@0.20.0
- '@opentelemetry/semantic-conventions': 0.20.0
+ '@opentelemetry/api': 0.21.0
+ '@opentelemetry/core': 0.21.0_@opentelemetry+api@0.21.0
+ '@opentelemetry/resources': 0.21.0_@opentelemetry+api@0.21.0
+ '@opentelemetry/semantic-conventions': 0.21.0
lodash.merge: 4.6.2
dev: false
engines:
node: '>=8.0.0'
peerDependencies:
- '@opentelemetry/api': ^0.20.0
+ '@opentelemetry/api': ^0.21.0
resolution:
- integrity: sha512-8ZIH0IBxIucgza0BFNiCCLByUsvu45Dm5k292RlO/E8Z1q/J7otJmh9r/EkaFb0ZSyjNdawmJ1CXnlU7+IQN1w==
+ integrity: sha512-6+2pfFpu7Yo2DwmBK9sHDUSIL7UshcEMwDF6+LghGK68ILRaEMqqBPgKarjhFH9ERgJB9GOkJ2snK96qIzMZNA==
/@rollup/plugin-commonjs/11.0.2_rollup@1.32.1:
dependencies:
'@rollup/pluginutils': 3.1.0_rollup@1.32.1
@@ -1372,7 +1378,7 @@ packages:
/@types/body-parser/1.19.0:
dependencies:
'@types/connect': 3.4.34
- '@types/node': 8.10.66
+ '@types/node': 15.12.4
dev: false
resolution:
integrity: sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==
@@ -1398,7 +1404,7 @@ packages:
integrity: sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg==
/@types/connect/3.4.34:
dependencies:
- '@types/node': 8.10.66
+ '@types/node': 15.12.4
dev: false
resolution:
integrity: sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==
@@ -1431,7 +1437,7 @@ packages:
integrity: sha512-LfZwXoGUDo0C3me81HXgkBg5CTQYb6xzEl+fNmbO4JdRiSKQ8A0GD1OBBvKAIsbCUgoyAty7m99GqqMQe784ew==
/@types/express-serve-static-core/4.17.21:
dependencies:
- '@types/node': 8.10.66
+ '@types/node': 15.12.4
'@types/qs': 6.9.6
'@types/range-parser': 1.2.3
dev: false
@@ -1455,20 +1461,20 @@ packages:
integrity: sha512-IyNhGHu71jH1jCXTHmafuoAAdsbBON3kDh7u/UUhLmjYgN5TYB54e1R8ckTCiIevl2UuZaCsi9XRxineY5yUjw==
/@types/fs-extra/8.1.1:
dependencies:
- '@types/node': 8.10.66
+ '@types/node': 15.12.4
dev: false
resolution:
integrity: sha512-TcUlBem321DFQzBNuz8p0CLLKp0VvF/XH9E4KHNmgwyp4E3AfgI5cjiIVZWlbfThBop2qxFIh4+LeY6hVWWZ2w==
/@types/glob/7.1.3:
dependencies:
'@types/minimatch': 3.0.4
- '@types/node': 8.10.66
+ '@types/node': 15.12.4
dev: false
resolution:
integrity: sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
/@types/is-buffer/2.0.0:
dependencies:
- '@types/node': 8.10.66
+ '@types/node': 15.12.4
dev: false
resolution:
integrity: sha512-0f7N/e3BAz32qDYvgB4d2cqv1DqUwvGxHkXsrucICn8la1Vb6Yl6Eg8mPScGwUiqHJeE7diXlzaK+QMA9m4Gxw==
@@ -1482,13 +1488,13 @@ packages:
integrity: sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
/@types/jsonwebtoken/8.5.2:
dependencies:
- '@types/node': 8.10.66
+ '@types/node': 15.12.4
dev: false
resolution:
integrity: sha512-X8BOCkp+WJVNYCYIBugREtVZa4Y09Or9HDx6xqRZem5F8jJV8FuJgNessXyMuv9+U8pjnvdezASwU28uw+1scw==
/@types/jws/3.2.3:
dependencies:
- '@types/node': 8.10.66
+ '@types/node': 15.12.4
dev: false
resolution:
integrity: sha512-g54CHxwvaHvyJyeuZqe7VQujV9SfCXwEkboJp355INPL+kjlS3Aq153EHptaeO/Cch/NPJ1i2sHz0sDDizn7LQ==
@@ -1502,7 +1508,7 @@ packages:
integrity: sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==
/@types/md5/2.3.0:
dependencies:
- '@types/node': 8.10.66
+ '@types/node': 15.12.4
dev: false
resolution:
integrity: sha512-556YJ7ejzxIqSSxzyGGpctuZOarNZJt/zlEkhmmDc1f/slOEANHuwu2ZX7YaZ40rMiWoxt8GvAhoDpW1cmSy6A==
@@ -1528,13 +1534,13 @@ packages:
integrity: sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==
/@types/mock-fs/4.10.0:
dependencies:
- '@types/node': 8.10.66
+ '@types/node': 15.12.4
dev: false
resolution:
integrity: sha512-FQ5alSzmHMmliqcL36JqIA4Yyn9jyJKvRSGV3mvPh108VFatX7naJDzSG4fnFQNZFq9dIx0Dzoe6ddflMB2Xkg==
/@types/mock-require/2.0.0:
dependencies:
- '@types/node': 8.10.66
+ '@types/node': 15.12.4
dev: false
resolution:
integrity: sha512-nOgjoE5bBiDeiA+z41i95makyHUSMWQMOPocP+J67Pqx/68HAXaeWN1NFtrAYYV6LrISIZZ8vKHm/a50k0f6Sg==
@@ -1544,7 +1550,7 @@ packages:
integrity: sha512-DPxmjiDwubsNmguG5X4fEJ+XCyzWM3GXWsqQlvUcjJKa91IOoJUy51meDr0GkzK64qqNcq85ymLlyjoct9tInw==
/@types/node-fetch/2.5.10:
dependencies:
- '@types/node': 8.10.66
+ '@types/node': 15.12.4
form-data: 3.0.1
dev: false
resolution:
@@ -1587,7 +1593,7 @@ packages:
integrity: sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
/@types/resolve/1.17.1:
dependencies:
- '@types/node': 8.10.66
+ '@types/node': 15.12.4
dev: false
resolution:
integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==
@@ -1598,7 +1604,7 @@ packages:
/@types/serve-static/1.13.9:
dependencies:
'@types/mime': 1.3.2
- '@types/node': 8.10.66
+ '@types/node': 15.12.4
dev: false
resolution:
integrity: sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==
@@ -1614,7 +1620,7 @@ packages:
integrity: sha512-dIPoZ3g5gcx9zZEszaxLSVTvMReD3xxyyDnQUjA6IYDG9Ba2AV0otMPs+77sG9ojB4Qr2N2Vk5RnKeuA0X/0bg==
/@types/stoppable/1.1.1:
dependencies:
- '@types/node': 8.10.66
+ '@types/node': 15.12.4
dev: false
resolution:
integrity: sha512-b8N+fCADRIYYrGZOcmOR8ZNBOqhktWTB/bMUl5LvGtT201QKJZOOH5UsFyI3qtteM6ZAJbJqZoBcLqqxKIwjhw==
@@ -1624,7 +1630,7 @@ packages:
integrity: sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==
/@types/tunnel/0.0.1:
dependencies:
- '@types/node': 8.10.66
+ '@types/node': 15.12.4
dev: false
resolution:
integrity: sha512-AOqu6bQu5MSWwYvehMXLukFHnupHrpZ8nvgae5Ggie9UwzDR1CCwoXgSSWNZJuyOlCdfdsWMA5F2LlmvyoTv8A==
@@ -1638,19 +1644,19 @@ packages:
integrity: sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ==
/@types/ws/7.4.5:
dependencies:
- '@types/node': 8.10.66
+ '@types/node': 15.12.4
dev: false
resolution:
integrity: sha512-8mbDgtc8xpxDDem5Gwj76stBDJX35KQ3YBoayxlqUQcL5BZUthiqP/VQ4PQnLHqM4PmlbyO74t98eJpURO+gPA==
/@types/xml2js/0.4.8:
dependencies:
- '@types/node': 8.10.66
+ '@types/node': 15.12.4
dev: false
resolution:
integrity: sha512-EyvT83ezOdec7BhDaEcsklWy7RSIdi6CNe95tmOAK0yx/Lm30C9K75snT3fYayK59ApC2oyW+rcHErdG05FHJA==
/@types/yauzl/2.9.1:
dependencies:
- '@types/node': 8.10.66
+ '@types/node': 15.12.4
dev: false
optional: true
resolution:
@@ -2784,7 +2790,7 @@ packages:
integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
/debug/3.2.6:
dependencies:
- ms: 2.1.1
+ ms: 2.1.3
deprecated: Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)
dev: false
resolution:
@@ -6717,7 +6723,7 @@ packages:
/rollup/1.32.1:
dependencies:
'@types/estree': 0.0.48
- '@types/node': 8.10.66
+ '@types/node': 15.12.4
acorn: 7.4.1
dev: false
hasBin: true
@@ -9347,7 +9353,7 @@ packages:
file:projects/core-tracing.tgz:
dependencies:
'@microsoft/api-extractor': 7.7.11
- '@opentelemetry/api': 0.20.0
+ '@opentelemetry/api': 1.0.0
'@rollup/plugin-commonjs': 11.0.2_rollup@1.32.1
'@rollup/plugin-json': 4.1.0_rollup@1.32.1
'@rollup/plugin-multi-entry': 3.0.1_rollup@1.32.1
@@ -9387,7 +9393,7 @@ packages:
dev: false
name: '@rush-temp/core-tracing'
resolution:
- integrity: sha512-YWHGTfZMkeR5xkd5N7cg8Cs8xqgn5CdqqL9A+TTh2CHdDZE6sK1wkzXrSqD3aO2PcWBQ2bXr0eSlgkR1a2JuQw==
+ integrity: sha512-WY3dTdsoyz+AMJUBjPiPsbagWKKJhxDhk+tURH/HBp6zUzyu1AJ4/VjUVCkruYBEZfy/WBYCfcHkMjlcielb0Q==
tarball: file:projects/core-tracing.tgz
version: 0.0.0
file:projects/core-util.tgz:
@@ -10522,8 +10528,8 @@ packages:
dependencies:
'@azure/identity': 1.3.0
'@microsoft/api-extractor': 7.7.11
- '@opentelemetry/api': 0.20.0
- '@opentelemetry/node': 0.20.0_@opentelemetry+api@0.20.0
+ '@opentelemetry/api': 0.21.0
+ '@opentelemetry/node': 0.21.0_@opentelemetry+api@0.21.0
'@opentelemetry/tracing': 0.18.2
'@types/chai': 4.2.19
'@types/chai-as-promised': 7.1.4
@@ -10563,7 +10569,7 @@ packages:
dev: false
name: '@rush-temp/monitor-query'
resolution:
- integrity: sha512-7tuRnoGWczKV3/cBlQljU7Uh3VsiKULIIA7IBVB2+NeZjo4QWWj0aJeKWFTlO4T4HAZyU2o1vWsjmTT8YbvpuA==
+ integrity: sha512-ON6PB//RHdZG1TyksRq5CyFzk1G2eC5kqn8TIYI71bTklo+xQiRQWgzvRg45CPjt+JP+BRTgXqX6TVub4cNWiQ==
tarball: file:projects/monitor-query.tgz
version: 0.0.0
file:projects/perf-ai-form-recognizer.tgz:
@@ -11925,6 +11931,7 @@ packages:
integrity: sha512-vR4Y02jE/bLss6v013XQnI7fHgUp+r4ENYXoaHKRAtNMixhfeobUozzrZuMQJjCTyh0ps8FxxEn3BB3It5SySQ==
tarball: file:projects/web-pubsub.tgz
version: 0.0.0
+registry: ''
specifiers:
'@rush-temp/abort-controller': file:./projects/abort-controller.tgz
'@rush-temp/agrifood-farming': file:./projects/agrifood-farming.tgz
diff --git a/sdk/core/core-rest-pipeline/package.json b/sdk/core/core-rest-pipeline/package.json
index fb00f11b74a9..75e7e6aa5e6c 100644
--- a/sdk/core/core-rest-pipeline/package.json
+++ b/sdk/core/core-rest-pipeline/package.json
@@ -93,7 +93,7 @@
"dependencies": {
"@azure/abort-controller": "^1.0.0",
"@azure/core-auth": "^1.3.0",
- "@azure/core-tracing": "1.0.0-preview.12",
+ "@azure/core-tracing": "1.0.0-preview.11",
"@azure/logger": "^1.0.0",
"form-data": "^3.0.0",
"tslib": "^2.2.0",
diff --git a/sdk/core/core-rest-pipeline/src/policies/tracingPolicy.ts b/sdk/core/core-rest-pipeline/src/policies/tracingPolicy.ts
index fd6125a05201..3ada95732249 100644
--- a/sdk/core/core-rest-pipeline/src/policies/tracingPolicy.ts
+++ b/sdk/core/core-rest-pipeline/src/policies/tracingPolicy.ts
@@ -77,7 +77,7 @@ export function tracingPolicy(options: TracingPolicyOptions = {}): PipelinePolic
try {
// set headers
- const spanContext = span.spanContext();
+ const spanContext = span.context();
const traceParentHeader = getTraceParentHeader(spanContext);
if (traceParentHeader) {
request.headers.set("traceparent", traceParentHeader);
diff --git a/sdk/core/core-rest-pipeline/test/tracingPolicy.spec.ts b/sdk/core/core-rest-pipeline/test/tracingPolicy.spec.ts
index 5643463b7b56..4f10a42646a9 100644
--- a/sdk/core/core-rest-pipeline/test/tracingPolicy.spec.ts
+++ b/sdk/core/core-rest-pipeline/test/tracingPolicy.spec.ts
@@ -14,30 +14,47 @@ import {
import {
setTracer,
NoOpTracer,
- NoOpSpan,
SpanContext,
TraceFlags,
+ Span,
TraceState,
context,
setSpan,
SpanStatus,
- SpanStatusCode
+ SpanStatusCode,
+ SpanAttributes,
+ Tracer,
+ SpanAttributeValue
} from "@azure/core-tracing";
-class MockSpan extends NoOpSpan {
+class MockSpan implements Span {
private _endCalled = false;
private _status: SpanStatus = {
code: SpanStatusCode.UNSET
};
- private _attributes: { [s: string]: unknown } = {};
+ private _attributes: SpanAttributes = {};
constructor(
private traceId: string,
private spanId: string,
private flags: TraceFlags,
private state: string
- ) {
- super();
+ ) {}
+
+ addEvent(): this {
+ throw new Error("Method not implemented.");
+ }
+
+ isRecording(): boolean {
+ return true;
+ }
+
+ recordException(): void {
+ throw new Error("Method not implemented.");
+ }
+
+ updateName(): this {
+ throw new Error("Method not implemented.");
}
didEnd(): boolean {
@@ -57,7 +74,12 @@ class MockSpan extends NoOpSpan {
return this;
}
- setAttribute(key: string, value: unknown) {
+ setAttributes(attributes: SpanAttributes): this {
+ this._attributes = attributes;
+ return this;
+ }
+
+ setAttribute(key: string, value: SpanAttributeValue) {
this._attributes[key] = value;
return this;
}
@@ -66,7 +88,7 @@ class MockSpan extends NoOpSpan {
return this._attributes[key];
}
- spanContext(): SpanContext {
+ context(): SpanContext {
const state = this.state;
const traceState = {
@@ -95,7 +117,7 @@ class MockSpan extends NoOpSpan {
}
}
-class MockTracer extends NoOpTracer {
+class MockTracer implements Tracer {
private spans: MockSpan[] = [];
private _startSpanCalled = false;
@@ -104,9 +126,7 @@ class MockTracer extends NoOpTracer {
private spanId = "",
private flags = TraceFlags.NONE,
private state = ""
- ) {
- super();
- }
+ ) {}
getStartedSpans(): MockSpan[] {
return this.spans;
diff --git a/sdk/core/core-tracing/CHANGELOG.md b/sdk/core/core-tracing/CHANGELOG.md
index d0eb4e82d663..d6aac66e465c 100644
--- a/sdk/core/core-tracing/CHANGELOG.md
+++ b/sdk/core/core-tracing/CHANGELOG.md
@@ -2,6 +2,8 @@
## 1.0.0-preview.12 (Unreleased)
+- Update `@opentelemetry/api` to version 1.0.0 [PR #15883](https://github.com/Azure/azure-sdk-for-js/pull/15883)
+
### Breaking Changes
- Removed `OpenCensusSpanWrapper` and `OpenCensusTracerWrapper` from the public API. Customers using these wrappers should migrate to using `OpenTelemetry` directly. [PR #15770](https://github.com/Azure/azure-sdk-for-js/pull/15770)
diff --git a/sdk/core/core-tracing/package.json b/sdk/core/core-tracing/package.json
index db31dc5281ed..e59f994cab94 100644
--- a/sdk/core/core-tracing/package.json
+++ b/sdk/core/core-tracing/package.json
@@ -60,7 +60,7 @@
"homepage": "https://github.com/Azure/azure-sdk-for-js/blob/master/sdk/core/core-tracing/README.md",
"sideEffects": false,
"dependencies": {
- "@opentelemetry/api": "0.20.0",
+ "@opentelemetry/api": "^1.0.0",
"tslib": "^2.2.0"
},
"devDependencies": {
diff --git a/sdk/core/core-tracing/test/cache.spec.ts b/sdk/core/core-tracing/test/cache.spec.ts
index 6bde9dda7291..407f258056c9 100644
--- a/sdk/core/core-tracing/test/cache.spec.ts
+++ b/sdk/core/core-tracing/test/cache.spec.ts
@@ -6,7 +6,7 @@ import * as fs from "fs";
import { Context } from "mocha";
import * as path from "path";
-const validOpenTelemetryVersions = ["0.20.0"];
+const validOpenTelemetryVersions = ["^1.0.0"];
describe("cache", () => {
it("ensure current @opentelemetry/api has been validated", function(this: Context) {
diff --git a/sdk/monitor/monitor-query/package.json b/sdk/monitor/monitor-query/package.json
index 105810d1a1cd..f68984ba0b63 100644
--- a/sdk/monitor/monitor-query/package.json
+++ b/sdk/monitor/monitor-query/package.json
@@ -111,8 +111,8 @@
"@azure/monitor-opentelemetry-exporter": "1.0.0-beta.4",
"@azure/test-utils-recorder": "^1.0.0",
"@microsoft/api-extractor": "7.7.11",
- "@opentelemetry/api": "0.20.0",
- "@opentelemetry/node": "0.20.0",
+ "@opentelemetry/api": "0.21.0",
+ "@opentelemetry/node": "0.21.0",
"@opentelemetry/tracing": "^0.18.2",
"@types/chai-as-promised": "^7.1.0",
"@types/chai": "^4.1.6",