Fix SmtpClient.Dispose() when telemetry is configured

Also discovered some issues in CreateMetrics() methods in Telemetry class. Fixes issue #1816
jstedfast · Sep 18, 2024 · 0fb7ad9 · 0fb7ad9
1 parent 00a6dc2
commit 0fb7ad9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/MailKit/Net/Smtp/SmtpClient.cs b/MailKit/Net/Smtp/SmtpClient.cs
@@ -1775,7 +1775,9 @@ public override void NoOp (CancellationToken cancellationToken = default)
 
 		void Disconnect (string host, int port, SecureSocketOptions options, bool requested)
 		{
-			RecordClientDisconnected (null);
+			// Note: if the uri is null, then the user manually disconnected already.
+			if (uri != null)
+				RecordClientDisconnected (null);
 
 			capabilities = SmtpCapabilities.None;
 			authenticated = false;

diff --git a/MailKit/Telemetry.cs b/MailKit/Telemetry.cs
@@ -151,7 +151,7 @@ public static class SmtpClient
 
 			internal static ClientMetrics CreateMetrics (Meter meter)
 			{
-				return new ClientMetrics (Meter, MeterName, "an", "SMTP");
+				return new ClientMetrics (meter, MeterName, "an", "SMTP");
 			}
 
 			/// <summary>
@@ -236,7 +236,7 @@ public static class Pop3Client
 
 			internal static ClientMetrics CreateMetrics (Meter meter)
 			{
-				return new ClientMetrics (Meter, MeterName, "a", "POP3");
+				return new ClientMetrics (meter, MeterName, "a", "POP3");
 			}
 
 			/// <summary>
@@ -321,7 +321,7 @@ public static class ImapClient
 
 			internal static ClientMetrics CreateMetrics (Meter meter)
 			{
-				return new ClientMetrics (Meter, MeterName, "an", "IMAP");
+				return new ClientMetrics (meter, MeterName, "an", "IMAP");
 			}
 
 			/// <summary>