Fix db.client.connections.create_time metric with .NET 6 (#6248)

vonzshik · vonzshik · commit 09861a1c1069 · 2025-10-15T16:19:28.000+03:00
Fixes #6247 (cherry picked from commit 3fb8541)
diff --git a/src/Npgsql/MetricsReporter.cs b/src/Npgsql/MetricsReporter.cs
@@ -165,8 +165,15 @@ internal void ReportPendingConnectionRequestStart()
     internal void ReportPendingConnectionRequestStop()
         => PendingConnectionRequests.Add(-1, _poolNameTag);
 
-    internal void ReportConnectionCreateTime(TimeSpan duration)
-        => ConnectionCreateTime.Record(duration.TotalSeconds, _poolNameTag);
+    internal void ReportConnectionCreateTime(long startTimestamp)
+    {
+#if NET7_0_OR_GREATER
+        var duration = Stopwatch.GetElapsedTime(startTimestamp);
+#else
+        var duration = new TimeSpan((long)((Stopwatch.GetTimestamp() - startTimestamp) * StopWatchTickFrequency));
+#endif
+        ConnectionCreateTime.Record(duration.TotalSeconds, _poolNameTag);
+    }
 
     static IEnumerable<Measurement<int>> GetConnectionUsage()
     {
diff --git a/src/Npgsql/PoolingDataSource.cs b/src/Npgsql/PoolingDataSource.cs
@@ -268,14 +268,10 @@ bool CheckIdleConnector([NotNullWhen(true)] NpgsqlConnector? connector)
             try
             {
                 // We've managed to increase the open counter, open a physical connections.
-#if NET7_0_OR_GREATER
                 var startTime = Stopwatch.GetTimestamp();
-#endif
                 var connector = new NpgsqlConnector(this, conn) { ClearCounter = _clearCounter };
                 await connector.Open(timeout, async, cancellationToken).ConfigureAwait(false);
-#if NET7_0_OR_GREATER
-                MetricsReporter.ReportConnectionCreateTime(Stopwatch.GetElapsedTime(startTime));
-#endif
+                MetricsReporter.ReportConnectionCreateTime(startTime);
 
                 var i = 0;
                 for (; i < MaxConnections; i++)
