Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated release versions to 4.45 for azure-cosmos and azure-cosmos-encryption #34925

Merged
merged 8 commits into from
May 13, 2023
Merged

Updated release versions to 4.45 for azure-cosmos and azure-cosmos-encryption #34925

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
19b25ce
Updated releaese versions to 4.45 for azure-cosmos and azure-cosmos-e…
kushagraThapar May 12, 2023
ad43272
Code review comments
kushagraThapar May 12, 2023
d152085
Code / API review comments
kushagraThapar May 12, 2023
1929fdf
Making PriorityLevel a string enum
FabianMeiswinkel May 13, 2023
29cb42d
Renamed end to end timeout APIs
kushagraThapar May 13, 2023
db50082
Reverted hot and control plane path timeout changes
kushagraThapar May 13, 2023
45ccc88
Fixed compilation error
kushagraThapar May 13, 2023
1e9e784
renamed latency policy
kushagraThapar May 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/jacoco-test-coverage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<version>4.45.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
<version>4.45.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-cosmos-encryption</artifactId>
<version>2.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos-encryption;current} -->
<version>2.1.0</version> <!-- {x-version-update;com.azure:azure-cosmos-encryption;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
4 changes: 2 additions & 2 deletions eng/versioning/version_client.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,14 @@ com.azure:azure-core-test;1.17.0;1.18.0-beta.1
com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.35;1.0.0-beta.36
com.azure:azure-core-tracing-opentelemetry-samples;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-core-version-tests;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-cosmos;4.44.0;4.45.0-beta.1
com.azure:azure-cosmos;4.44.0;4.45.0
com.azure:azure-cosmos-benchmark;4.0.1-beta.1;4.0.1-beta.1
com.azure:azure-cosmos-dotnet-benchmark;4.0.1-beta.1;4.0.1-beta.1
com.azure.cosmos.spark:azure-cosmos-spark_3_2-12;1.0.0-beta.1;1.0.0-beta.1
com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12;4.18.1;4.19.0-beta.1
com.azure.cosmos.spark:azure-cosmos-spark_3-2_2-12;4.18.1;4.19.0-beta.1
com.azure.cosmos.spark:azure-cosmos-spark_3-3_2-12;4.18.1;4.19.0-beta.1
com.azure:azure-cosmos-encryption;2.0.0;2.1.0-beta.1
com.azure:azure-cosmos-encryption;2.0.0;2.1.0
com.azure:azure-cosmos-test;1.0.0-beta.3;1.0.0-beta.4
com.azure:azure-cosmos-tests;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-data-appconfiguration;1.4.4;1.5.0-beta.1
Expand Down
4 changes: 2 additions & 2 deletions sdk/cosmos/azure-cosmos-benchmark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ Licensed under the MIT License.
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<version>4.45.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
<version>4.45.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-cosmos-encryption</artifactId>
<version>2.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos-encryption;current} -->
<version>2.1.0</version> <!-- {x-version-update;com.azure:azure-cosmos-encryption;current} -->
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Licensed under the MIT License.
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<version>4.45.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
<version>4.45.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
</dependency>

<dependency>
Expand Down
10 changes: 2 additions & 8 deletions sdk/cosmos/azure-cosmos-encryption/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
## Release History

### 2.1.0-beta.1 (Unreleased)

#### Features Added

#### Breaking Changes

#### Bugs Fixed

### 2.1.0 (2023-05-12)
kushagraThapar marked this conversation as resolved.
Show resolved Hide resolved
#### Other Changes
* Updated `azure-cosmos` to version `4.45.0`.

### 2.0.0 (2023-04-25)

Expand Down
2 changes: 1 addition & 1 deletion sdk/cosmos/azure-cosmos-encryption/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The Azure Cosmos Encryption Plugin is used for encrypting data with a user-provi
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-cosmos-encryption</artifactId>
<version>2.0.0</version>
<version>2.1.0</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
4 changes: 2 additions & 2 deletions sdk/cosmos/azure-cosmos-encryption/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Licensed under the MIT License.

