Add 'Application Name' connection string option to the tests.

mysql-net · Jan 12, 2024 · 64e4fc5 · 64e4fc5
1 parent 2f95bb2
commit 64e4fc5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/tests/MySqlConnector.Tests/Metrics/ConnectionsUsageTests.cs b/tests/MySqlConnector.Tests/Metrics/ConnectionsUsageTests.cs
@@ -5,9 +5,12 @@ namespace MySqlConnector.Tests.Metrics;
 public class ConnectionsUsageTests : MetricsTestsBase
 {
     [Theory(Skip = MetricsSkip)]
-	[InlineData("DataSource|true|")]
-	[InlineData("DataSource|true|metrics-test")]
-	[InlineData("Plain|true")]
+	[InlineData("DataSource|true||")]
+	[InlineData("DataSource|true||app-name")]
+    [InlineData("DataSource|true|pool-name|")]
+    [InlineData("DataSource|true|pool-name|app-name")]
+	[InlineData("Plain|true|")]
+	[InlineData("Plain|true|app-name")]
 	public void ConnectionsWithPoolsHaveMetrics(string connectionCreatorSpec)
     {
 		using var connectionCreator = CreateConnectionCreator(connectionCreatorSpec, CreateConnectionStringBuilder());
@@ -60,9 +63,12 @@ public void ConnectionsWithPoolsHaveMetrics(string connectionCreatorSpec)
 	}
 
 	[Theory(Skip = MetricsSkip)]
-    [InlineData("DataSource|false|")]
-    [InlineData("DataSource|false|metrics-test")]
-    [InlineData("Plain|false")]
+    [InlineData("DataSource|false||")]
+    [InlineData("DataSource|false||app-name")]
+    [InlineData("DataSource|false|pool-name|")]
+    [InlineData("DataSource|false|pool-name|app-name")]
+    [InlineData("Plain|false|")]
+    [InlineData("Plain|false|app-name")]
     public void ConnectionsWithoutPoolsHaveNoMetrics(string connectionCreatorSpec)
 	{
 		using var connectionCreator = CreateConnectionCreator(connectionCreatorSpec, CreateConnectionStringBuilder());
@@ -172,8 +178,8 @@ private IConnectionCreator CreateConnectionCreator(string spec, MySqlConnectionS
 		var parts = spec.Split('|');
 		return parts[0] switch
 		{
-			"DataSource" => new DataSourceConnectionCreator(bool.Parse(parts[1]), parts[2] == "" ? null : parts[2], connectionStringBuilder),
-			"Plain" => new PlainConnectionCreator(bool.Parse(parts[1]), connectionStringBuilder),
+			"DataSource" => new DataSourceConnectionCreator(bool.Parse(parts[1]), parts[2] == "" ? null : parts[2], parts[3] == "" ? null : parts[3], connectionStringBuilder),
+			"Plain" => new PlainConnectionCreator(bool.Parse(parts[1]), parts[2] == "" ? null : parts[2], connectionStringBuilder),
 			_ => throw new NotSupportedException(),
 		};
 	}

diff --git a/tests/MySqlConnector.Tests/Metrics/IConnectionCreator.cs b/tests/MySqlConnector.Tests/Metrics/IConnectionCreator.cs
@@ -10,9 +10,10 @@ public interface IConnectionCreator : IDisposable
 
 internal sealed class DataSourceConnectionCreator : IConnectionCreator
 {
-	public DataSourceConnectionCreator(bool usePooling, string? poolName, MySqlConnectionStringBuilder connectionStringBuilder)
+	public DataSourceConnectionCreator(bool usePooling, string? poolName, string? applicationName, MySqlConnectionStringBuilder connectionStringBuilder)
 	{
         connectionStringBuilder.Pooling =	usePooling;
+		connectionStringBuilder.ApplicationName = applicationName;
 		m_dataSource = new MySqlDataSourceBuilder(connectionStringBuilder.ConnectionString)
 			.UseName(poolName)
 			.Build();
@@ -28,9 +29,10 @@ public DataSourceConnectionCreator(bool usePooling, string? poolName, MySqlConne
 
 internal sealed class PlainConnectionCreator : IConnectionCreator
 {
-	public PlainConnectionCreator(bool usePooling, MySqlConnectionStringBuilder connectionStringBuilder)
+	public PlainConnectionCreator(bool usePooling, string? applicationName, MySqlConnectionStringBuilder connectionStringBuilder)
 	{
 		connectionStringBuilder.Pooling = usePooling;
+		connectionStringBuilder.ApplicationName = applicationName;
 		m_connectionString = connectionStringBuilder.ConnectionString;
 		PoolName = connectionStringBuilder.GetConnectionString(includePassword: false);
     }