Merge pull request #428 from amirkaws/automatic-xray-register

feat: Automatic Register XRay for all services

Author: amirkaws

docs/core/tracing.md

@@ -244,5 +244,36 @@ under a subsegment, or you are doing multithreaded programming. Refer examples b
 
 ## Instrumenting SDK clients and HTTP calls
 
-User should make sure to instrument the SDK clients explicitly based on the function dependency. Refer details on
-[how to instrument SDK client with Xray](https://docs.aws.amazon.com/xray/latest/devguide/xray-sdk-dotnet-sdkclients.html) and [outgoing http calls](https://docs.aws.amazon.com/xray/latest/devguide/xray-sdk-dotnet-httpclients.html).
+You should make sure to instrument the SDK clients explicitly based on the function dependency. You can instrument all of your AWS SDK for .NET clients by calling RegisterForAllServices before you create them.
+
+=== "Function.cs"
+
+    ```c# hl_lines="14"
+    using Amazon.DynamoDBv2;
+    using Amazon.DynamoDBv2.Model;
+    using AWS.Lambda.Powertools.Tracing;
+    
+    public class Function
+    {
+        private static IAmazonDynamoDB _dynamoDb;
+
+        /// <summary>
+        /// Function constructor
+        /// </summary>
+        public Function()
+        {
+            Tracing.RegisterForAllServices();
+            
+            _dynamoDb = new AmazonDynamoDBClient();
+        }
+    }
+    ```
+
+To instrument clients for some services and not others, call Register instead of RegisterForAllServices. Replace the highlighted text with the name of the service's client interface.
+
+```c#
+Tracing.Register<IAmazonDynamoDB>()
+```
+
+This functionality is a thin wrapper for AWS X-Ray .NET SDK. Refer details on [how to instrument SDK client with Xray](https://docs.aws.amazon.com/xray/latest/devguide/xray-sdk-dotnet-sdkclients.html) and [outgoing http calls](https://docs.aws.amazon.com/xray/latest/devguide/xray-sdk-dotnet-httpclients.html).
+

libraries/src/AWS.Lambda.Powertools.Tracing/AWS.Lambda.Powertools.Tracing.csproj

@@ -30,8 +30,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="AWSSDK.XRay" Version="3.7.102.25" />
+        <PackageReference Include="AWSSDK.XRay" Version="3.7.200.34" />
         <PackageReference Include="AWSXRayRecorder.Core" Version="2.14.0" />
+        <PackageReference Include="AWSXRayRecorder.Handlers.AwsSdk" Version="2.12.0" />
     </ItemGroup>
     <ItemGroup>
         <None Include="README.md" Pack="true" PackagePath="\" />

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

@@ -117,14 +117,15 @@ public void OnEntry(AspectEventArgs eventArgs)
         if (_captureAnnotations)
         {
             _xRayRecorder.AddAnnotation("ColdStart", _isColdStart);
-
-            _isColdStart = false;
+            
             _captureAnnotations = false;
             _isAnnotationsCaptured = true;
 
             if (_powertoolsConfigurations.IsServiceDefined)
                 _xRayRecorder.AddAnnotation("Service", _powertoolsConfigurations.Service);
         }
+        
+        _isColdStart = false;
     }
 
     /// <summary>

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

@@ -15,6 +15,7 @@
 
 using System;
 using Amazon.XRay.Recorder.Core.Internal.Entities;
+using Amazon.XRay.Recorder.Handlers.AwsSdk;
 using AWS.Lambda.Powertools.Common;
 using AWS.Lambda.Powertools.Tracing.Internal;
 
@@ -239,4 +240,20 @@ private static string GetNamespaceOrDefault(string nameSpace)
 
         return PowertoolsConfigurations.Instance.Service;
     }
+    
+    /// <summary>
+    ///     Registers X-Ray for all instances of <see cref="Amazon.Runtime.AmazonServiceClient"/>.
+    /// </summary>
+    public static void RegisterForAllServices()
+    {
+        AWSSDKHandler.RegisterXRayForAllServices();
+    }
+
+    /// <summary>
+    ///     Registers X-Ray for the given type of <see cref="Amazon.Runtime.AmazonServiceClient"/>.
+    /// </summary>
+    public static void Register<T>()
+    {
+        AWSSDKHandler.RegisterXRay<T>();
+    }
 }