chore: update runtimes

prom-client-net · Oct 20, 2024 · 51ca8b0 · 51ca8b0
1 parent 09853c7
commit 51ca8b0
Show file tree

Hide file tree

Showing 31 changed files with 31 additions and 70 deletions.
diff --git a/Prometheus.Client.Examples.sln b/Prometheus.Client.Examples.sln
@@ -3,21 +3,21 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.0.0
 MinimumVisualStudioVersion = 10.0.0.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleMetricServer_6.0", "src\ConsoleMetricServer_6.0\ConsoleMetricServer_6.0.csproj", "{728A498E-8D38-45B9-A6DF-DEBEFB6563FD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleMetricServer", "src\ConsoleMetricServer\ConsoleMetricServer.csproj", "{728A498E-8D38-45B9-A6DF-DEBEFB6563FD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreWebWithoutExtensions_3.1", "src\CoreWebWithoutExtensions_3.1\CoreWebWithoutExtensions_3.1.csproj", "{A03FD2F8-8F18-44AB-9D01-16D15208B087}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebWithoutExtensions", "src\WebWithoutExtensions\WebWithoutExtensions.csproj", "{A03FD2F8-8F18-44AB-9D01-16D15208B087}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HealthChecks", "src\HealthChecks\HealthChecks.csproj", "{237FECAD-9D7C-43F4-A240-974A5ADE0DE7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNetCore_6.0", "src\AspNetCore_6.0\AspNetCore_6.0.csproj", "{297EA5CD-C468-40CA-A97C-8A5DC28CF701}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNetCore", "src\AspNetCore\AspNetCore.csproj", "{297EA5CD-C468-40CA-A97C-8A5DC28CF701}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HttpRequestDurations", "src\HttpRequestDurations\HttpRequestDurations.csproj", "{83246BAD-85BA-4532-84BF-70D18B7FF66A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebMetricPusher_3.1", "src\WebMetricPusher_3.1\WebMetricPusher_3.1.csproj", "{FC8559F9-D535-47C7-9964-AE754E8FB158}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebMetricPusher", "src\WebMetricPusher\WebMetricPusher.csproj", "{FC8559F9-D535-47C7-9964-AE754E8FB158}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkerMetricServer_6.0", "src\WorkerMetricServer_6.0\WorkerMetricServer_6.0.csproj", "{191C271F-F884-4C4F-8C8B-9A9C0B413104}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkerMetricServer", "src\WorkerMetricServer\WorkerMetricServer.csproj", "{191C271F-F884-4C4F-8C8B-9A9C0B413104}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HostedServiceMetricPusher_6.0", "src\HostedServiceMetricPusher_6.0\HostedServiceMetricPusher_6.0.csproj", "{9652546D-9A18-411D-8057-B6D1F5F32C5D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HostedServiceMetricPusher", "src\HostedServiceMetricPusher\HostedServiceMetricPusher.csproj", "{9652546D-9A18-411D-8057-B6D1F5F32C5D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/AspNetCore_6.0/AspNetCore_6.0.csproj → src/AspNetCore/AspNetCore.csproj b/src/AspNetCore_6.0/AspNetCore_6.0.csproj → src/AspNetCore/AspNetCore.csproj
diff --git a/...Core_6.0/Controllers/CounterController.cs → ...pNetCore/Controllers/CounterController.cs b/...Core_6.0/Controllers/CounterController.cs → ...pNetCore/Controllers/CounterController.cs
diff --git a/...re_6.0/Controllers/HistogramController.cs → ...etCore/Controllers/HistogramController.cs b/...re_6.0/Controllers/HistogramController.cs → ...etCore/Controllers/HistogramController.cs
diff --git a/src/AspNetCore_6.0/Program.cs → src/AspNetCore/Program.cs b/src/AspNetCore_6.0/Program.cs → src/AspNetCore/Program.cs
diff --git a/src/AspNetCore_6.0/Startup.cs → src/AspNetCore/Startup.cs b/src/AspNetCore_6.0/Startup.cs → src/AspNetCore/Startup.cs
diff --git a/...Server_6.0/ConsoleMetricServer_6.0.csproj → ...leMetricServer/ConsoleMetricServer.csproj b/...Server_6.0/ConsoleMetricServer_6.0.csproj → ...leMetricServer/ConsoleMetricServer.csproj
diff --git a/src/ConsoleMetricServer_6.0/Program.cs → src/ConsoleMetricServer/Program.cs b/src/ConsoleMetricServer_6.0/Program.cs → src/ConsoleMetricServer/Program.cs
diff --git a/src/CoreWebWithoutExtensions_3.1/CoreWebWithoutExtensions_3.1.csproj b/src/CoreWebWithoutExtensions_3.1/CoreWebWithoutExtensions_3.1.csproj
diff --git a/src/CoreWebWithoutExtensions_3.1/appsettings.Development.json b/src/CoreWebWithoutExtensions_3.1/appsettings.Development.json
diff --git a/src/CoreWebWithoutExtensions_3.1/appsettings.json b/src/CoreWebWithoutExtensions_3.1/appsettings.json
diff --git a/..._6.0/HostedServiceMetricPusher_6.0.csproj → ...icPusher/HostedServiceMetricPusher.csproj b/..._6.0/HostedServiceMetricPusher_6.0.csproj → ...icPusher/HostedServiceMetricPusher.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Worker">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
+    <RootNamespace>HostedServiceMetricPusher_6.0</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Prometheus.Client" Version="5.2.0" />

diff --git a/src/HostedServiceMetricPusher_6.0/Program.cs → src/HostedServiceMetricPusher/Program.cs b/src/HostedServiceMetricPusher_6.0/Program.cs → src/HostedServiceMetricPusher/Program.cs
diff --git a/src/HostedServiceMetricPusher_6.0/Worker.cs → src/HostedServiceMetricPusher/Worker.cs b/src/HostedServiceMetricPusher_6.0/Worker.cs → src/HostedServiceMetricPusher/Worker.cs
diff --git a/src/HttpRequestDurations/HttpRequestDurations.csproj b/src/HttpRequestDurations/HttpRequestDurations.csproj
@@ -6,6 +6,6 @@
     <PackageReference Include="Prometheus.Client" Version="5.2.0" />
     <PackageReference Include="Prometheus.Client.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Prometheus.Client.DependencyInjection" Version="1.4.0" />
-    <PackageReference Include="Prometheus.Client.HttpRequestDurations" Version="3.6.0.131-g1e3d7fa" />
+    <PackageReference Include="Prometheus.Client.HttpRequestDurations" Version="4.0.0" />
   </ItemGroup>
 </Project>
diff --git a/...sher_3.1/Controllers/CounterController.cs → ...icPusher/Controllers/CounterController.cs b/...sher_3.1/Controllers/CounterController.cs → ...icPusher/Controllers/CounterController.cs
diff --git a/...er_3.1/Controllers/HistogramController.cs → ...Pusher/Controllers/HistogramController.cs b/...er_3.1/Controllers/HistogramController.cs → ...Pusher/Controllers/HistogramController.cs
diff --git a/src/WebMetricPusher_3.1/Program.cs → src/WebMetricPusher/Program.cs b/src/WebMetricPusher_3.1/Program.cs → src/WebMetricPusher/Program.cs
diff --git a/src/WebMetricPusher_3.1/Startup.cs → src/WebMetricPusher/Startup.cs b/src/WebMetricPusher_3.1/Startup.cs → src/WebMetricPusher/Startup.cs
diff --git a/...tricPusher_3.1/WebMetricPusher_3.1.csproj → src/WebMetricPusher/WebMetricPusher.csproj b/...tricPusher_3.1/WebMetricPusher_3.1.csproj → src/WebMetricPusher/WebMetricPusher.csproj
@@ -1,14 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
+    <RootNamespace>WebMetricPusher_3.1</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Prometheus.Client" Version="5.2.0" />
     <PackageReference Include="Prometheus.Client.HttpRequestDurations" Version="3.6.0" />
     <PackageReference Include="Prometheus.Client.MetricPusher" Version="3.1.0" />
     <PackageReference Include="Prometheus.Client.DependencyInjection" Version="1.4.0" />
   </ItemGroup>
-  <ItemGroup>
-    <_ContentIncludedByDefault Remove="Properties\launchSettings.json" />
-  </ItemGroup>
 </Project>
diff --git a/src/WebMetricPusher_3.1/appsettings.Development.json b/src/WebMetricPusher_3.1/appsettings.Development.json
diff --git a/src/WebMetricPusher_3.1/appsettings.json b/src/WebMetricPusher_3.1/appsettings.json
diff --git a/...ions_3.1/Controllers/CounterController.cs → ...tensions/Controllers/CounterController.cs b/...ions_3.1/Controllers/CounterController.cs → ...tensions/Controllers/CounterController.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Prometheus.Client;
 
-namespace CoreWebWithoutExtensions_3._1.Controllers;
+namespace WebWithoutExtensions.Controllers;
 
 [Route("[controller]")]
 public class CounterController : Controller
@@ -26,4 +26,4 @@ public IActionResult Get()
 
         return Ok();
     }
-}
+}
diff --git a/...ns_3.1/Controllers/HistogramController.cs → ...nsions/Controllers/HistogramController.cs b/...ns_3.1/Controllers/HistogramController.cs → ...nsions/Controllers/HistogramController.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Prometheus.Client;
 
-namespace CoreWebWithoutExtensions_3._1.Controllers;
+namespace WebWithoutExtensions.Controllers;
 
 [Route("[controller]")]
 public class HistogramController : Controller

diff --git a/...ions_3.1/Controllers/MetricsController.cs → ...tensions/Controllers/MetricsController.cs b/...ions_3.1/Controllers/MetricsController.cs → ...tensions/Controllers/MetricsController.cs
@@ -3,7 +3,7 @@
 using Prometheus.Client;
 using Prometheus.Client.Collectors;
 
-namespace CoreWebWithoutExtensions_3._1.Controllers;
+namespace WebWithoutExtensions.Controllers;
 
 [Route("[controller]")]
 public class MetricsController : Controller

diff --git a/src/CoreWebWithoutExtensions_3.1/Program.cs → src/WebWithoutExtensions/Program.cs b/src/CoreWebWithoutExtensions_3.1/Program.cs → src/WebWithoutExtensions/Program.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 
-namespace CoreWebWithoutExtensions_3._1;
+namespace WebWithoutExtensions;
 
 public class Program
 {
@@ -16,4 +16,4 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
             {
                 webBuilder.UseStartup<Startup>();
             });
-}
+}
diff --git a/src/CoreWebWithoutExtensions_3.1/Startup.cs → src/WebWithoutExtensions/Startup.cs b/src/CoreWebWithoutExtensions_3.1/Startup.cs → src/WebWithoutExtensions/Startup.cs
@@ -2,9 +2,10 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Prometheus.Client.DependencyInjection;
+using Prometheus.Client;
+using Prometheus.Client.Collectors;
 
-namespace CoreWebWithoutExtensions_3._1;
+namespace WebWithoutExtensions;
 
 public class Startup
 {
@@ -19,17 +20,18 @@ public Startup(IConfiguration configuration)
     public void ConfigureServices(IServiceCollection services)
     {
         services.AddControllers();
-        services.AddMetricFactory();
+        services.AddSingleton<ICollectorRegistry, CollectorRegistry>();
+        services.AddSingleton<IMetricFactory, MetricFactory>();
     }
 
     // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
     public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
     {
         app.UseRouting();
-            
+
         app.UseEndpoints(endpoints =>
         {
             endpoints.MapControllers();
         });
     }
-}
+}
diff --git a/src/WebWithoutExtensions/WebWithoutExtensions.csproj b/src/WebWithoutExtensions/WebWithoutExtensions.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Prometheus.Client" Version="5.2.0" />
+  </ItemGroup>
+</Project>
diff --git a/src/WorkerMetricServer_6.0/Program.cs → src/WorkerMetricServer/Program.cs b/src/WorkerMetricServer_6.0/Program.cs → src/WorkerMetricServer/Program.cs
diff --git a/src/WorkerMetricServer_6.0/Worker.cs → src/WorkerMetricServer/Worker.cs b/src/WorkerMetricServer_6.0/Worker.cs → src/WorkerMetricServer/Worker.cs
diff --git a/...cServer_6.0/WorkerMetricServer_6.0.csproj → ...kerMetricServer/WorkerMetricServer.csproj b/...cServer_6.0/WorkerMetricServer_6.0.csproj → ...kerMetricServer/WorkerMetricServer.csproj