From 6e41890a2d09e1d1fee5fbf5f9d63dafac769f95 Mon Sep 17 00:00:00 2001 From: Maor Leger Date: Wed, 23 Jun 2021 08:22:33 -0700 Subject: [PATCH 1/3] GA CRP 1.1.0 --- sdk/agrifood/agrifood-farming-rest/package.json | 2 +- sdk/attestation/attestation/package.json | 4 ++-- sdk/confidentialledger/confidential-ledger-rest/package.json | 2 +- sdk/containerregistry/container-registry/package.json | 4 ++-- sdk/core/core-client-rest/package.json | 2 +- sdk/core/core-client/package.json | 4 ++-- sdk/core/core-rest-pipeline/CHANGELOG.md | 4 ++++ sdk/core/core-rest-pipeline/package.json | 4 ++-- sdk/core/core-rest-pipeline/src/policies/tracingPolicy.ts | 2 +- sdk/core/core-rest-pipeline/test/tracingPolicy.spec.ts | 2 +- sdk/core/perf-tests/core-rest-pipeline/package.json | 2 +- sdk/cosmosdb/cosmos/package.json | 2 +- .../ai-document-translator-rest/package.json | 2 +- sdk/eventgrid/eventgrid/package.json | 4 ++-- sdk/iot/iot-modelsrepository/package.json | 4 ++-- sdk/keyvault/keyvault-admin/package.json | 4 ++-- sdk/keyvault/keyvault-admin/test/utils/supportsTracing.ts | 2 +- sdk/purview/purview-catalog-rest/package.json | 2 +- sdk/purview/purview-scanning-rest/package.json | 2 +- sdk/storage/perf-tests/storage-blob/package.json | 2 +- sdk/storage/storage-blob/package.json | 2 +- sdk/tables/data-tables/package.json | 4 ++-- sdk/textanalytics/ai-text-analytics/package.json | 4 ++-- 23 files changed, 35 insertions(+), 31 deletions(-) diff --git a/sdk/agrifood/agrifood-farming-rest/package.json b/sdk/agrifood/agrifood-farming-rest/package.json index ff5fd1e68354..0c27893927cf 100644 --- a/sdk/agrifood/agrifood-farming-rest/package.json +++ b/sdk/agrifood/agrifood-farming-rest/package.json @@ -86,7 +86,7 @@ "dependencies": { "@azure/core-auth": "^1.3.0", "@azure-rest/core-client": "1.0.0-beta.4", - "@azure/core-rest-pipeline": "^1.0.3", + "@azure/core-rest-pipeline": "^1.1.0", "@azure/logger": "^1.0.0", "tslib": "^2.2.0" }, diff --git a/sdk/attestation/attestation/package.json b/sdk/attestation/attestation/package.json index 2647445d2884..ddd9204de7a5 100644 --- a/sdk/attestation/attestation/package.json +++ b/sdk/attestation/attestation/package.json @@ -89,8 +89,8 @@ "dependencies": { "@azure/core-auth": "^1.3.0", "@azure/core-client": "^1.0.0", - "@azure/core-rest-pipeline": "^1.0.3", - "@azure/core-tracing": "1.0.0-preview.11", + "@azure/core-rest-pipeline": "^1.1.0", + "@azure/core-tracing": "1.0.0-preview.12", "@azure/logger": "^1.0.0", "tslib": "^2.2.0", "jsrsasign": "^10.3.0" diff --git a/sdk/confidentialledger/confidential-ledger-rest/package.json b/sdk/confidentialledger/confidential-ledger-rest/package.json index c5d7755449cc..be96d264d97f 100644 --- a/sdk/confidentialledger/confidential-ledger-rest/package.json +++ b/sdk/confidentialledger/confidential-ledger-rest/package.json @@ -86,7 +86,7 @@ "dependencies": { "@azure/core-auth": "^1.3.0", "@azure-rest/core-client": "1.0.0-beta.4", - "@azure/core-rest-pipeline": "^1.0.3", + "@azure/core-rest-pipeline": "^1.1.0", "@azure/logger": "^1.0.0", "tslib": "^2.2.0" }, diff --git a/sdk/containerregistry/container-registry/package.json b/sdk/containerregistry/container-registry/package.json index ecfd88075a42..446720df2e09 100644 --- a/sdk/containerregistry/container-registry/package.json +++ b/sdk/containerregistry/container-registry/package.json @@ -78,9 +78,9 @@ "dependencies": { "@azure/core-auth": "^1.3.0", "@azure/core-client": "^1.0.0", - "@azure/core-rest-pipeline": "1.1.0-beta.4", + "@azure/core-rest-pipeline": "^1.1.0", "@azure/core-paging": "^1.1.1", - "@azure/core-tracing": "1.0.0-preview.11", + "@azure/core-tracing": "1.0.0-preview.12", "@azure/logger": "^1.0.0", "tslib": "^2.2.0" }, diff --git a/sdk/core/core-client-rest/package.json b/sdk/core/core-client-rest/package.json index 8782bb3644e3..8df299483348 100644 --- a/sdk/core/core-client-rest/package.json +++ b/sdk/core/core-client-rest/package.json @@ -62,7 +62,7 @@ "prettier": "@azure/eslint-plugin-azure-sdk/prettier.json", "dependencies": { "@azure/core-auth": "^1.3.0", - "@azure/core-rest-pipeline": "^1.0.3", + "@azure/core-rest-pipeline": "^1.1.0", "tslib": "^2.2.0" }, "devDependencies": { diff --git a/sdk/core/core-client/package.json b/sdk/core/core-client/package.json index 75ae43754150..2f46e8c964e3 100644 --- a/sdk/core/core-client/package.json +++ b/sdk/core/core-client/package.json @@ -79,8 +79,8 @@ "@azure/abort-controller": "^1.0.0", "@azure/core-asynciterator-polyfill": "^1.0.0", "@azure/core-auth": "^1.3.0", - "@azure/core-rest-pipeline": "^1.0.3", - "@azure/core-tracing": "1.0.0-preview.11", + "@azure/core-rest-pipeline": "^1.1.0", + "@azure/core-tracing": "1.0.0-preview.12", "tslib": "^2.2.0" }, "devDependencies": { diff --git a/sdk/core/core-rest-pipeline/CHANGELOG.md b/sdk/core/core-rest-pipeline/CHANGELOG.md index 83325d678b12..11ec96469894 100644 --- a/sdk/core/core-rest-pipeline/CHANGELOG.md +++ b/sdk/core/core-rest-pipeline/CHANGELOG.md @@ -6,6 +6,10 @@ - Fixed an issue where `proxySettings` does not work when there is username but no password [Issue 15720](https://github.com/Azure/azure-sdk-for-js/issues/15720) +### Breaking Changes + +- Updated @azure/core-tracing to version `1.0.0-preview.12`. See [@azure/core-tracing CHANGELOG](https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/core/core-tracing/CHANGELOG.md) for details about breaking changes with tracing. + ## 1.1.0-beta.3 (2021-06-03) - Merged `bearerTokenChallengeAuthenticationPolicy` into `bearerTokenAuthenticationPolicy`. This will keep the functionality of `bearerTokenAuthenticationPolicy`, but also adds the `challengeCallbacks` feature. diff --git a/sdk/core/core-rest-pipeline/package.json b/sdk/core/core-rest-pipeline/package.json index 2760c6257af5..5848c1a2bc5a 100644 --- a/sdk/core/core-rest-pipeline/package.json +++ b/sdk/core/core-rest-pipeline/package.json @@ -1,6 +1,6 @@ { "name": "@azure/core-rest-pipeline", - "version": "1.1.0-beta.4", + "version": "1.1.0", "description": "Isomorphic client library for making HTTP requests in node.js and browser.", "sdk-type": "client", "main": "dist/index.js", @@ -93,7 +93,7 @@ "dependencies": { "@azure/abort-controller": "^1.0.0", "@azure/core-auth": "^1.3.0", - "@azure/core-tracing": "1.0.0-preview.11", + "@azure/core-tracing": "1.0.0-preview.12", "@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 3ada95732249..fd6125a05201 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.context(); + const spanContext = span.spanContext(); 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 4f10a42646a9..f7003d05c446 100644 --- a/sdk/core/core-rest-pipeline/test/tracingPolicy.spec.ts +++ b/sdk/core/core-rest-pipeline/test/tracingPolicy.spec.ts @@ -88,7 +88,7 @@ class MockSpan implements Span { return this._attributes[key]; } - context(): SpanContext { + spanContext(): SpanContext { const state = this.state; const traceState = { diff --git a/sdk/core/perf-tests/core-rest-pipeline/package.json b/sdk/core/perf-tests/core-rest-pipeline/package.json index d253ccf01d9c..05096d5ba069 100644 --- a/sdk/core/perf-tests/core-rest-pipeline/package.json +++ b/sdk/core/perf-tests/core-rest-pipeline/package.json @@ -7,7 +7,7 @@ "author": "", "license": "ISC", "dependencies": { - "@azure/core-rest-pipeline": "1.1.0-beta.4", + "@azure/core-rest-pipeline": "^1.1.0", "@azure/core-auth": "^1.3.0", "@azure/test-utils-perfstress": "^1.0.0", "dotenv": "^8.2.0" diff --git a/sdk/cosmosdb/cosmos/package.json b/sdk/cosmosdb/cosmos/package.json index b7fe171f8e98..c43b9d34face 100644 --- a/sdk/cosmosdb/cosmos/package.json +++ b/sdk/cosmosdb/cosmos/package.json @@ -87,7 +87,7 @@ }, "dependencies": { "@azure/core-auth": "^1.3.0", - "@azure/core-rest-pipeline": "^1.0.3", + "@azure/core-rest-pipeline": "^1.1.0", "debug": "^4.1.1", "fast-json-stable-stringify": "^2.0.0", "jsbi": "^3.1.3", diff --git a/sdk/documenttranslator/ai-document-translator-rest/package.json b/sdk/documenttranslator/ai-document-translator-rest/package.json index b4cf27b654e2..85dc02526b4e 100644 --- a/sdk/documenttranslator/ai-document-translator-rest/package.json +++ b/sdk/documenttranslator/ai-document-translator-rest/package.json @@ -91,7 +91,7 @@ "dependencies": { "@azure/core-auth": "^1.3.0", "@azure-rest/core-client": "1.0.0-beta.4", - "@azure/core-rest-pipeline": "^1.0.3", + "@azure/core-rest-pipeline": "^1.1.0", "@azure/logger": "^1.0.0", "tslib": "^2.2.0" }, diff --git a/sdk/eventgrid/eventgrid/package.json b/sdk/eventgrid/eventgrid/package.json index 667a68b65182..2bab3114d7a7 100644 --- a/sdk/eventgrid/eventgrid/package.json +++ b/sdk/eventgrid/eventgrid/package.json @@ -91,8 +91,8 @@ "dependencies": { "@azure/core-auth": "^1.3.0", "@azure/core-client": "^1.0.0", - "@azure/core-rest-pipeline": "^1.0.3", - "@azure/core-tracing": "1.0.0-preview.11", + "@azure/core-rest-pipeline": "^1.1.0", + "@azure/core-tracing": "1.0.0-preview.12", "@azure/logger": "^1.0.0", "tslib": "^2.2.0", "uuid": "^8.3.0" diff --git a/sdk/iot/iot-modelsrepository/package.json b/sdk/iot/iot-modelsrepository/package.json index e1a131282d7b..92d32575096c 100644 --- a/sdk/iot/iot-modelsrepository/package.json +++ b/sdk/iot/iot-modelsrepository/package.json @@ -66,8 +66,8 @@ "dependencies": { "@azure/core-client": "^1.0.0", "@azure/core-util": "^1.0.0-beta.1", - "@azure/core-rest-pipeline": "^1.0.3", - "@azure/core-tracing": "1.0.0-preview.11", + "@azure/core-rest-pipeline": "^1.1.0", + "@azure/core-tracing": "1.0.0-preview.12", "@azure/logger": "^1.0.0", "events": "^3.0.0", "tslib": "^2.2.0" diff --git a/sdk/keyvault/keyvault-admin/package.json b/sdk/keyvault/keyvault-admin/package.json index 65cd07c9b75b..2b3d32eaf19e 100644 --- a/sdk/keyvault/keyvault-admin/package.json +++ b/sdk/keyvault/keyvault-admin/package.json @@ -109,8 +109,8 @@ "@azure/core-http": "^1.2.0", "@azure/core-lro": "^1.0.6", "@azure/core-paging": "^1.1.1", - "@azure/core-rest-pipeline": "1.1.0-beta.4", - "@azure/core-tracing": "1.0.0-preview.11", + "@azure/core-rest-pipeline": "^1.1.0", + "@azure/core-tracing": "1.0.0-preview.12", "@azure/logger": "^1.0.0", "@types/uuid": "^8.0.0", "tslib": "^2.2.0", diff --git a/sdk/keyvault/keyvault-admin/test/utils/supportsTracing.ts b/sdk/keyvault/keyvault-admin/test/utils/supportsTracing.ts index da54ac21a98c..e3b3aa41f8af 100644 --- a/sdk/keyvault/keyvault-admin/test/utils/supportsTracing.ts +++ b/sdk/keyvault/keyvault-admin/test/utils/supportsTracing.ts @@ -34,7 +34,7 @@ export async function supportsTracing( // Ensure top-level children are created correctly. // Testing the entire tree structure can be tricky as other packages might create their own spans. - const spanGraph = tracer.getSpanGraph(rootSpan.context().traceId); + const spanGraph = tracer.getSpanGraph(rootSpan.spanContext().traceId); const directChildren = spanGraph.roots[0].children.map((child) => child.name); // LROs might poll N times, so we'll make a unique array and compare that. assert.sameMembers(Array.from(new Set(directChildren)), children); diff --git a/sdk/purview/purview-catalog-rest/package.json b/sdk/purview/purview-catalog-rest/package.json index b52fe0d6c388..c26b4d53f52e 100644 --- a/sdk/purview/purview-catalog-rest/package.json +++ b/sdk/purview/purview-catalog-rest/package.json @@ -85,7 +85,7 @@ "dependencies": { "@azure/core-auth": "^1.3.0", "@azure-rest/core-client": "1.0.0-beta.4", - "@azure/core-rest-pipeline": "^1.0.3", + "@azure/core-rest-pipeline": "^1.1.0", "@azure/logger": "^1.0.0", "tslib": "^2.2.0" }, diff --git a/sdk/purview/purview-scanning-rest/package.json b/sdk/purview/purview-scanning-rest/package.json index 1373d967f220..61584a41ab83 100644 --- a/sdk/purview/purview-scanning-rest/package.json +++ b/sdk/purview/purview-scanning-rest/package.json @@ -85,7 +85,7 @@ "dependencies": { "@azure/core-auth": "^1.3.0", "@azure-rest/core-client": "1.0.0-beta.4", - "@azure/core-rest-pipeline": "^1.0.3", + "@azure/core-rest-pipeline": "^1.1.0", "@azure/logger": "^1.0.0", "tslib": "^2.2.0" }, diff --git a/sdk/storage/perf-tests/storage-blob/package.json b/sdk/storage/perf-tests/storage-blob/package.json index 37aad0a42180..69652be5dd4d 100644 --- a/sdk/storage/perf-tests/storage-blob/package.json +++ b/sdk/storage/perf-tests/storage-blob/package.json @@ -8,7 +8,7 @@ "license": "ISC", "dependencies": { "@azure/core-http": "^1.2.0", - "@azure/core-rest-pipeline": "^1.0.3", + "@azure/core-rest-pipeline": "^1.1.0", "@azure/storage-blob": "^12.6.0-beta.1", "@azure/test-utils-perfstress": "^1.0.0", "dotenv": "^8.2.0", diff --git a/sdk/storage/storage-blob/package.json b/sdk/storage/storage-blob/package.json index 231a43507320..12edfff46aa1 100644 --- a/sdk/storage/storage-blob/package.json +++ b/sdk/storage/storage-blob/package.json @@ -136,7 +136,7 @@ "tslib": "^2.2.0" }, "devDependencies": { - "@azure/core-rest-pipeline": "^1.0.3", + "@azure/core-rest-pipeline": "^1.1.0", "@azure/dev-tool": "^1.0.0", "@azure/eslint-plugin-azure-sdk": "^3.0.0", "@azure/identity": "2.0.0-beta.4", diff --git a/sdk/tables/data-tables/package.json b/sdk/tables/data-tables/package.json index 2e360e93587c..6accb5c71e4f 100644 --- a/sdk/tables/data-tables/package.json +++ b/sdk/tables/data-tables/package.json @@ -78,11 +78,11 @@ "dependencies": { "@azure/core-auth": "^1.3.0", "@azure/core-client": "^1.0.0", - "@azure/core-rest-pipeline": "^1.0.3", + "@azure/core-rest-pipeline": "^1.1.0", "@azure/core-paging": "^1.1.1", "@azure/core-xml": "1.0.0-beta.1", "@azure/logger": "^1.0.0", - "@azure/core-tracing": "1.0.0-preview.11", + "@azure/core-tracing": "1.0.0-preview.12", "tslib": "^2.2.0", "uuid": "^8.3.0" }, diff --git a/sdk/textanalytics/ai-text-analytics/package.json b/sdk/textanalytics/ai-text-analytics/package.json index 8ab2efab712b..27fd072f9334 100644 --- a/sdk/textanalytics/ai-text-analytics/package.json +++ b/sdk/textanalytics/ai-text-analytics/package.json @@ -93,10 +93,10 @@ "@azure/core-asynciterator-polyfill": "^1.0.0", "@azure/core-auth": "^1.3.0", "@azure/core-client": "^1.0.0", - "@azure/core-rest-pipeline": "^1.0.3", + "@azure/core-rest-pipeline": "^1.1.0", "@azure/core-lro": "^1.0.6", "@azure/core-paging": "^1.1.1", - "@azure/core-tracing": "1.0.0-preview.11", + "@azure/core-tracing": "1.0.0-preview.12", "@azure/logger": "^1.0.0", "tslib": "^2.2.0" }, From 13e1fbae6c7a598b22175ba33de33fd2a4301105 Mon Sep 17 00:00:00 2001 From: Maor Leger Date: Wed, 23 Jun 2021 08:31:23 -0700 Subject: [PATCH 2/3] change versions --- common/config/rush/common-versions.json | 2 -- sdk/core/core-rest-pipeline/CHANGELOG.md | 2 +- sdk/core/core-rest-pipeline/src/constants.ts | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/common/config/rush/common-versions.json b/common/config/rush/common-versions.json index a9ba42820513..bc80b41a13a2 100644 --- a/common/config/rush/common-versions.json +++ b/common/config/rush/common-versions.json @@ -65,8 +65,6 @@ // @azure/test-utils-perfstress should depend on lowest version of @azure/core-http for maximum compatibility, allowing test // projects to choose a higher version if desired. "@azure/core-http": ["^1.0.0"], - // @azure/container-registry and perf test are using the beta version in the repo. - "@azure/core-rest-pipeline": ["1.1.0-beta.4"], // @azure/event-processor-host is on a much lower major version "@azure/ms-rest-nodeauth": ["^0.9.2"], // Idenity is moving from v1 to v2. Moving all packages to v2 is going to take a bit of time, in the mean time we could use v2 on the perf-identity tests. diff --git a/sdk/core/core-rest-pipeline/CHANGELOG.md b/sdk/core/core-rest-pipeline/CHANGELOG.md index 11ec96469894..204c6f00e236 100644 --- a/sdk/core/core-rest-pipeline/CHANGELOG.md +++ b/sdk/core/core-rest-pipeline/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 1.1.0-beta.4 (Unreleased) +## 1.1.0 (Unreleased) ### Fixed diff --git a/sdk/core/core-rest-pipeline/src/constants.ts b/sdk/core/core-rest-pipeline/src/constants.ts index a1df7c491c7a..9ffa1892ce39 100644 --- a/sdk/core/core-rest-pipeline/src/constants.ts +++ b/sdk/core/core-rest-pipeline/src/constants.ts @@ -1,4 +1,4 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -export const SDK_VERSION: string = "1.1.0-beta.4"; +export const SDK_VERSION: string = "1.1.0"; From 151739c98eabb25cb42100c967235e898194c897 Mon Sep 17 00:00:00 2001 From: Maor Leger Date: Wed, 23 Jun 2021 12:17:12 -0700 Subject: [PATCH 3/3] leave cosmos unchanged --- common/config/rush/common-versions.json | 4 ++-- sdk/cosmosdb/cosmos/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/config/rush/common-versions.json b/common/config/rush/common-versions.json index bc80b41a13a2..46ee6a250076 100644 --- a/common/config/rush/common-versions.json +++ b/common/config/rush/common-versions.json @@ -72,7 +72,7 @@ // 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 once core-rest-pipeline 1.1.0 GAs - "@azure/core-tracing": ["1.0.0-preview.11"] + // @azure/cosmos was unable to upgrade due to test failures, Issue #15928 tracks making this upgrade + "@azure/core-rest-pipeline": ["^1.0.3"] } } diff --git a/sdk/cosmosdb/cosmos/package.json b/sdk/cosmosdb/cosmos/package.json index c43b9d34face..b7fe171f8e98 100644 --- a/sdk/cosmosdb/cosmos/package.json +++ b/sdk/cosmosdb/cosmos/package.json @@ -87,7 +87,7 @@ }, "dependencies": { "@azure/core-auth": "^1.3.0", - "@azure/core-rest-pipeline": "^1.1.0", + "@azure/core-rest-pipeline": "^1.0.3", "debug": "^4.1.1", "fast-json-stable-stringify": "^2.0.0", "jsbi": "^3.1.3",