-
Notifications
You must be signed in to change notification settings - Fork 57
feat(otel): add otel tracing for standalone activities. #647
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
Open
cconstable
wants to merge
4
commits into
main
Choose a base branch
from
cc/standalone-activity-tracing
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
e52b86f
feat(otel): add otel tracing for standalone activities.
cconstable 58ec4f7
style(tests): using discard variable to signal intent
cconstable 6b5fa88
fix(tests): use two activities for testing cancel and terminate activ…
cconstable 0e7a4f4
Merge branch 'main' into cc/standalone-activity-tracing
cconstable File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -797,6 +797,43 @@ public async Task TracingInterceptor_Nexus_HasTracing() | |
| "RunWorkflow:TracingWorkflow")); | ||
| } | ||
|
|
||
| [Fact] | ||
| public async Task TracingInterceptor_StandaloneActivity_HasProperSpans() | ||
| { | ||
| var cancelId = $"act-cancel-{Guid.NewGuid()}"; | ||
| var terminateId = $"act-terminate-{Guid.NewGuid()}"; | ||
| var spans = await WithTracingWorkerAsync(async (client, _) => | ||
| { | ||
| var taskQueue = $"standalone-tq-{Guid.NewGuid()}"; | ||
|
|
||
| var cancelHandle = await client.StartActivityAsync( | ||
| "StandaloneActivity", | ||
| Array.Empty<object?>(), | ||
| new(cancelId, taskQueue) { ScheduleToCloseTimeout = TimeSpan.FromMinutes(5) }); | ||
| await cancelHandle.DescribeAsync(); | ||
| await cancelHandle.CancelAsync(); | ||
|
|
||
| var terminateHandle = await client.StartActivityAsync( | ||
| "StandaloneActivity", | ||
| Array.Empty<object?>(), | ||
| new(terminateId, taskQueue) { ScheduleToCloseTimeout = TimeSpan.FromMinutes(5) }); | ||
| await terminateHandle.TerminateAsync(); | ||
|
|
||
| await client.CountActivitiesAsync($"TaskQueue = '{taskQueue}'"); | ||
| }); | ||
|
|
||
| var cancelTags = new[] { ActivityAssertion.TagEqual("temporalActivityID", cancelId) }; | ||
| var terminateTags = new[] { ActivityAssertion.TagEqual("temporalActivityID", terminateId) }; | ||
| AssertActivities( | ||
| spans, | ||
| new("StartActivity:StandaloneActivity", Parent: null, Tags: cancelTags), | ||
| new("DescribeActivity:" + cancelId, Parent: null, Tags: cancelTags), | ||
| new("CancelActivity:" + cancelId, Parent: null, Tags: cancelTags), | ||
| new("StartActivity:StandaloneActivity", Parent: null, Tags: terminateTags), | ||
| new("TerminateActivity:" + terminateId, Parent: null, Tags: terminateTags), | ||
| ActivityAssertion.NameAndParent("CountActivities", null)); | ||
| } | ||
|
|
||
| private static void AssertActivities( | ||
| IReadOnlyCollection<Activity> activities, params ActivityAssertion[] assertions) | ||
| { | ||
|
|
@@ -886,7 +923,7 @@ private async Task<IReadOnlyCollection<Activity>> WithTracingWorkerAsync( | |
| var activities = new List<Activity>(); | ||
|
|
||
| // Setup provider | ||
| using var tracerProvider = global::OpenTelemetry.Sdk.CreateTracerProviderBuilder(). | ||
| using var _ = global::OpenTelemetry.Sdk.CreateTracerProviderBuilder(). | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Took me a second to realize that |
||
| AddSource( | ||
| TracingInterceptor.ClientSource.Name, | ||
| TracingInterceptor.WorkflowsSource.Name, | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
input.Options.Idis optional because it uses the sharedStartActivityInput. AFAICT, it will never be null for standalone activities.