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

Diagnostics: Adds request session token #3176

Merged
merged 14 commits into from
May 9, 2022
Merged

Diagnostics: Adds request session token #3176

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
dee447b
Add Session token into trace
May 5, 2022
75c79b8
revert prior changes
May 5, 2022
e4c52e8
Add session token into StoreResponseStatistics
May 5, 2022
8894456
add session token into json writer and change property to string inst…
May 5, 2022
65e50e2
Merge branch 'master' into users/imanvt/3107-add-session-token-into-r…
j82w May 6, 2022
570fdeb
clarify naming for session token
May 6, 2022
d2ee476
Merge branch 'users/imanvt/3107-add-session-token-into-request-diagno…
May 6, 2022
c8c805f
update baseline for renaming of session token
May 9, 2022
9d654c8
rename session token variable for clarity
May 9, 2022
3c95fb1
Merge branch 'master' into users/imanvt/3107-add-session-token-into-r…
imanvt May 9, 2022
cb2fc80
update variable reference
May 9, 2022
11c38c6
Merge branch 'users/imanvt/3107-add-session-token-into-request-diagno…
May 9, 2022
ed7892f
update baseline due to renaming of variable
May 9, 2022
91bbef7
don't write session token if null/empty
May 9, 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
4 changes: 4 additions & 0 deletions Microsoft.Azure.Cosmos/src/Tracing/TraceData/ClientSideRequestStatisticsTraceDatum.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ public void RecordResponse(
storeResult,
request.ResourceType,
request.OperationType,
request.RequestContext.SessionToken,
imanvt marked this conversation as resolved.
Show resolved Hide resolved
locationEndpoint);

lock (this.storeResponseStatistics)
Expand Down Expand Up @@ -441,13 +442,15 @@ public StoreResponseStatistics(
StoreResult storeResult,
ResourceType resourceType,
OperationType operationType,
ISessionToken sessionToken,
Uri locationEndpoint)
{
this.RequestStartTime = requestStartTime;
this.RequestResponseTime = requestResponseTime;
this.StoreResult = storeResult;
this.RequestResourceType = resourceType;
this.RequestOperationType = operationType;
this.RequestSessionToken = sessionToken;
imanvt marked this conversation as resolved.
Show resolved Hide resolved
this.LocationEndpoint = locationEndpoint;
this.IsSupplementalResponse = operationType == OperationType.Head || operationType == OperationType.HeadFeed;
}
Expand All @@ -457,6 +460,7 @@ public StoreResponseStatistics(
public StoreResult StoreResult { get; }
public ResourceType RequestResourceType { get; }
public OperationType RequestOperationType { get; }
public ISessionToken RequestSessionToken { get; }
public Uri LocationEndpoint { get; }
public bool IsSupplementalResponse { get; }
}
Expand Down
2 changes: 2 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 @@ -239,6 +239,7 @@
transportRequestStats: TraceWriterBaselineTests.CreateTransportRequestStats()),
ResourceType.Document,
OperationType.Query,
new SimpleSessionToken(42),
uri1.Uri);

TraceWriterBaselineTests.GetPrivateField<List<StoreResponseStatistics>>(datum, "storeResponseStatistics").Add(storeResponseStatistics);
Expand Down Expand Up @@ -463,6 +464,7 @@
transportRequestStats: TraceWriterBaselineTests.CreateTransportRequestStats()),
resourceType: default,
operationType: default,
sessionToken: default,
imanvt marked this conversation as resolved.
Show resolved Hide resolved
locationEndpoint: default);

TraceWriterBaselineTests.GetPrivateField<List<StoreResponseStatistics>>(datum, "storeResponseStatistics").Add(storeResponseStatistics);
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 @@ -127,6 +127,7 @@ public void ValidateStoreResultSerialization()
storeResult,
ResourceType.Document,
OperationType.Query,
new SimpleSessionToken(42),
new Uri("http://someUri1.com"));

((List<StoreResponseStatistics>)datum.GetType().GetField("storeResponseStatistics", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(datum)).Add(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 @@ -385,6 +385,7 @@ public void TraceData()
transportRequestStats: TraceWriterBaselineTests.CreateTransportRequestStats()),
ResourceType.Document,
OperationType.Query,
new SimpleSessionToken(42),
uri1.Uri);

TraceWriterBaselineTests.GetPrivateField<List<StoreResponseStatistics>>(datum, "storeResponseStatistics").Add(storeResponseStatistics);
Expand Down Expand Up @@ -437,6 +438,7 @@ public void TraceData()
transportRequestStats: TraceWriterBaselineTests.CreateTransportRequestStats()),
resourceType: default,
operationType: default,
sessionToken: default,
locationEndpoint: default);

TraceWriterBaselineTests.GetPrivateField<List<StoreResponseStatistics>>(datum, "storeResponseStatistics").Add(storeResponseStatistics);
Expand Down