PR Feedback

Author: niemyjski

src/Foundatio.TestHarness/Jobs/HelloWorldJob.cs

@@ -77,31 +77,3 @@ protected override Task<JobResult> RunInternalAsync(JobContext context)
         return Task.FromResult(JobResult.Success);
     }
 }
-
-public class ThrowingJob : JobBase
-{
-    private readonly string _id;
-
-    public int RunCount { get; set; }
-
-    public ThrowingJob(TimeProvider timeProvider, ILoggerFactory loggerFactory) : base(timeProvider, null, loggerFactory)
-    {
-        _id = Guid.NewGuid().ToString("N").Substring(0, 10);
-    }
-
-    protected override Task<JobResult> RunInternalAsync(JobContext context)
-    {
-        RunCount++;
-
-        _logger.LogTrace("ThrowingJob Running: instance={Id} runs={RunCount}", _id, RunCount);
-
-        try
-        {
-            throw new InvalidOperationException("Inner exception");
-        }
-        catch (Exception ex)
-        {
-            throw new ApplicationException("Test exception", ex);
-        }
-    }
-}

src/Foundatio/Jobs/IJob.cs

@@ -89,9 +89,6 @@ public static async Task<int> RunContinuousAsync(this IJob job, JobOptions optio
             var result = await job.TryRunAsync(cancellationToken).AnyContext();
             logger.LogJobResult(result, options.Name);
 
-            if (!result.IsSuccess && !result.IsCancelled)
-                activity?.SetErrorStatus(result.Error, result.Message ?? result.Error?.Message);
-
             iterations++;
             if (isQueueJob && result.IsSuccess)
                 queueItemsProcessed++;

src/Foundatio/Jobs/WorkItemJob/WorkItemJob.cs

@@ -148,8 +148,6 @@ await Task.WhenAll(
 
             if (!workItemContext.Result.IsSuccess)
             {
-                activity?.SetErrorStatus(workItemContext.Result.Error, workItemContext.Result.Message ?? workItemContext.Result.Error?.Message);
-
                 if (!queueEntry.IsAbandoned && !queueEntry.IsCompleted)
                 {
                     await queueEntry.AbandonAsync().AnyContext();

src/Foundatio/Lock/CacheLockProvider.cs

@@ -183,14 +183,9 @@ public async Task<ILock> AcquireAsync(string resource, TimeSpan? timeUntilExpire
             _lockTimeoutCounter.Add(1);
 
             if (cancellationToken.IsCancellationRequested)
-            {
                 _logger.LogDebug("Cancellation requested for lock {Resource} ({LockId}) after {Duration:g}", resource, lockId, sw.Elapsed);
-            }
             else
-            {
-                activity?.SetErrorStatus(message: $"Failed to acquire lock {resource} after {sw.Elapsed:g}");
                 _logger.LogWarning("Failed to acquire lock {Resource} ({LockId}) after {Duration:g}", resource, lockId, sw.Elapsed);
-            }
 
             return null;
         }

src/Foundatio/Queues/SharedQueueOptions.cs

@@ -65,8 +65,7 @@ public TBuilder AddBehavior(IQueueBehavior<T> behavior)
     {
         ArgumentNullException.ThrowIfNull(behavior);
 
-        if (Target.Behaviors == null)
-            Target.Behaviors = new List<IQueueBehavior<T>>();
+        Target.Behaviors ??= new List<IQueueBehavior<T>>();
         Target.Behaviors.Add(behavior);
 
         return (TBuilder)this;

tests/Foundatio.Tests/Jobs/JobTests.cs

@@ -205,74 +205,6 @@ public async Task JobLoopPerf()
         sw.Stop();
     }
 
-    [Fact]
-    public async Task RunContinuousAsync_FailingJob_SetsActivityErrorStatus()
-    {
-        // Arrange
-        Activity capturedActivity = null;
-        using var listener = new ActivityListener
-        {
-            ShouldListenTo = s => s.Name == "Foundatio",
-            Sample = (ref ActivityCreationOptions<ActivityContext> _) => ActivitySamplingResult.AllDataAndRecorded,
-            ActivityStopped = a =>
-            {
-                if (a.OperationName.StartsWith("Job:"))
-                    capturedActivity = a;
-            }
-        };
-        ActivitySource.AddActivityListener(listener);
-
-        var job = new FailingJob(null, Log);
-
-        // Act
-        await job.RunContinuousAsync(iterationLimit: 1, cancellationToken: TestCancellationToken);
-
-        // Assert
-        Assert.NotNull(capturedActivity);
-        Assert.Equal(ActivityStatusCode.Error, capturedActivity.Status);
-        Assert.Equal("Test failure", capturedActivity.StatusDescription);
-    }
-
-    [Fact]
-    public async Task RunContinuousAsync_ThrowingJob_SetsActivityErrorStatusAndRecordsException()
-    {
-        // Arrange
-        Activity capturedActivity = null;
-        using var listener = new ActivityListener
-        {
-            ShouldListenTo = s => s.Name == "Foundatio",
-            Sample = (ref ActivityCreationOptions<ActivityContext> _) => ActivitySamplingResult.AllDataAndRecorded,
-            ActivityStopped = a =>
-            {
-                if (a.OperationName.StartsWith("Job:"))
-                    capturedActivity = a;
-            }
-        };
-        ActivitySource.AddActivityListener(listener);
-
-        var job = new ThrowingJob(null, Log);
-
-        // Act
-        await job.RunContinuousAsync(iterationLimit: 1, cancellationToken: TestCancellationToken);
-
-        // Assert
-        Assert.NotNull(capturedActivity);
-        Assert.Equal(ActivityStatusCode.Error, capturedActivity.Status);
-        Assert.Contains("Test exception", capturedActivity.StatusDescription);
-
-        var exceptionEvent = capturedActivity.Events.FirstOrDefault(e => e.Name == "exception");
-        Assert.NotEqual(default, exceptionEvent);
-        Assert.Contains(exceptionEvent.Tags, t => t.Key == "exception.type" && t.Value?.ToString() == typeof(ApplicationException).FullName);
-        Assert.Contains(exceptionEvent.Tags, t => t.Key == "exception.message" && t.Value?.ToString() == "Test exception");
-
-        var stacktrace = exceptionEvent.Tags.FirstOrDefault(t => t.Key == "exception.stacktrace").Value?.ToString();
-        Assert.NotNull(stacktrace);
-        Assert.Contains("Inner exception", stacktrace);
-        Assert.Contains("Test exception", stacktrace);
-        Assert.Contains(nameof(InvalidOperationException), stacktrace);
-        Assert.Contains(nameof(ApplicationException), stacktrace);
-    }
-
     [Fact]
     public async Task RunContinuousAsync_SuccessfulJob_DoesNotSetActivityErrorStatus()
     {