Migrate more telemetry static methods to OpenTelemetryHelpers vs. Ext…

…ension methods.
houseofcat · Apr 1, 2024 · 2d81452 · 2d81452
1 parent 54ef069
commit 2d81452
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 18 deletions.
diff --git a/src/HouseofCat.Dataflows/Extensions/WorkStateExtensions.cs b/src/HouseofCat.Dataflows/Extensions/WorkStateExtensions.cs
@@ -1,7 +1,6 @@
 using HouseofCat.Utilities.Helpers;
 using OpenTelemetry.Trace;
 using System.Collections.Generic;
-using System.Diagnostics;
 
 namespace HouseofCat.Dataflows.Extensions;
 
@@ -18,27 +17,12 @@ public static void SetOpenTelemetryError(this IWorkState state, string message =
 
     public static void SetCurrentActivityAsError(this IWorkState state, string message = null)
     {
-        var activity = Activity.Current;
-        if (activity is null) return;
-
-        activity.SetStatus(ActivityStatusCode.Error, message ?? state.EDI.SourceException?.Message);
-        if (state?.EDI is not null)
-        {
-            if (state.EDI.SourceException is not null)
-            {
-                activity.RecordException(state.EDI.SourceException);
-            }
-        }
-        else
-        {
-            activity.SetStatus(ActivityStatusCode.Error, message);
-        }
+        OpenTelemetryHelpers.SetCurrentActivityAsError(state?.EDI?.SourceException, message);
     }
 
     public static void SetCurrentSpanAsError(this IWorkState state, string message = null)
     {
-        var span = Tracer.CurrentSpan;
-        state.SetSpanAsError(span, message);
+        OpenTelemetryHelpers.SetCurrentSpanAsError(state?.EDI?.SourceException, message);
     }
 
     public static void SetSpanAsError(this IWorkState state, TelemetrySpan span, string message = null)

diff --git a/src/HouseofCat.Utilities/Helpers/OpenTelemetryHelpers.cs b/src/HouseofCat.Utilities/Helpers/OpenTelemetryHelpers.cs
@@ -218,4 +218,48 @@ public static string FormatOpenTelemetryHeader(
     }
 
     #endregion
+
+    #region Error Handling
+
+    public static void SetCurrentActivityAsError(Exception ex, string message = null)
+    {
+        var activity = Activity.Current;
+        if (activity is null) return;
+
+        SetActivityAsError(activity, ex, message);
+    }
+
+    public static void SetActivityAsError(Activity activity, Exception ex, string message = null)
+    {
+        if (activity is null) return;
+
+        if (ex is not null)
+        {
+            activity.RecordException(ex);
+        }
+
+        activity.SetStatus(ActivityStatusCode.Error, message);
+    }
+
+    public static void SetCurrentSpanAsError(Exception ex, string message = null)
+    {
+        var span = Tracer.CurrentSpan;
+        if (span is null) return;
+
+        SetSpanAsError(span, ex, message);
+    }
+
+    public static void SetSpanAsError(TelemetrySpan span, Exception ex, string message = null)
+    {
+        if (span is null) return;
+
+        if (ex is not null)
+        {
+            span.RecordException(ex);
+        }
+
+        span.SetStatus(Status.Error.WithDescription(message));
+    }
+
+    #endregion
 }