Align to latest prometheus version

There are known bugs in 7.0; release a version to encourage avoidance of problematic version(s)
chris-peterson · Apr 11, 2024 · bb1e45b · bb1e45b
1 parent 9fade3c
commit bb1e45b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,11 +15,11 @@ jobs:
       Configuration: Release 
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Build
         run: dotnet build
diff --git a/src/Spiffy.Monitoring.Prometheus/PrometheusConfigurationApi.cs b/src/Spiffy.Monitoring.Prometheus/PrometheusConfigurationApi.cs
@@ -2,13 +2,11 @@ namespace Spiffy.Monitoring.Prometheus
 {
     public class PrometheusConfigurationApi
     {
-#if NET6_0_OR_GREATER
         public PrometheusConfigurationApi()
         {
             RuntimeStats = global::Prometheus.DotNetRuntime.DotNetRuntimeStatsBuilder.Customize();
         }
 
         public global::Prometheus.DotNetRuntime.DotNetRuntimeStatsBuilder.Builder RuntimeStats { get; private set; }
-#endif
     }
 }
diff --git a/src/Spiffy.Monitoring.Prometheus/PrometheusProvider.cs b/src/Spiffy.Monitoring.Prometheus/PrometheusProvider.cs
@@ -19,13 +19,11 @@ public static InitializationApi.ProvidersApi Prometheus(this InitializationApi.P
             {
                 var config = new PrometheusConfigurationApi();
                 customize(config);
-#if NET6_0_OR_GREATER
                 lock (_serializeCollectionAccess)
                 {
                     _previousCollector?.Dispose();
                     _previousCollector = config.RuntimeStats.StartCollecting();
                 }
-#endif
             }
             api.Add("prometheus", PrometheusRules.Process);
             return api;

diff --git a/src/Spiffy.Monitoring.Prometheus/Spiffy.Monitoring.Prometheus.csproj b/src/Spiffy.Monitoring.Prometheus/Spiffy.Monitoring.Prometheus.csproj
@@ -1,27 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Copyright>2020-2023</Copyright>
+    <Copyright>2020-2024</Copyright>
     <Authors>Chris Peterson</Authors>
     <Description>The Prometheus provider for Spiffy.Monitoring</Description>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1</TargetFrameworks>
     <AssemblyName>Spiffy.Monitoring.Prometheus</AssemblyName>
     <PackageId>Spiffy.Monitoring.Prometheus</PackageId>
     <PackageTags>monitoring;eventcontext;structured logging;metrics;prometheus;splunk</PackageTags>
     <PackageProjectUrl>http://github.com/chris-peterson/spiffy#overview</PackageProjectUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>2.0.6</Version>
+    <Version>3.0.0</Version>
     <RootNamespace>Spiffy.Monitoring.Prometheus</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Spiffy.Monitoring\Spiffy.Monitoring.csproj" />
-    <PackageReference Include="prometheus-net" Version="6.0.*" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' " >
+    <PackageReference Include="prometheus-net" Version="8.2.*" />
     <PackageReference Include="prometheus-net.DotNetRuntime" Version="4.4.*" />
   </ItemGroup>
 

diff --git a/tests/TestConsoleApp/TestConsoleApp.csproj b/tests/TestConsoleApp/TestConsoleApp.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <DebugType>portable</DebugType>
         <OutputTypeEx>exe</OutputTypeEx>
     </PropertyGroup>

diff --git a/tests/UnitTests/UnitTests.csproj b/tests/UnitTests/UnitTests.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <DebugType>portable</DebugType>
         <ApplicationIcon />
         <OutputTypeEx>library</OutputTypeEx>