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.

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

Diagnostics: Adds ActivityScope to operation level #1728

Merged
merged 15 commits into from
Jul 30, 2020

Conversation

j82w
Copy link
Contributor

@j82w j82w commented Jul 24, 2020

Pull Request Template

Description

The activity scope is currently set at each network call. This makes it difficult to for Cosmos DB service to track a single user request across multiple retries. This will also fix issues where the Traces did not have an activity id. For query and other operation it will still be a unique activity id per a backend call. This follows the model of the Java SDK. This change seems to be caused by a miss when the retry logic moved from below the TransportHandler to above it as a RequestHandler.

Type of change

Please delete options that are not relevant.

  • [] Bug fix (non-breaking change which fixes an issue)
  • [] New feature (non-breaking change which adds functionality)
  • [] Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • [] This change requires a documentation update

Closing issues

To automatically close an issue: closes #IssueNumber

@j82w j82w added the Diagnostics Issues around diagnostics and troubleshooting label Jul 24, 2020
@j82w j82w self-assigned this Jul 24, 2020
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Please follow the required format: "[Internal] Category: (Adds|Fixes|Refactors) Description"

Examples:
Diagnostics: Adds GetElapsedClientLatency to CosmosDiagnostics
PartitionKey: Fixes null reference when using default(PartitionKey)
[v4] Client Encryption: Refactors code to external project
[Internal] Query: Adds code generator for CosmosNumbers for easy additions in the future.

@j82w j82w changed the title Diagnostics: Move ActivityScope to operation level Diagnostics: Adds ActivityScope to operation level Jul 24, 2020
@github-actions github-actions bot dismissed their stale review July 24, 2020 18:35

All good!

});
}

private async Task<TResult> RunWithDiagnosticsHelperAsync<TResult>(
CosmosDiagnosticsContext diagnosticsContext,
Func<CosmosDiagnosticsContext, Task<TResult>> task)
{
try
using (new ActivityScope(Guid.NewGuid()))
Copy link
Member

Choose a reason for hiding this comment

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

Caller ActivityId might be overwritten. Does it need to be conditional on non-existence?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This seems to be by design. The activity scope save the current activity id, updates it to the new one. Once the ActivityScope is disposed it switches back to the original activity id.

ealsur
ealsur previously approved these changes Jul 27, 2020
Copy link
Member

@ealsur ealsur left a comment

Choose a reason for hiding this comment

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

Left a comment but overall LGTM

ealsur
ealsur previously approved these changes Jul 27, 2020
Microsoft.Azure.Cosmos/src/ActivityScope.cs Show resolved Hide resolved
@j82w j82w merged commit 4dd1559 into master Jul 30, 2020
@j82w j82w deleted the users/jawilley/diagnostics/sameActivityId branch July 30, 2020 23:18
@ghost
Copy link

ghost commented Dec 15, 2021

Closing due to in-activity, pease feel free to re-open.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Diagnostics Issues around diagnostics and troubleshooting
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants