Enable the new OpenTelemetry metrics for net6.0 (#5174)

roji · web-flow · commit 0124e0ae2b29 · 2023-07-25T12:29:03.000+03:00
Closes #3960
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,6 +1,6 @@
 <Project>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
 
@@ -49,10 +49,10 @@
     <PackageVersion Include="System.Text.Json" Version="7.0.3" />
     <PackageVersion Include="System.Threading.Channels" Version="7.0.0" />
     <PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
-    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'net6.0' ">
     <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
   </ItemGroup>
 </Project>
diff --git a/src/Npgsql/MetricsReporter.cs b/src/Npgsql/MetricsReporter.cs
@@ -2,7 +2,7 @@
 
 namespace Npgsql;
 
-#if NET7_0_OR_GREATER
+#if NET6_0_OR_GREATER
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.Metrics;
@@ -114,7 +114,11 @@ internal void ReportCommandStop(long startTimestamp)
 
         if (CommandDuration.Enabled && startTimestamp > 0)
         {
+#if NET7_0_OR_GREATER
             var duration = Stopwatch.GetElapsedTime(startTimestamp);
+#else
+            var duration = new TimeSpan((long)((Stopwatch.GetTimestamp() - startTimestamp) * StopWatchTickFrequency));
+#endif
             CommandDuration.Record(duration.TotalMilliseconds, _poolNameTag);
         }
     }
@@ -216,9 +220,15 @@ public void Dispose()
             Reporters.Remove(this);
         }
     }
+
+#if !NET7_0_OR_GREATER
+    const long TicksPerMicrosecond = 10;
+    const long TicksPerMillisecond = TicksPerMicrosecond * 1000;
+    const long TicksPerSecond = TicksPerMillisecond * 1000;   // 10,000,000
+    static readonly double StopWatchTickFrequency = (double)TicksPerSecond / Stopwatch.Frequency;
+#endif
 }
 #else
-// Unfortunately, UpDownCounter is only supported starting with net7.0, and since a lot of the metrics rely on it,
 sealed class MetricsReporter : IDisposable
 {
     public MetricsReporter(NpgsqlDataSource _) {}
diff --git a/src/Npgsql/Npgsql.csproj b/src/Npgsql/Npgsql.csproj
@@ -30,11 +30,11 @@
     <PackageReference Include="System.Text.Json" />
     <PackageReference Include="System.Threading.Channels" />
     <PackageReference Include="System.Collections.Immutable" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Npgsql;`
`4`	`4`
`5`		`-#if NET7_0_OR_GREATER`
	`5`	`+#if NET6_0_OR_GREATER`
`6`	`6`	`using System.Collections.Generic;`
`7`	`7`	`using System.Diagnostics;`
`8`	`8`	`using System.Diagnostics.Metrics;`
`@@ -114,7 +114,11 @@ internal void ReportCommandStop(long startTimestamp)`
`114`	`114`
`115`	`115`	`if (CommandDuration.Enabled && startTimestamp > 0)`
`116`	`116`	`{`
	`117`	`+#if NET7_0_OR_GREATER`
`117`	`118`	`var duration = Stopwatch.GetElapsedTime(startTimestamp);`
	`119`	`+#else`
	`120`	`+ var duration = new TimeSpan((long)((Stopwatch.GetTimestamp() - startTimestamp) * StopWatchTickFrequency));`
	`121`	`+#endif`
`118`	`122`	`CommandDuration.Record(duration.TotalMilliseconds, _poolNameTag);`
`119`	`123`	`}`
`120`	`124`	`}`
`@@ -216,9 +220,15 @@ public void Dispose()`
`216`	`220`	`Reporters.Remove(this);`
`217`	`221`	`}`
`218`	`222`	`}`
	`223`	`+`
	`224`	`+#if !NET7_0_OR_GREATER`
	`225`	`+ const long TicksPerMicrosecond = 10;`
	`226`	`+ const long TicksPerMillisecond = TicksPerMicrosecond * 1000;`
	`227`	`+ const long TicksPerSecond = TicksPerMillisecond * 1000; // 10,000,000`
	`228`	`+ static readonly double StopWatchTickFrequency = (double)TicksPerSecond / Stopwatch.Frequency;`
	`229`	`+#endif`
`219`	`230`	`}`
`220`	`231`	`#else`
`221`		`-// Unfortunately, UpDownCounter is only supported starting with net7.0, and since a lot of the metrics rely on it,`
`222`	`232`	`sealed class MetricsReporter : IDisposable`
`223`	`233`	`{`
`224`	`234`	`public MetricsReporter(NpgsqlDataSource _) {}`