Refactor TracingJobDecorator

tvorova-tvornica · Oct 13, 2023 · 199ea8b · 199ea8b
1 parent f6630f6
commit 199ea8b
Showing 1 changed file with 27 additions and 20 deletions.
diff --git a/src/AnagramSolver/BackgroundJobs/TracingJobDecorator.cs b/src/AnagramSolver/BackgroundJobs/TracingJobDecorator.cs
@@ -1,6 +1,8 @@
 
 using System.Runtime.ExceptionServices;
+using Microsoft.Extensions.Options;
 using Sentry;
+using Sentry.AspNetCore;
 
 namespace AnagramSolver.BackgroundJobs;
 
@@ -27,30 +29,35 @@ public async Task ExecuteAsync(T jobData)
             return;
         }
 
-        var transaction = _getHub().StartTransaction($"BackgroundJob {_decorated.GetType().Name}", "hangfire.server");
-
-        hub.ConfigureScope(scope => {
-            scope.Transaction = transaction;
-        });
-
-        Exception? exception = null;
-        try
-        {
-            await _decorated.ExecuteAsync(jobData).ConfigureAwait(false);
-        }
-        catch(Exception e)
-        {
-            exception = e;
-        }
-        finally
+        using (hub.PushAndLockScope())
         {
-            if (exception is null)
+            var transaction = hub.StartTransaction($"BackgroundJob {_decorated.GetType().Name}", "hangfire.server");
+
+            hub.ConfigureScope(scope =>
+            {
+                scope.Transaction = transaction;
+            });
+
+            Exception? exception = null;
+
+            try
+            {
+                await _decorated.ExecuteAsync(jobData).ConfigureAwait(false);
+            }
+            catch (Exception e)
             {
-                transaction.Finish(SpanStatus.Ok);
+                exception = e;
             }
-            else
+            finally
             {
-                transaction.Finish(exception);
+                if (exception is null)
+                {
+                    transaction.Finish(SpanStatus.Ok);
+                }
+                else
+                {
+                    transaction.Finish(exception);
+                }
             }
         }
     }