Skip to content

Commit 003934c

Browse files
committed
Delete SessionConnectionString property.
This was a result of a bad merge. Signed-off-by: Bradley Grainger <[email protected]>
1 parent c354752 commit 003934c

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/MySqlConnector/Core/ServerSession.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public ServerSession(ILogger logger, IConnectionPoolMetadata pool)
4949
public bool SupportsPerQueryVariables => ServerVersion.IsMariaDb && ServerVersion.Version >= ServerVersions.MariaDbSupportsPerQueryVariables;
5050
public int ActiveCommandId { get; private set; }
5151
public int CancellationTimeout { get; private set; }
52-
public string? ConnectionString { get; private set; }
5352
public int ConnectionId { get; set; }
5453
public byte[]? AuthPluginData { get; set; }
5554
public long CreatedTimestamp { get; }
@@ -402,16 +401,16 @@ public async Task DisposeAsync(IOBehavior ioBehavior, CancellationToken cancella
402401

403402
// set activity tags
404403
{
405-
ConnectionString = cs.ConnectionStringBuilder.GetConnectionString(cs.ConnectionStringBuilder.PersistSecurityInfo);
404+
var connectionString = cs.ConnectionStringBuilder.GetConnectionString(cs.ConnectionStringBuilder.PersistSecurityInfo);
406405
m_activityTags.Add(ActivitySourceHelper.DatabaseSystemTagName, ActivitySourceHelper.DatabaseSystemValue);
407-
m_activityTags.Add(ActivitySourceHelper.DatabaseConnectionStringTagName, ConnectionString);
406+
m_activityTags.Add(ActivitySourceHelper.DatabaseConnectionStringTagName, connectionString);
408407
m_activityTags.Add(ActivitySourceHelper.DatabaseUserTagName, cs.UserID);
409408
if (cs.Database.Length != 0)
410409
m_activityTags.Add(ActivitySourceHelper.DatabaseNameTagName, cs.Database);
411410
if (activity is { IsAllDataRequested: true })
412411
{
413412
activity.SetTag(ActivitySourceHelper.DatabaseSystemTagName, ActivitySourceHelper.DatabaseSystemValue)
414-
.SetTag(ActivitySourceHelper.DatabaseConnectionStringTagName, ConnectionString)
413+
.SetTag(ActivitySourceHelper.DatabaseConnectionStringTagName, connectionString)
415414
.SetTag(ActivitySourceHelper.DatabaseUserTagName, cs.UserID);
416415
if (cs.Database.Length != 0)
417416
activity.SetTag(ActivitySourceHelper.DatabaseNameTagName, cs.Database);

src/MySqlConnector/MySqlConnection.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -629,8 +629,6 @@ public override string ConnectionString
629629
}
630630
}
631631

632-
public string? SessionConnectionString => m_session?.ConnectionString;
633-
634632
public override string Database => m_session?.DatabaseOverride ?? GetConnectionSettings().Database;
635633

636634
public override ConnectionState State => m_connectionState;

0 commit comments

Comments
 (0)