Skip to content

#2354 Follow-up: Redesign PollKube discovery using PeriodicTimer #2358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raman-m merged 10 commits into from
Feb 25, 2026
Merged

#2354 Follow-up: Redesign PollKube discovery using PeriodicTimer #2358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b7eeb06
Dispose pattern for logging and Kube polling
raman-m Feb 10, 2026
21bb154
Fix HeaderTests to work seamlessly across .NET 8, 9, 10 frameworks
raman-m Feb 10, 2026
1d741df
Don't fail the build if code coverage drops below the threshold
raman-m Feb 12, 2026
4ee9a27
Merge branch 'develop' into 2354-follow-up-2
raman-m Feb 17, 2026
99db1ef
Re-enable problematic tests
raman-m Feb 17, 2026
93781f9
Fix xUnit1051 warnings
raman-m Feb 17, 2026
c1ea449
Bump Ocelot.Testing pack to 25.0.0-beta.2
raman-m Feb 24, 2026
49e6997
Redesign PollKube discovery utilizing PeriodicTimer
raman-m Feb 24, 2026
e89cbd0
Skip PollKube tests that are still in development
raman-m Feb 24, 2026
b93658b
Fix line endings issue in values expected as strings
raman-m Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/Ocelot.Cache.CacheManager/Ocelot.Cache.CacheManager.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@
<ProjectReference Include="..\Ocelot\Ocelot.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CacheManager.Core" Version="2.0.0" />
<PackageReference Include="CacheManager.Microsoft.Extensions.Configuration" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.11" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.11" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.11" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.11" />
<PackageReference Include="CacheManager.Core" Version="3.0.0" />
<PackageReference Include="CacheManager.Microsoft.Extensions.Configuration" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.3" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="8.0.0-preview.7.23375.6" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.103" />
</ItemGroup>
</Project>
313 changes: 161 additions & 152 deletions src/Ocelot.Cache.CacheManager/packages.lock.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion src/Ocelot.Provider.Consul/ConsulProviderFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,12 @@ public static class ConsulProviderFactory // TODO : IServiceDiscoveryProviderFac
/// <summary>String constant used for provider type definition.</summary>
public const string PollConsul = nameof(Provider.Consul.PollConsul);

private static readonly List<PollConsul> ServiceDiscoveryProviders = new(); // TODO It must be scoped service in DI-container
private static readonly List<PollConsul> ServiceDiscoveryProviders = new(); // TODO It must be singleton service in DI-container
#if NET9_0_OR_GREATER
private static readonly System.Threading.Lock SyncRoot = new();
#else
private static readonly object SyncRoot = new();
#endif

