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

Jump to bottom

Direct: Adds 3.23.1 version #2818

Merged
merged 11 commits into from
Oct 26, 2021
Merged

Direct: Adds 3.23.1 version #2818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c55b6e8
bump direct version to 3.23.0
Oct 25, 2021
b6f5c02
Fix tests
Oct 25, 2021
81a3574
Fix tests
Oct 25, 2021
8aa808b
Merge branch 'master' into users/jawilley/direct/3.23.0
j82w Oct 25, 2021
466cecb
Update store result output
Oct 25, 2021
462f4fe
Merge branch 'users/jawilley/direct/3.23.0' of https://github.com/Azu…
Oct 25, 2021
8600eee
Bump to 3.23.1
Oct 26, 2021
25224ec
Merge branch 'master' into users/jawilley/direct/3.23.0
j82w Oct 26, 2021
5bc8295
Update baseline
Oct 26, 2021
61673a5
Merge branch 'users/jawilley/direct/3.23.0' of https://github.com/Azu…
Oct 26, 2021
ebe2d2a
Merge branch 'master' into users/jawilley/direct/3.23.0
j82w Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ClientOfficialVersion>3.22.0</ClientOfficialVersion>
<ClientPreviewVersion>3.22.1</ClientPreviewVersion>
<ClientPreviewSuffixVersion>preview</ClientPreviewSuffixVersion>
<DirectVersion>3.22.0</DirectVersion>
<DirectVersion>3.23.1</DirectVersion>
<EncryptionVersion>1.0.0-previewV17</EncryptionVersion>
<CustomEncryptionVersion>1.0.0-preview</CustomEncryptionVersion>
<HybridRowVersion>1.1.0-preview3</HybridRowVersion>
Expand Down
3 changes: 3 additions & 0 deletions Microsoft.Azure.Cosmos/src/Tracing/TraceWriter.TraceJsonWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,9 @@ public void Visit(StoreResult storeResult)
this.jsonWriter.WriteFieldName(nameof(storeResult.RequestCharge));
this.jsonWriter.WriteNumber64Value(storeResult.RequestCharge);

this.jsonWriter.WriteFieldName(nameof(storeResult.RetryAfterInMs));
this.WriteStringValueOrNull(storeResult.RetryAfterInMs);

this.jsonWriter.WriteFieldName("BELatencyInMs");
this.WriteStringValueOrNull(storeResult.BackendRequestDurationInMs);

Expand Down
29 changes: 14 additions & 15 deletions Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/CosmosContainerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ namespace Microsoft.Azure.Cosmos.SDK.EmulatorTests
using System.Threading.Tasks;
using Microsoft.Azure.Cosmos.Resource.CosmosExceptions;
using Microsoft.Azure.Cosmos.Tracing;
using Microsoft.Azure.Documents;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is using removal and full scoping intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Direct package file ClientEncryptionPolicy which had a breaking change that removed a property. Cosmos has it's own version of ClientEncryptionPolicy. The tests were validating the direct version instead of the public Cosmos version. I fixed all the tests to use the correct Cosmos.ClientEncryptionPolicy.

using Microsoft.VisualStudio.TestTools.UnitTesting;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
Expand Down Expand Up @@ -497,7 +496,7 @@ public async Task PartitionedCreateWithPathDelete()
string containerName = Guid.NewGuid().ToString();
string partitionKeyPath = "/users";

PartitionKeyDefinition partitionKeyDefinition = new PartitionKeyDefinition();
Documents.PartitionKeyDefinition partitionKeyDefinition = new Documents.PartitionKeyDefinition();
j82w marked this conversation as resolved.
Show resolved Hide resolved
partitionKeyDefinition.Paths.Add(partitionKeyPath);

