on exception clear Entity and create a new Error subsegment. update tests

Author: hjgraca

libraries/src/AWS.Lambda.Powertools.Tracing/Internal/XRayRecorder.cs

@@ -113,25 +113,29 @@ public void AddMetadata(string nameSpace, string key, object value)
         if (_isLambda)
             _awsxRayRecorder.AddMetadata(nameSpace, key, value);
     }
-
+    
     /// <summary>
     ///     Ends the subsegment.
     /// </summary>
     public void EndSubsegment()
     {
-        if (_isLambda)
+        if (!_isLambda) return;
+        try
+        {
+            _awsxRayRecorder.EndSubsegment();
+        }
+        catch (Exception e)
         {
-            try
-            {
-                _awsxRayRecorder.EndSubsegment();
-            }
-            catch (Exception e)
-            {
-                _awsxRayRecorder.AddException(e);
-                _awsxRayRecorder.MarkFault();
-                _awsxRayRecorder.MarkError();
-                _awsxRayRecorder.EndSubsegment();
-            }
+            // if it fails at this stage the data is lost
+            // so lets create a new subsegment with the error
+
+            Console.WriteLine("Error in Tracing utility - see Exceptions tab in Cloudwatch Traces");
+
+            _awsxRayRecorder.TraceContext.ClearEntity();
+            _awsxRayRecorder.BeginSubsegment("Error in Tracing utility - see Exceptions tab");
+            _awsxRayRecorder.AddException(e);
+            _awsxRayRecorder.MarkError();
+            _awsxRayRecorder.EndSubsegment();
         }
     }
 

libraries/tests/AWS.Lambda.Powertools.Tracing.Tests/XRayRecorderTests.cs

@@ -171,8 +171,10 @@ public void Tracing_End_Subsegment_Failed_Should_Cath_And_AddException()
         tracing.EndSubsegment();
 
         // Assert
-        awsXray.Received(2).EndSubsegment();
+        awsXray.Received(1).BeginSubsegment("Error in Tracing utility - see Exceptions tab");
+        awsXray.Received(1).MarkError();
         awsXray.Received(1).AddException(exception);
+        awsXray.Received(2).EndSubsegment();
     }
 
     [Fact]