public static ServiceDiscoveryFinderDelegate Get { get; } = CreateProvider;
private static IServiceDiscoveryProvider CreateProvider(IServiceProvider provider, ServiceProviderConfiguration config, DownstreamRoute route)
Expand Down
2 changes: 1 addition & 1 deletion src/Ocelot.Provider.Consul/Ocelot.Provider.Consul.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Consul" Version="1.7.14.10" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.102" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.103" />
</ItemGroup>
</Project>
66 changes: 33 additions & 33 deletions src/Ocelot.Provider.Consul/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,34 +23,34 @@
},
"Microsoft.AspNetCore.JsonPatch": {
"type": "Transitive",
"resolved": "10.0.2",
"contentHash": "AxRcJMoHvJ4NDVKiOas5Itd+uGhYcbkSqdtIWS49IQyJSwZuU4M9QCDt8anU3o4Dv5iDpkaLNWVmovH3x3E2ag==",
"resolved": "10.0.3",
"contentHash": "IHsqsECi1N2FJ0RmV73Cmp6qusu4vGBhUuWJFyJAC/LekFdwSa5zacZE80Sd8M2fD9ZXgEaA32y5qcj3jh3wlQ==",
"dependencies": {
"Newtonsoft.Json": "13.0.3"
}
},
"Microsoft.AspNetCore.MiddlewareAnalysis": {
"type": "Transitive",
"resolved": "10.0.2",
"contentHash": "RxKXZp+tOXEcYsC32kTamRB05OkD6L7jGj25EQyqI0miJmCYMffErrJVLK9wLGOMxOfwQQcB4PDDJa6mzHZ0Vw==",
"resolved": "10.0.3",
"contentHash": "LLPdY4BEQ94be1eiXYyeFhcern4jOoMgIKLmfFpEvXafbcsSZtCXk0yT6seoyCJsh1vrdTVKYbLH+3b6/actfg==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.2"
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.3"
}
},
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": {
"type": "Transitive",
"resolved": "10.0.2",
"contentHash": "ori4kONmWIJsn8PbXIBVAp/mkY5S1tfNoOKEQi5AxyKoBNA0z7UTziPgTIcCq6rRFp5pF+7OliXwOXy8CBjpxA==",
"resolved": "10.0.3",
"contentHash": "gnCyVHEYeI3oeK1pig6F3ckmTKew5wJO5V70vj7rKp4KOoPUijGcigsaFdJfj5HZBXMmYuJpBiaWCHauXJ0GLw==",
"dependencies": {
"Microsoft.AspNetCore.JsonPatch": "10.0.2",
"Microsoft.AspNetCore.JsonPatch": "10.0.3",
"Newtonsoft.Json": "13.0.3",
"Newtonsoft.Json.Bson": "1.0.2"
}
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
"type": "Transitive",
"resolved": "10.0.2",
"contentHash": "zOIurr59+kUf9vNcsUkCvKWZv+fPosUZXURZesYkJCvl0EzTc9F7maAO4Cd2WEV7ZJJ0AZrFQvuH6Npph9wdBw=="
"resolved": "10.0.3",
"contentHash": "bwGMrRcAMWx2s/RDgja97p27rxSz2pEQW0+rX5cWAUWVETVJ/eyxGfjAl8vuG5a+lckWmPIE+vcuaZNVB5YDdw=="
},
"Microsoft.Extensions.DiagnosticAdapter": {
"type": "Transitive",
Expand All @@ -75,8 +75,8 @@
"dependencies": {
"FluentValidation": "[12.1.1, )",
"IPAddressRange": "[6.3.0, )",
"Microsoft.AspNetCore.MiddlewareAnalysis": "[10.0.2, )",
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[10.0.2, )",
"Microsoft.AspNetCore.MiddlewareAnalysis": "[10.0.3, )",
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[10.0.3, )",
"Microsoft.Extensions.DiagnosticAdapter": "[3.1.32, )"
}
}
Expand Down Expand Up @@ -105,26 +105,26 @@
},
"Microsoft.AspNetCore.JsonPatch": {
"type": "Transitive",
"resolved": "8.0.23",
"contentHash": "ZkidSx9Fsad/Yw8n8z30SeMDk7u04ZapQpGIkxGWm1Hq8+GNHL9fG+Ky0DSwr7/w7AyPzAC/KrNaDgUKeGy5aQ==",
"resolved": "8.0.24",
"contentHash": "fup+Ya6mN58877F6eKzR8jrMe2fCRQ/Bl3pA/23DtX+1R2eWdDTrZGYOGDrnt2aWN5VgLSlxc7APFgXiK57l8w==",
"dependencies": {
"Newtonsoft.Json": "13.0.3"
}
},
"Microsoft.AspNetCore.MiddlewareAnalysis": {
"type": "Transitive",
"resolved": "8.0.23",
"contentHash": "Up+0BdjZCvQMFfw6320DI4MMnZNVF7kS9UOWQasXp79K+WZMtlsgZP/PgKRO+UPTVyR9EI3ZquLw+uvSY6kXxw==",
"resolved": "8.0.24",
"contentHash": "qb0pE7PBNUiIVtFleAZ4gq7KLQuPGOjAhA4TbC/NLLpsP1WXJtDXcqTBdta6iJQBDtmeWVSijy6KyX0hZcr/WQ==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2"
}
},
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": {
"type": "Transitive",
"resolved": "8.0.23",
"contentHash": "NWhDWRZ6KEQ28/Ki2RY1txSya5u5SNvPvr7w3/d/mh15hS/fnmJceS9O8GVVCjlIg1SVyvUhf/bSXy2ET2uKxQ==",
"resolved": "8.0.24",
"contentHash": "TvbyHnoETdT71rTFlBLUJ6pOCu1nQf4Y4dkt/g2lEqKN2+CSraY2rUPyYrpPeH5oopSQGrDNFO3pVCBrfbjxjg==",
"dependencies": {
"Microsoft.AspNetCore.JsonPatch": "8.0.23",
"Microsoft.AspNetCore.JsonPatch": "8.0.24",
"Newtonsoft.Json": "13.0.3",
"Newtonsoft.Json.Bson": "1.0.2"
}
Expand Down Expand Up @@ -157,8 +157,8 @@
"dependencies": {
"FluentValidation": "[12.1.1, )",
"IPAddressRange": "[6.3.0, )",
"Microsoft.AspNetCore.MiddlewareAnalysis": "[8.0.23, )",
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[8.0.23, )",
"Microsoft.AspNetCore.MiddlewareAnalysis": "[8.0.24, )",
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[8.0.24, )",
"Microsoft.Extensions.DiagnosticAdapter": "[3.1.32, )"
}
}
Expand Down Expand Up @@ -187,34 +187,34 @@
},
"Microsoft.AspNetCore.JsonPatch": {
"type": "Transitive",
"resolved": "9.0.12",
"contentHash": "yuZyzPS1KaqB+Mob+Q86WNOPy9in9a+WKBPqlG4e0+VR01ZlVTi+uhlCI4+UKy82IYD4Vvm1PQv7LF1ng+c4Ww==",
"resolved": "9.0.13",
"contentHash": "97bu/KDJKJypkpQb0hq2YDxFy4f30g/4Wmk2I8XTxDvaXbGL2UcLQGdrLWAIW+NlEAFI+Zrps1Oe92uO26vRLQ==",
"dependencies": {
"Newtonsoft.Json": "13.0.3"
}
},
"Microsoft.AspNetCore.MiddlewareAnalysis": {
"type": "Transitive",
"resolved": "9.0.12",
"contentHash": "SBOwubPfUDZnvqFLZspHuh9S+M+PA75lI7opKOh4Kkw4C/UviK1swvm0Jo6YcJpYJcqE276SNO59QPJrMUmOuQ==",
"resolved": "9.0.13",
"contentHash": "qfh2o5iXQvummtKgaui21dbmOjhBoQfwscxgfxDUUlvNa+Qj6hMwqQUOLQ+/oG+8caUDkdSWzMdcu8Z79UT4GQ==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.12"
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.13"
}
},
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": {
"type": "Transitive",
"resolved": "9.0.12",
"contentHash": "ah+IHsELhTYSRXnt5HJSAjISXOz/Utyp974ghVAx/Dy1QKhc7djYbuVukUqCnhK+WgLxmHaxmu800va6ZEWK0A==",
"resolved": "9.0.13",
"contentHash": "hH3hfEYrm97r5+11BeezwT4LmDvgGPzq3GvtChhCV9AA2igWPkzA5E0ZmtPWdU9W124QZmceMztDZs68xgkHOw==",
"dependencies": {
"Microsoft.AspNetCore.JsonPatch": "9.0.12",
"Microsoft.AspNetCore.JsonPatch": "9.0.13",
"Newtonsoft.Json": "13.0.3",
"Newtonsoft.Json.Bson": "1.0.2"
}
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
"type": "Transitive",
"resolved": "9.0.12",
"contentHash": "giBjLNJewLe2baQBmLp+8/HSm05WBA//Pd8G5of5G1qrT8a+KLg6mYE6k7w9GFLjYG8ckKyTC9u2yoA0b0J8kg=="
"resolved": "9.0.13",
"contentHash": "HyJoV/UcJr71gPs9ot3GFJG2yyYxoBNTvp48xVJn37FRLeJZithg74aUNZQRCJgk0yG6LbgDlXDJJwG3QFnoyQ=="
},
"Microsoft.Extensions.DiagnosticAdapter": {
"type": "Transitive",
Expand All @@ -239,8 +239,8 @@
"dependencies": {
"FluentValidation": "[12.1.1, )",
"IPAddressRange": "[6.3.0, )",
"Microsoft.AspNetCore.MiddlewareAnalysis": "[9.0.12, )",
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[9.0.12, )",
"Microsoft.AspNetCore.MiddlewareAnalysis": "[9.0.13, )",
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[9.0.13, )",
"Microsoft.Extensions.DiagnosticAdapter": "[3.1.32, )"
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Ocelot.Provider.Eureka/Ocelot.Provider.Eureka.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@
<ItemGroup>
<PackageReference Include="Steeltoe.Discovery.ClientCore" Version="3.3.0" /><!-- TODO Requires upgrade to v4.0 after package upgraded -->
<PackageReference Include="Steeltoe.Discovery.Eureka" Version="3.3.0" /><!-- TODO Requires upgrade to v4.0 after package upgraded -->
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.102" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.103" />
</ItemGroup>
</Project>
Loading
Loading