<groupId>com.azure</groupId>
<artifactId>azure-cosmos-encryption</artifactId>
<version>2.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos-encryption;current} -->
<version>2.1.0</version> <!-- {x-version-update;com.azure:azure-cosmos-encryption;current} -->
<name>Encryption Plugin for Azure Cosmos DB SDK</name>
<description>This Package contains Encryption Plugin for Microsoft Azure Cosmos SDK</description>
<packaging>jar</packaging>
Expand Down Expand Up @@ -57,7 +57,7 @@ Licensed under the MIT License.
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<version>4.45.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
<version>4.45.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<version>4.45.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
<version>4.45.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
</dependency>
<dependency>
<groupId>org.scala-lang.modules</groupId>
Expand Down
2 changes: 1 addition & 1 deletion sdk/cosmos/azure-cosmos-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Licensed under the MIT License.
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<version>4.45.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
<version>4.45.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdk/cosmos/azure-cosmos-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Licensed under the MIT License.
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<version>4.45.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
<version>4.45.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
2 changes: 1 addition & 1 deletion sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/CosmosAsyncClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
public abstract class CosmosAsyncClientTest implements ITest {

public static final String ROUTING_GATEWAY_EMULATOR_PORT = ":8081";
public static final String COMPUTE_GATEWAY_EMULATOR_PORT = ":9999";
public static final String COMPUTE_GATEWAY_EMULATOR_PORT = ":8081";
kushagraThapar marked this conversation as resolved.
Show resolved Hide resolved
private final CosmosClientBuilder clientBuilder;
private String testName;

Expand Down
12 changes: 6 additions & 6 deletions ...ure-cosmos-tests/src/test/java/com/azure/cosmos/implementation/HttpTimeoutPolicyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@ public void verifyHttpTimeoutPolicyResponseTimeout() throws Exception {
WebExceptionRetryPolicy retryPolicy = new WebExceptionRetryPolicy(retryContext);

retryPolicy.onBeforeSendRequest(dsr);
assertThat(dsr.getResponseTimeout()).isEqualTo(Duration.ofMillis(500));
assertThat(dsr.getResponseTimeout()).isEqualTo(Duration.ofSeconds(60));
assertThat(getBackOffTime(retryPolicy)).isEqualTo(0);

retryContext.addStatusAndSubStatusCode(408, 10002);
retryPolicy.onBeforeSendRequest(dsr);
assertThat(dsr.getResponseTimeout()).isEqualTo(Duration.ofSeconds(5));
assertThat(dsr.getResponseTimeout()).isEqualTo(Duration.ofSeconds(60));
assertThat(getBackOffTime(retryPolicy)).isEqualTo(1);

retryContext.addStatusAndSubStatusCode(408, 10002);
retryPolicy.onBeforeSendRequest(dsr);
assertThat(dsr.getResponseTimeout()).isEqualTo(Duration.ofSeconds(10));
assertThat(dsr.getResponseTimeout()).isEqualTo(Duration.ofSeconds(60));
assertThat(getBackOffTime(retryPolicy)).isEqualTo(0);


Expand Down Expand Up @@ -83,18 +83,18 @@ public void verifyHttpTimeoutPolicyResponseTimeout() throws Exception {
retryPolicy = new WebExceptionRetryPolicy(retryContext);

retryPolicy.onBeforeSendRequest(dsr);
assertThat(dsr.getResponseTimeout()).isEqualTo(Duration.ofSeconds(5));
assertThat(dsr.getResponseTimeout()).isEqualTo(Duration.ofSeconds(60));
assertThat(getBackOffTime(retryPolicy)).isEqualTo(0);


retryContext.addStatusAndSubStatusCode(408, 10002);
retryPolicy.onBeforeSendRequest(dsr);
assertThat(dsr.getResponseTimeout()).isEqualTo(Duration.ofSeconds(10));
assertThat(dsr.getResponseTimeout()).isEqualTo(Duration.ofSeconds(60));
assertThat(getBackOffTime(retryPolicy)).isEqualTo(1);

retryContext.addStatusAndSubStatusCode(408, 10002);
retryPolicy.onBeforeSendRequest(dsr);
assertThat(dsr.getResponseTimeout()).isEqualTo(Duration.ofSeconds(20));
assertThat(dsr.getResponseTimeout()).isEqualTo(Duration.ofSeconds(60));
assertThat(getBackOffTime(retryPolicy)).isEqualTo(0);
}

Expand Down
4 changes: 1 addition & 3 deletions sdk/cosmos/azure-cosmos/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Release History

### 4.45.0-beta.1 (Unreleased)
### 4.45.0 (2023-05-12)

#### Features Added
kushagraThapar marked this conversation as resolved.
Show resolved Hide resolved
* Added support for priority based throttling - See [PR 34121](https://github.com/Azure/azure-sdk-for-java/pull/34121)
Expand All @@ -10,8 +10,6 @@
* Added end to end timeout policy for item operations. Requests will be cancelled if they have not finished before the configured timeout - See [PR 34554](https://github.com/Azure/azure-sdk-for-java/pull/34554).
* Added capability to sample diagnostics dynamically (without need to reinitialize the app or the Cosmos Client instance). - See [PR 34915](https://github.com/Azure/azure-sdk-for-java/pull/34915).

#### Breaking Changes

#### Bugs Fixed
* Fixed `IllegalArgumentException` in changeFeedProcessor when `maxScaleCount` is configured - See [PR 34618](https://github.com/Azure/azure-sdk-for-java/pull/34618)
* Removed custom user agent suffix from client telemetry - See [PR 34866](https://github.com/Azure/azure-sdk-for-java/pull/34866)
Expand Down
2 changes: 1 addition & 1 deletion sdk/cosmos/azure-cosmos/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ add the direct dependency to your project as follows.
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<version>4.44.0</version>
<version>4.45.0</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
2 changes: 1 addition & 1 deletion sdk/cosmos/azure-cosmos/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Licensed under the MIT License.

<groupId>com.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<version>4.45.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
<version>4.45.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
<name>Microsoft Azure SDK for SQL API of Azure Cosmos DB Service</name>
<description>This Package contains Microsoft Azure Cosmos SDK (with Reactive Extension Reactor support) for Azure Cosmos DB SQL API</description>
<packaging>jar</packaging>
Expand Down
6 changes: 3 additions & 3 deletions .../main/java/com/azure/cosmos/implementation/http/HttpTimeoutPolicyControlPlaneHotPath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ private HttpTimeoutPolicyControlPlaneHotPath() {
}

public List<ResponseTimeoutAndDelays> getTimeoutList() {
return Collections.unmodifiableList(Arrays.asList(new ResponseTimeoutAndDelays(Duration.ofMillis(500), 0),
new ResponseTimeoutAndDelays(Duration.ofSeconds(5), 1),
new ResponseTimeoutAndDelays(Duration.ofSeconds(10), 0)));
return Collections.unmodifiableList(Arrays.asList(new ResponseTimeoutAndDelays(Duration.ofSeconds(60), 0),
new ResponseTimeoutAndDelays(Duration.ofSeconds(60), 1),
new ResponseTimeoutAndDelays(Duration.ofSeconds(60), 0)));
}
}
8 changes: 3 additions & 5 deletions ...src/main/java/com/azure/cosmos/implementation/http/HttpTimeoutPolicyControlPlaneRead.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Licensed under the MIT License.
package com.azure.cosmos.implementation.http;

import io.netty.handler.codec.http.HttpMethod;

import java.time.Duration;
import java.util.Arrays;
import java.util.Collections;
Expand All @@ -18,8 +16,8 @@ private HttpTimeoutPolicyControlPlaneRead() {
}

public List<ResponseTimeoutAndDelays> getTimeoutList() {
return Collections.unmodifiableList(Arrays.asList(new ResponseTimeoutAndDelays(Duration.ofSeconds(5), 0),
new ResponseTimeoutAndDelays(Duration.ofSeconds(10), 1),
new ResponseTimeoutAndDelays(Duration.ofSeconds(20), 0)));
return Collections.unmodifiableList(Arrays.asList(new ResponseTimeoutAndDelays(Duration.ofSeconds(60), 0),
new ResponseTimeoutAndDelays(Duration.ofSeconds(60), 1),
new ResponseTimeoutAndDelays(Duration.ofSeconds(60), 0)));
}
}