Skip to content

Commit c34de93

Browse files
committed
fix issue
1 parent 121a605 commit c34de93

File tree

3 files changed

+2
-27
lines changed

3 files changed

+2
-27
lines changed

src/Worker/Core/ExceptionPropertiesProviderAdapter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ public ExceptionPropertiesProviderAdapter(IExceptionPropertiesProvider inner)
2727
/// </summary>
2828
/// <param name="exception">The exception to get properties for.</param>
2929
/// <returns>The exception properties dictionary.</returns>
30-
public IDictionary<string, object>? GetExceptionProperties(Exception exception)
30+
public IDictionary<string, object?>? GetExceptionProperties(Exception exception)
3131
=> this.inner.GetExceptionProperties(exception);
3232
}

src/Worker/Grpc/GrpcDurableTaskWorker.Processor.cs

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -818,31 +818,6 @@ await this.client.AbandonTaskActivityWorkItemAsync(
818818
return;
819819
}
820820

821-
try
822-
{
823-
await using AsyncServiceScope scope = this.worker.services.CreateAsyncScope();
824-
if (this.worker.Factory.TryCreateActivity(name, scope.ServiceProvider, out ITaskActivity? activity))
825-
{
826-
// Both the factory invocation and the RunAsync could involve user code and need to be handled as
827-
// part of try/catch.
828-
TaskActivity shim = this.shimFactory.CreateActivity(name, activity);
829-
output = await shim.RunAsync(innerContext, request.Input);
830-
}
831-
else
832-
{
833-
failureDetails = new P.TaskFailureDetails
834-
{
835-
ErrorType = "ActivityTaskNotFound",
836-
ErrorMessage = $"No activity task named '{name}' was found.",
837-
IsNonRetriable = true,
838-
};
839-
}
840-
}
841-
catch (Exception applicationException)
842-
{
843-
failureDetails = applicationException.ToTaskFailureDetails(this.exceptionPropertiesProvider);
844-
}
845-
846821
int outputSizeInBytes = 0;
847822
if (failureDetails != null)
848823
{

test/Grpc.IntegrationTests/TracingIntegrationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public async Task TaskOrchestrationWithActivityFailure()
244244

245245
// The activity execution activities should be parented to the server activity activities.
246246
activityExecutionActivities
247-
.Should().HaveCountGreaterThan(0)
247+
.Should().HaveCount(serverActivityActivities.Count)
248248
.And.AllSatisfy(a =>
249249
{
250250
a.ParentId.Should().BeOneOf(serverActivityActivities.Select(aa => aa.Id));

0 commit comments

Comments
 (0)