simplify activity code

Author: KodrAus

src/Roastery/Data/Database.cs

@@ -152,14 +152,8 @@ async Task LogExecAsync(string sql, int rowCount)
 
         var delay = 10 + (int)(Distribution.Uniform() * Math.Pow(rowCount, 1.6));
         await Task.Delay(delay);
-
-        if (activity?.Activity != null)
-        {
-            if (_logger.BindProperty("RowCount", rowCount, false, out var rowCountProperty))
-            {
-                ActivityInstrumentation.SetLogEventProperty(activity.Activity, rowCountProperty);
-            }
-        }
+        
+        activity.AddProperty("RowCount", rowCount);
     }
 
     static T Clone<T>(T value) where T: IIdentifiable, new()

src/Roastery/Web/RequestLoggingMiddleware.cs

@@ -43,24 +43,12 @@ public override async Task<HttpResponse> InvokeAsync(HttpRequest request)
         }
     }
 
-    bool LogCompletion(LoggerActivity? activity, Exception? exception, HttpStatusCode statusCode)
+    bool LogCompletion(LoggerActivity activity, Exception? exception, HttpStatusCode statusCode)
     {
         var level = (int)statusCode >= 500 ? LogEventLevel.Error : LogEventLevel.Information;
-        if (activity?.Activity != null)
-        {
-            if (_logger.BindProperty("StatusCode", (int)statusCode, false, out var statusCodeProperty))
-            {
-                ActivityInstrumentation.SetLogEventProperty(activity.Activity,
-                    statusCodeProperty);
-            }
-
-            if (exception != null)
-            {
-                ActivityInstrumentation.TrySetException(activity.Activity, exception);
-            }
-        }
 
-        activity?.Complete(level);
+        activity.AddProperty("StatusCode", (int)statusCode);
+        activity.Complete(level, exception);
 
         return false;
     }