Skip to content

Commit 38e10a4

Browse files
authored
AddEurekaHttpClient should use IOptions instead of IOptionsSnapshot (#841)
1 parent d3577b5 commit 38e10a4

File tree

2 files changed

+34
-4
lines changed

2 files changed

+34
-4
lines changed

src/Discovery/Discovery.sln

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio Version 16
3-
VisualStudioVersion = 16.0.28729.10
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.1.32319.34
44
MinimumVisualStudioVersion = 15.0.26124.0
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A0CD0464-8E5B-42DD-8464-13FC8E6F35FF}"
66
EndProject
@@ -76,7 +76,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Management.Endpoin
7676
EndProject
7777
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Management.OpenTelemetryBase", "..\Management\src\OpenTelemetryBase\Steeltoe.Management.OpenTelemetryBase.csproj", "{1658BD8E-989F-425D-BE49-2BD3B6083D5F}"
7878
EndProject
79-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Steeltoe.Common.Utils", "..\Common\src\Common.Utils\Steeltoe.Common.Utils.csproj", "{55A893A9-C40F-4BFE-821D-87CA38CA7035}"
79+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Common.Utils", "..\Common\src\Common.Utils\Steeltoe.Common.Utils.csproj", "{55A893A9-C40F-4BFE-821D-87CA38CA7035}"
80+
EndProject
81+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Extensions.Logging.Abstractions", "..\Logging\src\Abstractions\Steeltoe.Extensions.Logging.Abstractions.csproj", "{10B22A7B-6F70-431D-88C9-7C3F8A5A6536}"
82+
EndProject
83+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Extensions.Logging.DynamicLogger", "..\Logging\src\DynamicLogger\Steeltoe.Extensions.Logging.DynamicLogger.csproj", "{992D1C9D-15D2-4AB2-8CC4-094B89CCD438}"
8084
EndProject
8185
Global
8286
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -424,6 +428,30 @@ Global
424428
{55A893A9-C40F-4BFE-821D-87CA38CA7035}.Release|x64.Build.0 = Release|Any CPU
425429
{55A893A9-C40F-4BFE-821D-87CA38CA7035}.Release|x86.ActiveCfg = Release|Any CPU
426430
{55A893A9-C40F-4BFE-821D-87CA38CA7035}.Release|x86.Build.0 = Release|Any CPU
431+
{10B22A7B-6F70-431D-88C9-7C3F8A5A6536}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
432+
{10B22A7B-6F70-431D-88C9-7C3F8A5A6536}.Debug|Any CPU.Build.0 = Debug|Any CPU
433+
{10B22A7B-6F70-431D-88C9-7C3F8A5A6536}.Debug|x64.ActiveCfg = Debug|Any CPU
434+
{10B22A7B-6F70-431D-88C9-7C3F8A5A6536}.Debug|x64.Build.0 = Debug|Any CPU
435+
{10B22A7B-6F70-431D-88C9-7C3F8A5A6536}.Debug|x86.ActiveCfg = Debug|Any CPU
436+
{10B22A7B-6F70-431D-88C9-7C3F8A5A6536}.Debug|x86.Build.0 = Debug|Any CPU
437+
{10B22A7B-6F70-431D-88C9-7C3F8A5A6536}.Release|Any CPU.ActiveCfg = Release|Any CPU
438+
{10B22A7B-6F70-431D-88C9-7C3F8A5A6536}.Release|Any CPU.Build.0 = Release|Any CPU
439+
{10B22A7B-6F70-431D-88C9-7C3F8A5A6536}.Release|x64.ActiveCfg = Release|Any CPU
440+
{10B22A7B-6F70-431D-88C9-7C3F8A5A6536}.Release|x64.Build.0 = Release|Any CPU
441+
{10B22A7B-6F70-431D-88C9-7C3F8A5A6536}.Release|x86.ActiveCfg = Release|Any CPU
442+
{10B22A7B-6F70-431D-88C9-7C3F8A5A6536}.Release|x86.Build.0 = Release|Any CPU
443+
{992D1C9D-15D2-4AB2-8CC4-094B89CCD438}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
444+
{992D1C9D-15D2-4AB2-8CC4-094B89CCD438}.Debug|Any CPU.Build.0 = Debug|Any CPU
445+
{992D1C9D-15D2-4AB2-8CC4-094B89CCD438}.Debug|x64.ActiveCfg = Debug|Any CPU
446+
{992D1C9D-15D2-4AB2-8CC4-094B89CCD438}.Debug|x64.Build.0 = Debug|Any CPU
447+
{992D1C9D-15D2-4AB2-8CC4-094B89CCD438}.Debug|x86.ActiveCfg = Debug|Any CPU
448+
{992D1C9D-15D2-4AB2-8CC4-094B89CCD438}.Debug|x86.Build.0 = Debug|Any CPU
449+
{992D1C9D-15D2-4AB2-8CC4-094B89CCD438}.Release|Any CPU.ActiveCfg = Release|Any CPU
450+
{992D1C9D-15D2-4AB2-8CC4-094B89CCD438}.Release|Any CPU.Build.0 = Release|Any CPU
451+
{992D1C9D-15D2-4AB2-8CC4-094B89CCD438}.Release|x64.ActiveCfg = Release|Any CPU
452+
{992D1C9D-15D2-4AB2-8CC4-094B89CCD438}.Release|x64.Build.0 = Release|Any CPU
453+
{992D1C9D-15D2-4AB2-8CC4-094B89CCD438}.Release|x86.ActiveCfg = Release|Any CPU
454+
{992D1C9D-15D2-4AB2-8CC4-094B89CCD438}.Release|x86.Build.0 = Release|Any CPU
427455
EndGlobalSection
428456
GlobalSection(SolutionProperties) = preSolution
429457
HideSolutionNode = FALSE
@@ -457,6 +485,8 @@ Global
457485
{5CDD57FE-B25F-43A4-9C0B-ADA723CE22A5} = {26A62999-E553-40B7-B393-2195557F6D8B}
458486
{1658BD8E-989F-425D-BE49-2BD3B6083D5F} = {26A62999-E553-40B7-B393-2195557F6D8B}
459487
{55A893A9-C40F-4BFE-821D-87CA38CA7035} = {26A62999-E553-40B7-B393-2195557F6D8B}
488+
{10B22A7B-6F70-431D-88C9-7C3F8A5A6536} = {26A62999-E553-40B7-B393-2195557F6D8B}
489+
{992D1C9D-15D2-4AB2-8CC4-094B89CCD438} = {26A62999-E553-40B7-B393-2195557F6D8B}
460490
EndGlobalSection
461491
GlobalSection(ExtensibilityGlobals) = postSolution
462492
SolutionGuid = {09301AE1-862F-43FC-9E71-732151D4CDDF}

src/Discovery/src/Eureka/EurekaDiscoveryClientExtension.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ private void AddEurekaServices(IServiceCollection services)
169169
private IHttpClientBuilder AddEurekaHttpClient(IServiceCollection services)
170170
=> services.AddHttpClient<EurekaDiscoveryClient>("Eureka", (services, client) =>
171171
{
172-
var clientOptions = services.GetRequiredService<IOptionsSnapshot<EurekaClientOptions>>();
172+
var clientOptions = services.GetRequiredService<IOptions<EurekaClientOptions>>();
173173
if (clientOptions.Value.EurekaServerConnectTimeoutSeconds > 0)
174174
{
175175
client.Timeout = TimeSpan.FromSeconds(clientOptions.Value.EurekaServerConnectTimeoutSeconds);

0 commit comments

Comments
 (0)