Fixed issue with pool of connections

Author: johnsimons

src/ServiceControl.Audit.Persistence.PostgreSQL/PostgreSQLConnectionFactory.cs

@@ -3,28 +3,45 @@ namespace ServiceControl.Audit.Persistence.PostgreSQL;
 using Npgsql;
 using System.Threading.Tasks;
 using System.Threading;
-class PostgreSQLConnectionFactory(DatabaseConfiguration databaseConfiguration)
+using Microsoft.Extensions.Logging;
+
+class PostgreSQLConnectionFactory
 {
-    public async Task<NpgsqlConnection> OpenConnection(CancellationToken cancellationToken)
+    readonly NpgsqlDataSource dataSource;
+    readonly NpgsqlDataSource dataSourceAdmin;
+
+    public PostgreSQLConnectionFactory(DatabaseConfiguration databaseConfiguration, ILoggerFactory loggerFactory)
     {
-        var dataSourceBuilder = new NpgsqlDataSourceBuilder(databaseConfiguration.ConnectionString);
+        var dataSourceBuilder = new NpgsqlDataSourceBuilder(databaseConfiguration.ConnectionString)
+        {
+            Name = "ServiceControl.Audit"
+        };
+        dataSourceBuilder.UseLoggerFactory(loggerFactory);
         dataSourceBuilder.EnableDynamicJson();
-        var dataSource = dataSourceBuilder.Build();
-        var conn = dataSource.CreateConnection();
-        await conn.OpenAsync(cancellationToken);
-        return conn;
-    }
+        dataSource = dataSourceBuilder.Build();
 
-    public async Task<NpgsqlConnection> OpenAdminConnection(CancellationToken cancellationToken)
-    {
         var builder = new NpgsqlConnectionStringBuilder(databaseConfiguration.ConnectionString)
         {
             Database = databaseConfiguration.AdminDatabaseName
         };
-        var dataSourceBuilder = new NpgsqlDataSourceBuilder(builder.ConnectionString);
-        dataSourceBuilder.EnableDynamicJson();
-        var dataSource = dataSourceBuilder.Build();
-        var conn = dataSource.CreateConnection();
+        var dataSourceBuilderAdmin = new NpgsqlDataSourceBuilder(builder.ConnectionString)
+        {
+            Name = "ServiceControl.Audit-admin",
+        };
+        dataSourceBuilderAdmin.UseLoggerFactory(loggerFactory);
+        dataSourceBuilderAdmin.EnableDynamicJson();
+        dataSourceAdmin = dataSourceBuilderAdmin.Build();
+    }
+
+    public async Task<NpgsqlConnection> OpenConnection(CancellationToken cancellationToken)
+    {
+        var conn = await dataSource.OpenConnectionAsync(cancellationToken);
+        return conn;
+    }
+
+    public async Task<NpgsqlConnection> OpenAdminConnection(CancellationToken cancellationToken)
+    {
+        var conn = dataSourceAdmin.CreateConnection();
         await conn.OpenAsync(cancellationToken);
         return conn;
     }

src/ServiceControl.Audit.Persistence.PostgreSQL/UnitOfWork/PostgreSQLAuditIngestionUnitOfWork.cs

@@ -13,17 +13,20 @@ namespace ServiceControl.Audit.Persistence.PostgreSQL.UnitOfWork;
 class PostgreSQLAuditIngestionUnitOfWork : IAuditIngestionUnitOfWork
 {
     readonly NpgsqlBatch batch;
+    readonly NpgsqlConnection connection;
 
     public PostgreSQLAuditIngestionUnitOfWork(NpgsqlConnection connection)
     {
         batch = new NpgsqlBatch(connection);
+        this.connection = connection;
     }
 
     public async ValueTask DisposeAsync()
     {
         await batch.PrepareAsync();
         await batch.ExecuteNonQueryAsync();
         await batch.DisposeAsync();
+        await connection.DisposeAsync();
     }
 
     public Task RecordProcessedMessage(ProcessedMessage processedMessage, ReadOnlyMemory<byte> body, CancellationToken cancellationToken)

src/ServiceControl.Audit.Persistence.PostgreSQL/UnitOfWork/PostgreSQLAuditIngestionUnitOfWorkFactory.cs

@@ -4,6 +4,7 @@ namespace ServiceControl.Audit.Persistence.PostgreSQL.UnitOfWork;
 using System.Threading.Tasks;
 using ServiceControl.Audit.Persistence.UnitOfWork;
 using ServiceControl.Audit.Persistence.PostgreSQL;
+
 class PostgreSQLAuditIngestionUnitOfWorkFactory : IAuditIngestionUnitOfWorkFactory
 {
     readonly PostgreSQLConnectionFactory connectionFactory;