Fix missing IMeterFactory for .NET7 and lower

NikiforovAll · Jun 11, 2024 · b356e64 · b356e64
1 parent ff3a44f
commit b356e64
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 15 deletions.
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -5,6 +5,7 @@
     <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.29" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.29" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics" Version="8.0.0" />
     <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.5.1" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
@@ -27,4 +28,4 @@
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="MinVer" Version="5.0.0" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Keycloak.AuthServices.Authorization/Keycloak.AuthServices.Authorization.csproj b/src/Keycloak.AuthServices.Authorization/Keycloak.AuthServices.Authorization.csproj
@@ -16,6 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics" />
     <PackageReference Include="Microsoft.Extensions.Http" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" />
   </ItemGroup>

diff --git a/src/Keycloak.AuthServices.Authorization/ServiceCollectionExtensions.cs b/src/Keycloak.AuthServices.Authorization/ServiceCollectionExtensions.cs
@@ -94,6 +94,8 @@ public static IServiceCollection AddKeycloakAuthorization(
 
         services.AddSingleton<KeycloakMetrics>();
 
+        services.AddMetrics();
+
         services.AddTransient<IClaimsTransformation>(sp =>
         {
             var keycloakOptions = sp.GetRequiredService<

diff --git a/src/Keycloak.AuthServices.Templates/AspireStarterTemplate/Directory.Packages.props b/src/Keycloak.AuthServices.Templates/AspireStarterTemplate/Directory.Packages.props
@@ -3,8 +3,8 @@
     <PackageVersion Include="Aspire.Hosting.AppHost" Version="8.0.1" />
     <PackageVersion Include="Aspire.Hosting" Version="8.0.1" />
     <PackageVersion Include="Keycloak.AuthServices.Aspire.Hosting" Version="0.1.0-preview1" />
-    <PackageVersion Include="Keycloak.AuthServices.Authentication" Version="2.4.1" />
-    <PackageVersion Include="Keycloak.AuthServices.Common" Version="2.4.1" />
+    <PackageVersion Include="Keycloak.AuthServices.Authentication" Version="2.5.0" />
+    <PackageVersion Include="Keycloak.AuthServices.Common" Version="2.5.0" />
     <PackageVersion Include="Keycloak.AuthServices.OpenTelemetry" Version="1.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6" />
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.5.0" />

diff --git a/src/Keycloak.AuthServices.Templates/WebApiTemplate/Directory.Packages.props b/src/Keycloak.AuthServices.Templates/WebApiTemplate/Directory.Packages.props
@@ -1,20 +1,10 @@
 <Project>
   <ItemGroup>
-    <PackageVersion Include="Aspire.Hosting.AppHost" Version="8.0.1" />
-    <PackageVersion Include="Aspire.Hosting" Version="8.0.1" />
     <PackageVersion Include="Keycloak.AuthServices.Aspire.Hosting" Version="0.1.0-preview1" />
-    <PackageVersion Include="Keycloak.AuthServices.Authentication" Version="2.4.1" />
-    <PackageVersion Include="Keycloak.AuthServices.Common" Version="2.4.1" />
+    <PackageVersion Include="Keycloak.AuthServices.Authentication" Version="2.5.0" />
+    <PackageVersion Include="Keycloak.AuthServices.Common" Version="2.5.0" />
     <PackageVersion Include="Keycloak.AuthServices.OpenTelemetry" Version="1.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.5.0" />
-    <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.1" />
-    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
-    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.4" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.6.2" />
   </ItemGroup>
 </Project>