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

[PREVIEW] UserAgent: Adds flag to user agent string if preview SDK. #2960

Merged
merged 8 commits into from
Jan 6, 2022
Merged

[PREVIEW] UserAgent: Adds flag to user agent string if preview SDK. #2960

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f379e2b
Added flag to user agent string if preview SDK.
SchintaMicrosoft Dec 27, 2021
4a84814
VerifyUserAgentContent test method updated
SchintaMicrosoft Dec 27, 2021
d1e80bf
User agent tag changes
SchintaMicrosoft Dec 28, 2021
f7e324a
If Preview condition added
SchintaMicrosoft Jan 3, 2022
b81a001
Preview test bug fixed
SchintaMicrosoft Jan 3, 2022
afd2f76
Readability improved in UserAgent String.
SchintaMicrosoft Jan 4, 2022
7fef1d5
Indent issues fixed
SchintaMicrosoft Jan 4, 2022
20063a5
Merge branch 'master' into users/schinta/2831
j82w Jan 6, 2022
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
5 changes: 4 additions & 1 deletion Microsoft.Azure.Cosmos/src/UserAgentContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,11 @@ private string CreateBaseUserAgentString(

// Regex replaces all special characters with empty space except . - | since they do not cause format exception for the user agent string.
// Do not change the cosmos-netstandard-sdk as it is required for reporting
#if PREVIEW
string baseUserAgent = $"cosmos-netstandard-sdk/{clientVersion}" + "P" + Regex.Replace($"|{directVersion}|{this.clientId}|{processArchitecture}|{operatingSystem}|{runtimeFramework}|", @"[^0-9a-zA-Z\.\|\-]+", " ");
j82w marked this conversation as resolved.
Show resolved Hide resolved
SchintaMicrosoft marked this conversation as resolved.
Show resolved Hide resolved
#else
string baseUserAgent = $"cosmos-netstandard-sdk/{clientVersion}" + Regex.Replace($"|{directVersion}|{this.clientId}|{processArchitecture}|{operatingSystem}|{runtimeFramework}|", @"[^0-9a-zA-Z\.\|\-]+", " ");

#endif
if (!string.IsNullOrEmpty(regionConfiguration))
{
baseUserAgent += $"{regionConfiguration}|";
Expand Down
7 changes: 6 additions & 1 deletion Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/UserAgentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,12 @@ public void VerifyUserAgentContent()

Assert.IsTrue(serialization.Contains(envInfo.ProcessArchitecture));
string[] values = serialization.Split('|');

#if PREVIEW
Assert.AreEqual($"cosmos-netstandard-sdk/{envInfo.ClientVersion}" + "P", values[0]);
#else
Assert.AreEqual($"cosmos-netstandard-sdk/{envInfo.ClientVersion}", values[0]);
#endif
Assert.AreEqual(envInfo.DirectVersion, values[1]);
Assert.AreEqual("0", values[2]);
Assert.AreEqual(envInfo.ProcessArchitecture, values[3]);
Expand All @@ -100,7 +105,7 @@ public void VerifyUserAgentContent()
public async Task VerifyUserAgentWithRegionConfiguration()
{
string databaseName = Guid.NewGuid().ToString();
string containerName = Guid.NewGuid().ToString();
string containerName = Guid.NewGuid().ToString();

{
CosmosClientOptions cosmosClientOptions = new CosmosClientOptions();
Expand Down