Clear activity tags when retrying TLS. Fixes #1405

bgrainger · bgrainger · commit e39d3b894c40 · 2023-12-01T15:35:41.000-08:00
diff --git a/src/MySqlConnector/Core/ServerSession.cs b/src/MySqlConnector/Core/ServerSession.cs
@@ -561,6 +561,14 @@ public async Task DisposeAsync(IOBehavior ioBehavior, CancellationToken cancella
 				{
 					shouldRetrySsl = false;
 				}
+
+				if (shouldRetrySsl)
+				{
+					// avoid "The collection already contains item with same key 'net.transport'" exception when retrying SSL
+					m_activityTags.Remove(ActivitySourceHelper.NetTransportTagName);
+					m_activityTags.Remove(ActivitySourceHelper.NetPeerNameTagName);
+					m_activityTags.Remove(ActivitySourceHelper.NetPeerPortTagName);
+				}
 			} while (shouldRetrySsl);
 
 			if (m_supportsConnectionAttributes && cs.ConnectionAttributes is null)

Original file line number	Diff line number	Diff line change
`@@ -561,6 +561,14 @@ public async Task DisposeAsync(IOBehavior ioBehavior, CancellationToken cancella`
`561`	`561`	`{`
`562`	`562`	`shouldRetrySsl = false;`
`563`	`563`	`}`
	`564`	`+`
	`565`	`+ if (shouldRetrySsl)`
	`566`	`+ {`
	`567`	`+ // avoid "The collection already contains item with same key 'net.transport'" exception when retrying SSL`
	`568`	`+ m_activityTags.Remove(ActivitySourceHelper.NetTransportTagName);`
	`569`	`+ m_activityTags.Remove(ActivitySourceHelper.NetPeerNameTagName);`
	`570`	`+ m_activityTags.Remove(ActivitySourceHelper.NetPeerPortTagName);`
	`571`	`+ }`
`564`	`572`	`} while (shouldRetrySsl);`
`565`	`573`
`566`	`574`	`if (m_supportsConnectionAttributes && cs.ConnectionAttributes is null)`