[SLES-1357] set exception on the aws.lambda span (#5054)

Author: joeyzhao2018

docker-compose.yml

@@ -569,7 +569,7 @@ services:
       args:
         - DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-8.0.100}
     image: dd-trace-dotnet/${baseImage:-debian}-tester:${dotnetCoreSdkLatestVersion:-8.0.100}
-    command: dotnet /build/bin/Debug/_build.dll RunLinuxIntegrationTests --framework ${framework:-netcoreapp3.1} --filter Category=Lambda --code-coverage ${runCodeCoverage:-true}
+    command: dotnet /build/bin/Debug/_build.dll RunLinuxIntegrationTests --framework ${framework:-net6.0} --filter Category=Lambda --code-coverage ${runCodeCoverage:-true}
     volumes:
       - ./:/project
     cap_add:

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Lambda/LambdaCommon.cs

@@ -95,6 +95,11 @@ await Tracer.Instance.TracerManager.AgentWriter.FlushTracesAsync()
 
         try
         {
+            if (exception != null && scope is { Span: var span })
+            {
+                span.SetException(exception);
+            }
+
             SendEndInvocation(requestBuilder, scope, exception != null, returnValue);
         }
         catch (Exception ex)

tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/AWS/AwsLambdaTests.cs

@@ -97,6 +97,14 @@ await VerifyHelper.VerifySpans(allSpans, settings)
         private static MockSpan ToMockSpan(MockLambdaExtension.EndExtensionRequest endInvocation, DateTimeOffset? startTime)
         {
             var start = startTime ?? endInvocation.Created.AddMilliseconds(100);
+            var tags = new Dictionary<string, string> { { "_sampling_priority_v1", endInvocation.SamplingPriority?.ToString("N1") } };
+            if (endInvocation.IsError)
+            {
+                tags["error.msg"] = endInvocation.ErrorMsg ?? string.Empty;
+                tags["error.type"] = endInvocation.ErrorType ?? string.Empty;
+                tags["error.stack"] = endInvocation.ErrorStack ?? string.Empty;
+            }
+
             return new MockSpan
             {
                 Duration = endInvocation.Created.Subtract(start).ToNanoseconds(),
@@ -107,7 +115,7 @@ private static MockSpan ToMockSpan(MockLambdaExtension.EndExtensionRequest endIn
                 SpanId = endInvocation.SpanId ?? 0,
                 Start = start.ToUnixTimeNanoseconds(),
                 Error = endInvocation.IsError ? (byte)1 : (byte)0,
-                Tags = new Dictionary<string, string> { { "_sampling_priority_v1", endInvocation.SamplingPriority?.ToString("N1") } }
+                Tags = tags
             };
         }
     }

tracer/test/Datadog.Trace.TestHelpers/MockLambdaExtension.cs

@@ -139,7 +139,10 @@ protected virtual void HandleHttpRequest(HttpListenerContext ctx)
             ulong? spanId = ulong.TryParse(headers.Get("x-datadog-span-id"), out var s) ? s : null;
             int? samplingPriority = int.TryParse(headers.Get("x-datadog-sampling-priority"), out var p) ? p : null;
             bool isError = headers.Get("x-datadog-invocation-error") == "true";
-            var invocation = new EndExtensionRequest(headers, body, traceId, spanId, samplingPriority, isError);
+            string? errorMsg = headers.Get("x-datadog-invocation-error-msg") ?? null;
+            string? errorType = headers.Get("x-datadog-invocation-error-type") ?? null;
+            string? errorStack = headers.Get("x-datadog-invocation-error-stack") ?? null;
+            var invocation = new EndExtensionRequest(headers, body,  traceId, spanId, samplingPriority, isError, errorMsg, errorType, errorStack);
 
             EndInvocations.Push(invocation);
             Output?.WriteLine($"[LambdaExtension]Received end-invocation. traceId:{traceId}, spanId:{spanId}");
@@ -226,14 +229,20 @@ public EndExtensionRequest(
             ulong? traceId,
             ulong? spanId,
             int? samplingPriority,
-            bool isError)
+            bool isError,
+            string? errorMsg,
+            string? errorType,
+            string? errorStack)
         {
             Headers = headers;
             Body = body;
             TraceId = traceId;
             SpanId = spanId;
             SamplingPriority = samplingPriority;
             IsError = isError;
+            ErrorMsg = errorMsg;
+            ErrorType = errorType;
+            ErrorStack = errorStack;
         }
 
         public NameValueCollection Headers { get; }
@@ -248,6 +257,12 @@ public EndExtensionRequest(
 
         public bool IsError { get; }
 
+        public string? ErrorMsg { get; }
+
+        public string? ErrorType { get; }
+
+        public string? ErrorStack { get; }
+
         public DateTimeOffset Created { get; } = DateTimeOffset.UtcNow;
     }
 }

tracer/test/snapshots/AwsLambdaTests.verified.txt

@@ -237,6 +237,9 @@
     Service: LambdaExtension,
     Error: 1,
     Tags: {
+      error.msg: Cannot assign requested address,
+      error.stack: Cannot assign requested address (SocketException),
+      error.type: System.Net.WebException,
       _sampling_priority_v1: 1.0
     }
   },
@@ -248,6 +251,9 @@
     Service: LambdaExtension,
     Error: 1,
     Tags: {
+      error.msg: Cannot assign requested address,
+      error.stack: Cannot assign requested address (SocketException),
+      error.type: System.Net.WebException,
       _sampling_priority_v1: 1.0
     }
   },
@@ -259,6 +265,9 @@
     Service: LambdaExtension,
     Error: 1,
     Tags: {
+      error.msg: Cannot assign requested address,
+      error.stack: Cannot assign requested address (SocketException),
+      error.type: System.Net.WebException,
       _sampling_priority_v1: 1.0
     }
   },
@@ -270,6 +279,9 @@
     Service: LambdaExtension,
     Error: 1,
     Tags: {
+      error.msg: Cannot assign requested address,
+      error.stack: Cannot assign requested address (SocketException),
+      error.type: System.Net.WebException,
       _sampling_priority_v1: 1.0
     }
   },
@@ -281,6 +293,9 @@
     Service: LambdaExtension,
     Error: 1,
     Tags: {
+      error.msg: Cannot assign requested address,
+      error.stack: Cannot assign requested address (SocketException),
+      error.type: System.Net.WebException,
       _sampling_priority_v1: 1.0
     }
   },
@@ -292,6 +307,9 @@
     Service: LambdaExtension,
     Error: 1,
     Tags: {
+      error.msg: Cannot assign requested address,
+      error.stack: Cannot assign requested address (SocketException),
+      error.type: System.Net.WebException,
       _sampling_priority_v1: 1.0
     }
   },