Skip to content

Commit 800623c

Browse files
Bump aws-sdk-net monorepo (#3233)
1 parent 2fa4c57 commit 800623c

File tree

4 files changed

+31
-6
lines changed

4 files changed

+31
-6
lines changed

Directory.Packages.props

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@
8686

8787
<!-- Non-production packages are kept up-to-date by dependency automation -->
8888
<ItemGroup Label="Non-production packages, such as for examples and tests">
89-
<PackageVersion Include="AWSSDK.Bedrock" Version="4.0.12.2" />
90-
<PackageVersion Include="AWSSDK.BedrockAgent" Version="4.0.5.7" />
91-
<PackageVersion Include="AWSSDK.BedrockAgentRuntime" Version="4.0.6.3" />
92-
<PackageVersion Include="AWSSDK.BedrockRuntime" Version="4.0.7.2" />
93-
<PackageVersion Include="AWSSDK.DynamoDBv2" Version="4.0.7" />
94-
<PackageVersion Include="AWSSDK.S3" Version="4.0.7.7" />
89+
<PackageVersion Include="AWSSDK.Bedrock" Version="4.0.12.4" />
90+
<PackageVersion Include="AWSSDK.BedrockAgent" Version="4.0.5.9" />
91+
<PackageVersion Include="AWSSDK.BedrockAgentRuntime" Version="4.0.6.5" />
92+
<PackageVersion Include="AWSSDK.BedrockRuntime" Version="4.0.7.4" />
93+
<PackageVersion Include="AWSSDK.DynamoDBv2" Version="4.0.8" />
94+
<PackageVersion Include="AWSSDK.S3" Version="4.0.7.10" />
9595
<PackageVersion Include="BenchmarkDotNet" Version="0.15.4" />
9696
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
9797
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
@@ -135,6 +135,8 @@
135135
<PackageVersion Include="Testcontainers.MySql" Version="4.7.0" />
136136
<PackageVersion Include="Testcontainers.PostgreSql" Version="4.7.0" />
137137
<PackageVersion Include="Wiremock.Net" Version="1.14.0" />
138+
<!-- Microsoft.AspNetCore.Server.Kestrel.Core is transitive dependency for Wiremock.Net. It is here to fix https://github.com/advisories/GHSA-5rrx-jjjq-q2r5 -->
139+
<PackageVersion Include="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.3.6" />
138140
<PackageVersion Include="xunit" Version="2.9.3" />
139141
<PackageVersion Include="xunit.runner.visualstudio" Version="[2.8.2,)" />
140142
</ItemGroup>

test/OpenTelemetry.Instrumentation.AWS.Tests/TestRequest.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ public TestRequest(ParameterCollection? parameters = null)
9696

9797
public Version HttpProtocolVersion { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
9898

99+
public IAuthSchemeOption ChosenAuthScheme { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
100+
99101
public void AddPathResource(string key, string value)
100102
{
101103
throw new NotImplementedException();

test/OpenTelemetry.Sampler.AWS.Tests/OpenTelemetry.Sampler.AWS.Tests.csproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
<ItemGroup>
99
<PackageReference Include="Wiremock.Net" />
1010
</ItemGroup>
11+
<ItemGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier(`$(TargetFramework)`))' == '.NETFramework'">
12+
<!-- Microsoft.AspNetCore.Server.Kestrel.Core is transitive dependency for Wiremock.Net. It is here to fix https://github.com/advisories/GHSA-5rrx-jjjq-q2r5 -->
13+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Core" />
14+
</ItemGroup>
15+
1116

1217
<ItemGroup>
1318
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Sampler.AWS\OpenTelemetry.Sampler.AWS.csproj" />

test/OpenTelemetry.Sampler.AWS.Tests/TestAWSXRaySamplerClient.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ public void Dispose()
2626
this.client.Dispose();
2727
}
2828

29+
#if NETFRAMEWORK
30+
[Fact(Skip = "Skip due to https://github.com/open-telemetry/opentelemetry-dotnet-contrib/issues/3243")]
31+
#else
2932
[Fact]
33+
#endif
3034
public async Task TestGetSamplingRules()
3135
{
3236
this.CreateResponse("/GetSamplingRules", "Data/GetSamplingRulesResponse.json");
@@ -74,7 +78,11 @@ public async Task TestGetSamplingRules()
7478
Assert.Empty(rules[2].Attributes);
7579
}
7680

81+
#if NETFRAMEWORK
82+
[Fact(Skip = "Skip due to https://github.com/open-telemetry/opentelemetry-dotnet-contrib/issues/3243")]
83+
#else
7784
[Fact]
85+
#endif
7886
public async Task TestGetSamplingRulesMalformed()
7987
{
8088
this.mockServer
@@ -87,7 +95,11 @@ public async Task TestGetSamplingRulesMalformed()
8795
Assert.Empty(rules);
8896
}
8997

98+
#if NETFRAMEWORK
99+
[Fact(Skip = "Skip due to https://github.com/open-telemetry/opentelemetry-dotnet-contrib/issues/3243")]
100+
#else
90101
[Fact]
102+
#endif
91103
public async Task TestGetSamplingTargets()
92104
{
93105
var clock = new TestClock();
@@ -142,7 +154,11 @@ public async Task TestGetSamplingTargets()
142154
Assert.Equal("Unknown rule", targetsResponse.UnprocessedStatistics[0].Message);
143155
}
144156

157+
#if NETFRAMEWORK
158+
[Fact(Skip = "Skip due to https://github.com/open-telemetry/opentelemetry-dotnet-contrib/issues/3243")]
159+
#else
145160
[Fact]
161+
#endif
146162
public async Task TestGetSamplingTargetsWithMalformed()
147163
{
148164
var clock = new TestClock();

0 commit comments

Comments
 (0)