From e8973e713bb1d31802357bbb9f2443332ec052ac Mon Sep 17 00:00:00 2001 From: Peng Date: Wed, 7 Oct 2020 13:08:35 -0700 Subject: [PATCH 1/3] Bump AWSSDK.Core dependency version --- sdk/src/Core/AWSXRayRecorder.Core.csproj | 4 ++-- .../AWSXRayRecorder.Handlers.AspNet.csproj | 2 +- .../AWSXRayRecorder.Handlers.AwsSdk.csproj | 2 +- .../AWSXRayRecorder.Handlers.SqlServer.csproj | 2 +- ...AWSXRayRecorder.Handlers.System.Net.csproj | 2 +- .../AWSXRayRecorder.IntegrationTests.csproj | 10 ++++---- .../AWSXRayRecorder.UnitTests.csproj | 10 ++++---- sdk/test/UnitTests/Tools/MockHttpRequest.cs | 23 +++++++++++++++++++ 8 files changed, 39 insertions(+), 16 deletions(-) diff --git a/sdk/src/Core/AWSXRayRecorder.Core.csproj b/sdk/src/Core/AWSXRayRecorder.Core.csproj index 14ad64dc..73280206 100644 --- a/sdk/src/Core/AWSXRayRecorder.Core.csproj +++ b/sdk/src/Core/AWSXRayRecorder.Core.csproj @@ -38,8 +38,8 @@ - - + + diff --git a/sdk/src/Handlers/AspNet/AWSXRayRecorder.Handlers.AspNet.csproj b/sdk/src/Handlers/AspNet/AWSXRayRecorder.Handlers.AspNet.csproj index 0c7b2367..90f809b8 100644 --- a/sdk/src/Handlers/AspNet/AWSXRayRecorder.Handlers.AspNet.csproj +++ b/sdk/src/Handlers/AspNet/AWSXRayRecorder.Handlers.AspNet.csproj @@ -30,7 +30,7 @@ - + diff --git a/sdk/src/Handlers/AwsSdk/AWSXRayRecorder.Handlers.AwsSdk.csproj b/sdk/src/Handlers/AwsSdk/AWSXRayRecorder.Handlers.AwsSdk.csproj index 15f283fe..454b096f 100644 --- a/sdk/src/Handlers/AwsSdk/AWSXRayRecorder.Handlers.AwsSdk.csproj +++ b/sdk/src/Handlers/AwsSdk/AWSXRayRecorder.Handlers.AwsSdk.csproj @@ -42,7 +42,7 @@ - + diff --git a/sdk/src/Handlers/SqlServer/AWSXRayRecorder.Handlers.SqlServer.csproj b/sdk/src/Handlers/SqlServer/AWSXRayRecorder.Handlers.SqlServer.csproj index 425fc0c3..ecbd4cde 100644 --- a/sdk/src/Handlers/SqlServer/AWSXRayRecorder.Handlers.SqlServer.csproj +++ b/sdk/src/Handlers/SqlServer/AWSXRayRecorder.Handlers.SqlServer.csproj @@ -30,7 +30,7 @@ - + diff --git a/sdk/src/Handlers/System.Net/AWSXRayRecorder.Handlers.System.Net.csproj b/sdk/src/Handlers/System.Net/AWSXRayRecorder.Handlers.System.Net.csproj index 04a29183..b4b77379 100644 --- a/sdk/src/Handlers/System.Net/AWSXRayRecorder.Handlers.System.Net.csproj +++ b/sdk/src/Handlers/System.Net/AWSXRayRecorder.Handlers.System.Net.csproj @@ -30,7 +30,7 @@ - + diff --git a/sdk/test/IntegrationTests/AWSXRayRecorder.IntegrationTests.csproj b/sdk/test/IntegrationTests/AWSXRayRecorder.IntegrationTests.csproj index 0353c746..58460316 100644 --- a/sdk/test/IntegrationTests/AWSXRayRecorder.IntegrationTests.csproj +++ b/sdk/test/IntegrationTests/AWSXRayRecorder.IntegrationTests.csproj @@ -13,11 +13,11 @@ - - - - - + + + + + diff --git a/sdk/test/UnitTests/AWSXRayRecorder.UnitTests.csproj b/sdk/test/UnitTests/AWSXRayRecorder.UnitTests.csproj index 6d3720cf..70129ece 100644 --- a/sdk/test/UnitTests/AWSXRayRecorder.UnitTests.csproj +++ b/sdk/test/UnitTests/AWSXRayRecorder.UnitTests.csproj @@ -36,11 +36,11 @@ - - - - - + + + + + diff --git a/sdk/test/UnitTests/Tools/MockHttpRequest.cs b/sdk/test/UnitTests/Tools/MockHttpRequest.cs index fa45af7a..ac53a1a5 100644 --- a/sdk/test/UnitTests/Tools/MockHttpRequest.cs +++ b/sdk/test/UnitTests/Tools/MockHttpRequest.cs @@ -20,6 +20,7 @@ using System.IO; using System.Linq; using System.Net; +using System.Threading; using System.Threading.Tasks; using Amazon.Runtime; using Amazon.Runtime.Internal; @@ -146,5 +147,27 @@ private HttpWebResponse CreateResponse(MockHttpRequest request) } } + + public Task GetRequestContentAsync(CancellationToken cancellationToken) + { + return Task.FromResult(new MemoryStream()); + } + + public Task WriteToRequestBodyAsync(Stream requestContent, Stream contentStream, IDictionary contentHeaders, IRequestContext requestContext) + { + Assert.IsNotNull(requestContent); + Assert.IsNotNull(contentStream); + Assert.IsNotNull(contentHeaders); + Assert.IsNotNull(requestContext); + return Task.FromResult(0); + } + + public Task WriteToRequestBodyAsync(Stream requestContent, byte[] requestData, IDictionary headers, CancellationToken cancellationToken) + { + Assert.IsNotNull(requestContent); + Assert.IsNotNull(requestData); + Assert.IsNotNull(headers); + return Task.FromResult(0); + } } } From 33871f3f890a710de5b3a8eefdd0bb8b88914013 Mon Sep 17 00:00:00 2001 From: Peng Date: Wed, 14 Oct 2020 15:22:35 -0700 Subject: [PATCH 2/3] Bumped AWSSDK.Core version as range. --- sdk/src/Core/AWSXRayRecorder.Core.csproj | 4 ++-- .../Handlers/AspNet/AWSXRayRecorder.Handlers.AspNet.csproj | 2 +- .../Handlers/AwsSdk/AWSXRayRecorder.Handlers.AwsSdk.csproj | 2 +- .../SqlServer/AWSXRayRecorder.Handlers.SqlServer.csproj | 2 +- .../System.Net/AWSXRayRecorder.Handlers.System.Net.csproj | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/src/Core/AWSXRayRecorder.Core.csproj b/sdk/src/Core/AWSXRayRecorder.Core.csproj index 73280206..760a603d 100644 --- a/sdk/src/Core/AWSXRayRecorder.Core.csproj +++ b/sdk/src/Core/AWSXRayRecorder.Core.csproj @@ -38,8 +38,8 @@ - - + + diff --git a/sdk/src/Handlers/AspNet/AWSXRayRecorder.Handlers.AspNet.csproj b/sdk/src/Handlers/AspNet/AWSXRayRecorder.Handlers.AspNet.csproj index 90f809b8..2bc97932 100644 --- a/sdk/src/Handlers/AspNet/AWSXRayRecorder.Handlers.AspNet.csproj +++ b/sdk/src/Handlers/AspNet/AWSXRayRecorder.Handlers.AspNet.csproj @@ -30,7 +30,7 @@ - + diff --git a/sdk/src/Handlers/AwsSdk/AWSXRayRecorder.Handlers.AwsSdk.csproj b/sdk/src/Handlers/AwsSdk/AWSXRayRecorder.Handlers.AwsSdk.csproj index 454b096f..1c2ee28e 100644 --- a/sdk/src/Handlers/AwsSdk/AWSXRayRecorder.Handlers.AwsSdk.csproj +++ b/sdk/src/Handlers/AwsSdk/AWSXRayRecorder.Handlers.AwsSdk.csproj @@ -42,7 +42,7 @@ - + diff --git a/sdk/src/Handlers/SqlServer/AWSXRayRecorder.Handlers.SqlServer.csproj b/sdk/src/Handlers/SqlServer/AWSXRayRecorder.Handlers.SqlServer.csproj index ecbd4cde..73831b31 100644 --- a/sdk/src/Handlers/SqlServer/AWSXRayRecorder.Handlers.SqlServer.csproj +++ b/sdk/src/Handlers/SqlServer/AWSXRayRecorder.Handlers.SqlServer.csproj @@ -30,7 +30,7 @@ - + diff --git a/sdk/src/Handlers/System.Net/AWSXRayRecorder.Handlers.System.Net.csproj b/sdk/src/Handlers/System.Net/AWSXRayRecorder.Handlers.System.Net.csproj index b4b77379..88ca5a1a 100644 --- a/sdk/src/Handlers/System.Net/AWSXRayRecorder.Handlers.System.Net.csproj +++ b/sdk/src/Handlers/System.Net/AWSXRayRecorder.Handlers.System.Net.csproj @@ -30,7 +30,7 @@ - + From 97804ee147a62718e852ca252749108c653166f6 Mon Sep 17 00:00:00 2001 From: Peng Date: Wed, 14 Oct 2020 15:55:36 -0700 Subject: [PATCH 3/3] Removed redundant dependency --- .../Handlers/AspNet/AWSXRayRecorder.Handlers.AspNet.csproj | 4 ---- .../Handlers/AwsSdk/AWSXRayRecorder.Handlers.AwsSdk.csproj | 4 ---- .../SqlServer/AWSXRayRecorder.Handlers.SqlServer.csproj | 4 ---- .../System.Net/AWSXRayRecorder.Handlers.System.Net.csproj | 4 ---- 4 files changed, 16 deletions(-) diff --git a/sdk/src/Handlers/AspNet/AWSXRayRecorder.Handlers.AspNet.csproj b/sdk/src/Handlers/AspNet/AWSXRayRecorder.Handlers.AspNet.csproj index 2bc97932..60622d02 100644 --- a/sdk/src/Handlers/AspNet/AWSXRayRecorder.Handlers.AspNet.csproj +++ b/sdk/src/Handlers/AspNet/AWSXRayRecorder.Handlers.AspNet.csproj @@ -29,10 +29,6 @@ 1701;1702;1705;1591;1587;1572;1573 - - - - diff --git a/sdk/src/Handlers/AwsSdk/AWSXRayRecorder.Handlers.AwsSdk.csproj b/sdk/src/Handlers/AwsSdk/AWSXRayRecorder.Handlers.AwsSdk.csproj index 1c2ee28e..fa1b21c2 100644 --- a/sdk/src/Handlers/AwsSdk/AWSXRayRecorder.Handlers.AwsSdk.csproj +++ b/sdk/src/Handlers/AwsSdk/AWSXRayRecorder.Handlers.AwsSdk.csproj @@ -40,10 +40,6 @@ - - - - diff --git a/sdk/src/Handlers/SqlServer/AWSXRayRecorder.Handlers.SqlServer.csproj b/sdk/src/Handlers/SqlServer/AWSXRayRecorder.Handlers.SqlServer.csproj index 73831b31..86e2bcd7 100644 --- a/sdk/src/Handlers/SqlServer/AWSXRayRecorder.Handlers.SqlServer.csproj +++ b/sdk/src/Handlers/SqlServer/AWSXRayRecorder.Handlers.SqlServer.csproj @@ -29,10 +29,6 @@ 1701;1702;1705;1591;1587;1572;1573 - - - - diff --git a/sdk/src/Handlers/System.Net/AWSXRayRecorder.Handlers.System.Net.csproj b/sdk/src/Handlers/System.Net/AWSXRayRecorder.Handlers.System.Net.csproj index 88ca5a1a..2a1d7a0b 100644 --- a/sdk/src/Handlers/System.Net/AWSXRayRecorder.Handlers.System.Net.csproj +++ b/sdk/src/Handlers/System.Net/AWSXRayRecorder.Handlers.System.Net.csproj @@ -29,10 +29,6 @@ 1701;1702;1705;1591;1587;1572;1573 - - - -