ContainerProperties settings = new ContainerProperties(containerName, partitionKeyDefinition);
Expand Down Expand Up @@ -526,7 +525,7 @@ public async Task CreateContainerIfNotExistsPropertiesTestAsync()
{
UpdateRequestMessage = requestMessage =>
{
if (requestMessage.ResourceType == ResourceType.Collection)
if (requestMessage.ResourceType == Documents.ResourceType.Collection)
{
count++;
Assert.IsNotNull(requestMessage.Properties);
Expand Down Expand Up @@ -646,7 +645,7 @@ public async Task CreateContainerWithSystemKeyTest()
//Creating existing container with partition key having value for SystemKey
//https://github.com/Azure/azure-cosmos-dotnet-v3/issues/623
string v2ContainerName = "V2Container";
PartitionKeyDefinition partitionKeyDefinition = new PartitionKeyDefinition();
Documents.PartitionKeyDefinition partitionKeyDefinition = new Documents.PartitionKeyDefinition();
partitionKeyDefinition.Paths.Add("/test");
partitionKeyDefinition.IsSystemKey = false;
ContainerProperties containerPropertiesWithSystemKey = new ContainerProperties()
Expand Down Expand Up @@ -806,7 +805,7 @@ public async Task StreamPartitionedCreateWithPathDelete()
string containerName = Guid.NewGuid().ToString();
string partitionKeyPath = "/users";

PartitionKeyDefinition partitionKeyDefinition = new PartitionKeyDefinition();
Documents.PartitionKeyDefinition partitionKeyDefinition = new Documents.PartitionKeyDefinition();
partitionKeyDefinition.Paths.Add(partitionKeyPath);

ContainerProperties settings = new ContainerProperties(containerName, partitionKeyDefinition);
Expand All @@ -826,7 +825,7 @@ public async Task NegativePartitionedCreateDelete()
{
string containerName = Guid.NewGuid().ToString();

PartitionKeyDefinition partitionKeyDefinition = new PartitionKeyDefinition();
Documents.PartitionKeyDefinition partitionKeyDefinition = new Documents.PartitionKeyDefinition();
partitionKeyDefinition.Paths.Add("/users");
partitionKeyDefinition.Paths.Add("/test");

Expand Down Expand Up @@ -1110,7 +1109,7 @@ public async Task TimeToLiveTest()
ContainerProperties setting = new ContainerProperties()
{
Id = containerName,
PartitionKey = new PartitionKeyDefinition() { Paths = new Collection<string> { partitionKeyPath }, Kind = PartitionKind.Hash },
PartitionKey = new Documents.PartitionKeyDefinition() { Paths = new Collection<string> { partitionKeyPath }, Kind = Documents.PartitionKind.Hash },
DefaultTimeToLive = timeToLiveInSeconds,
};

Expand Down Expand Up @@ -1276,7 +1275,7 @@ public async Task TimeToLivePropertyPath()
ContainerProperties setting = new ContainerProperties()
{
Id = containerName,
PartitionKey = new PartitionKeyDefinition() { Paths = new Collection<string> { partitionKeyPath }, Kind = PartitionKind.Hash },
PartitionKey = new Documents.PartitionKeyDefinition() { Paths = new Collection<string> { partitionKeyPath }, Kind = Documents.PartitionKind.Hash },
TimeToLivePropertyPath = "/creationDate",
};

Expand Down Expand Up @@ -1328,16 +1327,16 @@ public async Task TimeToLivePropertyPath()
[TestMethod]
public async Task ContainerCreationFailsWithUnknownClientEncryptionKey()
{
ClientEncryptionIncludedPath unknownKeyConfigured = new ClientEncryptionIncludedPath()
ClientEncryptionIncludedPath unknownKeyConfigured = new Cosmos.ClientEncryptionIncludedPath()
{
Path = "/",
ClientEncryptionKeyId = "unknownKey",
EncryptionType = "Deterministic",
EncryptionAlgorithm = "AEAD_AES_256_CBC_HMAC_SHA256",
};

Collection<ClientEncryptionIncludedPath> paths = new Collection<ClientEncryptionIncludedPath> { unknownKeyConfigured };
ClientEncryptionPolicy clientEncryptionPolicyId = new ClientEncryptionPolicy(paths);
Collection<Cosmos.ClientEncryptionIncludedPath> paths = new Collection<Cosmos.ClientEncryptionIncludedPath> { unknownKeyConfigured };
Cosmos.ClientEncryptionPolicy clientEncryptionPolicyId = new Cosmos.ClientEncryptionPolicy(paths);

ContainerProperties containerProperties = new ContainerProperties(Guid.NewGuid().ToString(), "/PK") { ClientEncryptionPolicy = clientEncryptionPolicyId };

Expand Down Expand Up @@ -1383,7 +1382,7 @@ public async Task ClientEncryptionPolicyTest()
ContainerProperties setting = new ContainerProperties()
{
Id = containerName,
PartitionKey = new PartitionKeyDefinition() { Paths = new Collection<string> { partitionKeyPath }, Kind = PartitionKind.Hash },
PartitionKey = new Documents.PartitionKeyDefinition() { Paths = new Collection<string> { partitionKeyPath }, Kind = Documents.PartitionKind.Hash },
ClientEncryptionPolicy = new ClientEncryptionPolicy(paths)
};

Expand Down Expand Up @@ -1457,7 +1456,7 @@ public async Task ClientEncryptionPolicyFailureTest()
ContainerProperties setting = new ContainerProperties()
{
Id = containerName,
PartitionKey = new PartitionKeyDefinition() { Paths = new Collection<string> { partitionKeyPath }, Kind = PartitionKind.Hash },
PartitionKey = new Documents.PartitionKeyDefinition() { Paths = new Collection<string> { partitionKeyPath }, Kind = Documents.PartitionKind.Hash },
ClientEncryptionPolicy = new ClientEncryptionPolicy(paths)
};

Expand Down Expand Up @@ -1493,7 +1492,7 @@ public async Task ClientEncryptionPolicyFailureTest()
ContainerProperties setting = new ContainerProperties()
{
Id = containerName,
PartitionKey = new PartitionKeyDefinition() { Paths = new Collection<string> { partitionKeyPath }, Kind = PartitionKind.Hash },
PartitionKey = new Documents.PartitionKeyDefinition() { Paths = new Collection<string> { partitionKeyPath }, Kind = Documents.PartitionKind.Hash },
ClientEncryptionPolicy = new ClientEncryptionPolicy(pathsList)
};

Expand All @@ -1520,7 +1519,7 @@ public async Task ClientEncryptionPolicyFailureTest()
ContainerProperties setting = new ContainerProperties()
{
Id = containerName,
PartitionKey = new PartitionKeyDefinition() { Paths = new Collection<string> { partitionKeyPath }, Kind = PartitionKind.Hash },
PartitionKey = new Documents.PartitionKeyDefinition() { Paths = new Collection<string> { partitionKeyPath }, Kind = Documents.PartitionKind.Hash },
ClientEncryptionPolicy = new ClientEncryptionPolicy(pathsToEncryptWithPartitionKey)
};

Expand Down
1 change: 1 addition & 0 deletions Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/TransportWrapperTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ private void ValidateTransportException(ResponseMessage responseMessage)
usingLocalLSN: true,
activityId: Guid.NewGuid().ToString(),
backendRequestDurationInMs: "0",
retryAfterInMs: "42",
transportRequestStats: new TransportRequestStats()),
DateTime.MinValue,
DateTime.MaxValue);
Expand Down
4 changes: 4 additions & 0 deletions ...osoft.Azure.Cosmos.Tests/BaselineTest/TestBaseline/TraceWriterBaselineTests.TraceData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@
usingLocalLSN: true,
activityId: Guid.Empty.ToString(),
backendRequestDurationInMs: "4.2",
retryAfterInMs: "42",
transportRequestStats: TraceWriterBaselineTests.CreateTransportRequestStats()),
ResourceType.Document,
OperationType.Query,
Expand Down Expand Up @@ -374,6 +375,7 @@
"IsValid": true,
"StorePhysicalAddress": "http://storephysicaladdress.com/",
"RequestCharge": 3.14,
"RetryAfterInMs": "42",
"BELatencyInMs": "4.2",
"transportRequestTimeline": {
"requestTimeline": [
Expand Down Expand Up @@ -457,6 +459,7 @@
sessionToken: default,
usingLocalLSN: default,
activityId: default,
retryAfterInMs: default,
backendRequestDurationInMs: default,
transportRequestStats: TraceWriterBaselineTests.CreateTransportRequestStats()),
resourceType: default,
Expand Down Expand Up @@ -570,6 +573,7 @@
"IsValid": false,
"StorePhysicalAddress": null,
"RequestCharge": 0,
"RetryAfterInMs": null,
"BELatencyInMs": null,
"transportRequestTimeline": {
"requestTimeline": [
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/CosmosContainerSettingsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void ValidateSerialization()
[TestMethod]
public void ValidateClientEncryptionPolicyDeserialization()
{
ClientEncryptionPolicy policy = MockCosmosUtil.Serializer.FromStream<ClientEncryptionPolicy>(new MemoryStream(
Cosmos.ClientEncryptionPolicy policy = MockCosmosUtil.Serializer.FromStream<Cosmos.ClientEncryptionPolicy>(new MemoryStream(
Encoding.UTF8.GetBytes("{ 'policyFormatVersion': 2, 'newproperty': 'value' }")));
Assert.AreEqual(2, policy.PolicyFormatVersion);
}
Expand Down
1 change: 1 addition & 0 deletions .../tests/Microsoft.Azure.Cosmos.Tests/Tracing/ClientSideRequestStatisticsTraceDatumTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public class ClientSideRequestStatisticsTraceDatumTests
usingLocalLSN: true,
activityId: Guid.Empty.ToString(),
backendRequestDurationInMs: "4.2",
retryAfterInMs: "42",
transportRequestStats: TraceWriterBaselineTests.CreateTransportRequestStats());

/// <summary>
Expand Down
1 change: 1 addition & 0 deletions Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Tracing/TraceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ public void ValidateStoreResultSerialization()
usingLocalLSN: true,
activityId: Guid.Empty.ToString(),
backendRequestDurationInMs: "4.2",
retryAfterInMs: "42",
transportRequestStats: TraceWriterBaselineTests.CreateTransportRequestStats());

StoreResponseStatistics storeResponseStatistics = new StoreResponseStatistics(
Expand Down
2 changes: 2 additions & 0 deletions ...osoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Tracing/TraceWriterBaselineTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,7 @@ public void TraceData()
usingLocalLSN: true,
activityId: Guid.Empty.ToString(),
backendRequestDurationInMs: "4.2",
retryAfterInMs: "42",
transportRequestStats: TraceWriterBaselineTests.CreateTransportRequestStats()),
ResourceType.Document,
OperationType.Query,
Expand Down Expand Up @@ -431,6 +432,7 @@ public void TraceData()
sessionToken: default,
usingLocalLSN: default,
activityId: default,
retryAfterInMs: default,
backendRequestDurationInMs: default,
transportRequestStats: TraceWriterBaselineTests.CreateTransportRequestStats()),
resourceType: default,
Expand Down