Temporarily remove XRay reference

aws-samples · Nov 15, 2023 · 0bc0831 · 0bc0831
1 parent d9312d6
commit 0bc0831
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 28 deletions.
diff --git a/src/NET8Native/DeleteProduct/DeleteProduct.csproj b/src/NET8Native/DeleteProduct/DeleteProduct.csproj
@@ -19,8 +19,6 @@
 		<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />
 		<PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.10.0" />
 		<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.0" />
-		<PackageReference Include="AWSXRayRecorder.Core" Version="2.14.0" />
-		<PackageReference Include="AWSXRayRecorder.Handlers.AwsSdk" Version="2.12.0" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -29,7 +27,5 @@
 
 	<ItemGroup>
 		<TrimmerRootAssembly Include="AWSSDK.Core" />
-		<TrimmerRootAssembly Include="AWSXRayRecorder.Core" />
-		<TrimmerRootAssembly Include="AWSXRayRecorder.Handlers.AwsSdk" />
 	</ItemGroup>
 </Project>
diff --git a/src/NET8Native/DeleteProduct/Function.cs b/src/NET8Native/DeleteProduct/Function.cs
@@ -10,7 +10,6 @@
 using Amazon.Lambda.Core;
 using Amazon.Lambda.RuntimeSupport;
 using Amazon.Lambda.Serialization.SystemTextJson;
-using Amazon.XRay.Recorder.Handlers.AwsSdk;
 using Shared;
 using Shared.DataAccess;
 
@@ -23,7 +22,6 @@ public class Function
     [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(APIGatewayHttpApiV2ProxyResponse))]
     static Function()
     {
-        AWSSDKHandler.RegisterXRayForAllServices();
         dataAccess = new DynamoDbProducts();
     }
 

diff --git a/src/NET8Native/GetProduct/Function.cs b/src/NET8Native/GetProduct/Function.cs
@@ -10,7 +10,6 @@
 using Amazon.Lambda.Core;
 using Amazon.Lambda.RuntimeSupport;
 using Amazon.Lambda.Serialization.SystemTextJson;
-using Amazon.XRay.Recorder.Handlers.AwsSdk;
 using Shared;
 using Shared.DataAccess;
 
@@ -25,7 +24,6 @@ public class Function
     [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(APIGatewayHttpApiV2ProxyResponse))]
     static Function()
     {
-        AWSSDKHandler.RegisterXRayForAllServices();
         dataAccess = new DynamoDbProducts();
     }
 

diff --git a/src/NET8Native/GetProduct/GetProduct.csproj b/src/NET8Native/GetProduct/GetProduct.csproj
@@ -18,8 +18,6 @@
 		<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />
 		<PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.10.0" />
 		<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.0" />
-		<PackageReference Include="AWSXRayRecorder.Core" Version="2.14.0" />
-		<PackageReference Include="AWSXRayRecorder.Handlers.AwsSdk" Version="2.12.0" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -28,7 +26,5 @@
 
 	<ItemGroup>
 		<TrimmerRootAssembly Include="AWSSDK.Core" />
-		<TrimmerRootAssembly Include="AWSXRayRecorder.Core" />
-		<TrimmerRootAssembly Include="AWSXRayRecorder.Handlers.AwsSdk" />
 	</ItemGroup>
 </Project>
diff --git a/src/NET8Native/GetProducts/Function.cs b/src/NET8Native/GetProducts/Function.cs
@@ -10,7 +10,6 @@
 using Amazon.Lambda.Core;
 using Amazon.Lambda.RuntimeSupport;
 using Amazon.Lambda.Serialization.SystemTextJson;
-using Amazon.XRay.Recorder.Handlers.AwsSdk;
 using Shared;
 using Shared.DataAccess;
 
@@ -25,7 +24,6 @@ public class Function
     [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(APIGatewayHttpApiV2ProxyResponse))]
     static Function()
     {
-        AWSSDKHandler.RegisterXRayForAllServices();
         dataAccess = new DynamoDbProducts();
     }
 

diff --git a/src/NET8Native/GetProducts/GetProducts.csproj b/src/NET8Native/GetProducts/GetProducts.csproj
@@ -18,8 +18,6 @@
 		<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />
 		<PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.10.0" />
 		<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.0" />
-		<PackageReference Include="AWSXRayRecorder.Core" Version="2.14.0" />
-		<PackageReference Include="AWSXRayRecorder.Handlers.AwsSdk" Version="2.12.0" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -28,7 +26,5 @@
 
 	<ItemGroup>
 		<TrimmerRootAssembly Include="AWSSDK.Core" />
-		<TrimmerRootAssembly Include="AWSXRayRecorder.Core" />
-		<TrimmerRootAssembly Include="AWSXRayRecorder.Handlers.AwsSdk" />
 	</ItemGroup>
 </Project>
diff --git a/src/NET8Native/PutProduct/Function.cs b/src/NET8Native/PutProduct/Function.cs
@@ -10,7 +10,6 @@
 using Amazon.Lambda.Core;
 using Amazon.Lambda.RuntimeSupport;
 using Amazon.Lambda.Serialization.SystemTextJson;
-using Amazon.XRay.Recorder.Handlers.AwsSdk;
 using Shared;
 using Shared.DataAccess;
 using Shared.Models;
@@ -24,7 +23,6 @@ public class Function
     [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(APIGatewayHttpApiV2ProxyResponse))]
     static Function()
     {
-        AWSSDKHandler.RegisterXRayForAllServices();
         dataAccess = new DynamoDbProducts();
     }
 

diff --git a/src/NET8Native/PutProduct/PutProduct.csproj b/src/NET8Native/PutProduct/PutProduct.csproj
@@ -19,8 +19,6 @@
 		<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />
 		<PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.10.0" />
 		<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.0" />
-		<PackageReference Include="AWSXRayRecorder.Core" Version="2.14.0" />
-		<PackageReference Include="AWSXRayRecorder.Handlers.AwsSdk" Version="2.12.0" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -29,7 +27,5 @@
 
 	<ItemGroup>
 		<TrimmerRootAssembly Include="AWSSDK.Core" />
-		<TrimmerRootAssembly Include="AWSXRayRecorder.Core" />
-		<TrimmerRootAssembly Include="AWSXRayRecorder.Handlers.AwsSdk" />
 	</ItemGroup>
 </Project>
diff --git a/src/NET8Native/Shared/DataAccess/DynamoDbProducts.cs b/src/NET8Native/Shared/DataAccess/DynamoDbProducts.cs
@@ -12,7 +12,7 @@ public class DynamoDbProducts : ProductsDAO
     {
         private static readonly string PRODUCT_TABLE_NAME = Environment.GetEnvironmentVariable("PRODUCT_TABLE_NAME") ?? string.Empty;
         private readonly AmazonDynamoDBClient _dynamoDbClient;
-
+        
         [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(DynamoDbProducts))]
         public DynamoDbProducts()
         {

diff --git a/src/NET8Native/Shared/Shared.csproj b/src/NET8Native/Shared/Shared.csproj
@@ -19,9 +19,12 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />
-		<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.300" />
-		<PackageReference Include="AWSXRayRecorder.Core" Version="2.14.0" />
-		<PackageReference Include="AWSXRayRecorder.Handlers.AwsSdk" Version="2.12.0" />
+		<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.300.1" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<TrimmerRootAssembly Include="AWSSDK.Core" />
+		<TrimmerRootAssembly Include="AWSSDK.DynamoDBv2" />
 	</ItemGroup>
 
 </Project>