Add Activity for Commit and Rollback.

Signed-off-by: Bradley Grainger <[email protected]>

Author: bgrainger

src/MySqlConnector/Core/ServerSession.cs

@@ -335,14 +335,15 @@ public void FinishQuerying()
 
 	public void SetTimeout(int timeoutMilliseconds) => m_payloadHandler!.ByteHandler.RemainingTimeout = timeoutMilliseconds;
 
-	public Activity? StartActivity(string name, string tagName1, object tagValue1)
+	public Activity? StartActivity(string name, string? tagName1 = null, object? tagValue1 = null)
 	{
 		var activity = ActivitySourceHelper.StartActivity(name, m_activityTags);
 		if (activity is { IsAllDataRequested: true })
 		{
 			if (DatabaseOverride is not null)
 				activity.SetTag(ActivitySourceHelper.DatabaseNameTagName, DatabaseOverride);
-			activity.SetTag(tagName1, tagValue1);
+			if (tagName1 is not null)
+				activity.SetTag(tagName1, tagValue1);
 		}
 		return activity;
 	}

src/MySqlConnector/MySqlCommand.cs

@@ -131,6 +131,7 @@ public override void Prepare()
 	bool IMySqlCommand.AllowUserVariables => AllowUserVariables;
 
 	internal bool AllowUserVariables { get; set; }
+	internal bool NoActivity { get; set; }
 
 	private Task PrepareAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
 	{
@@ -316,7 +317,7 @@ internal Task<MySqlDataReader> ExecuteReaderNoResetTimeoutAsync(CommandBehavior
 		if (!IsValid(out var exception))
 			return Utility.TaskFromException<MySqlDataReader>(exception);
 
-		var activity = Connection!.Session.StartActivity(ActivitySourceHelper.ExecuteActivityName,
+		var activity = NoActivity ? null : Connection!.Session.StartActivity(ActivitySourceHelper.ExecuteActivityName,
 			ActivitySourceHelper.DatabaseStatementTagName, CommandText);
 		m_commandBehavior = behavior;
 		return CommandExecutor.ExecuteReaderAsync(new IMySqlCommand[] { this }, SingleCommandPayloadCreator.Instance, behavior, activity, ioBehavior, cancellationToken);

src/MySqlConnector/MySqlConnection.cs

@@ -148,7 +148,7 @@ private async ValueTask<MySqlTransaction> BeginTransactionAsync(IsolationLevel i
 			_ => throw new NotSupportedException("IsolationLevel.{0} is not supported.".FormatInvariant(isolationLevel))
 		};
 
-		using (var cmd = new MySqlCommand($"set session transaction isolation level {isolationLevelValue};", this))
+		using (var cmd = new MySqlCommand($"set session transaction isolation level {isolationLevelValue};", this) { NoActivity = true })
 		{
 			await cmd.ExecuteNonQueryAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
 

src/MySqlConnector/MySqlTransaction.cs

@@ -29,10 +29,20 @@ private async Task CommitAsync(IOBehavior ioBehavior, CancellationToken cancella
 	{
 		VerifyValid();
 
-		using (var cmd = new MySqlCommand("commit", Connection, this))
-			await cmd.ExecuteNonQueryAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
-		Connection!.CurrentTransaction = null;
-		Connection = null;
+		using var activity = Connection!.Session.StartActivity("Commit");
+		try
+		{
+			using (var cmd = new MySqlCommand("commit", Connection, this) { NoActivity = true })
+				await cmd.ExecuteNonQueryAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
+			Connection!.CurrentTransaction = null;
+			Connection = null;
+			activity.SetSuccess();
+		}
+		catch (Exception ex) when (activity is { IsAllDataRequested: true })
+		{
+			activity.SetException(ex);
+			throw;
+		}
 	}
 
 	/// <summary>
@@ -55,8 +65,7 @@ private async Task RollbackAsync(IOBehavior ioBehavior, CancellationToken cancel
 	{
 		VerifyValid();
 
-		using (var cmd = new MySqlCommand("rollback", Connection, this))
-			await cmd.ExecuteNonQueryAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
+		await DoRollback(ioBehavior, cancellationToken).ConfigureAwait(false);
 		Connection!.CurrentTransaction = null;
 		Connection = null;
 	}
@@ -146,7 +155,7 @@ private async Task ExecuteSavepointAsync(string command, string savepointName, I
 		if (savepointName.Length == 0)
 			throw new ArgumentException("savepointName must not be empty", nameof(savepointName));
 
-		using var cmd = new MySqlCommand(command + "savepoint " + QuoteIdentifier(savepointName), Connection, this);
+		using var cmd = new MySqlCommand(command + "savepoint " + QuoteIdentifier(savepointName), Connection, this) { NoActivity = true };
 		await cmd.ExecuteNonQueryAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
 	}
 
@@ -224,8 +233,7 @@ private async Task DoDisposeAsync(IOBehavior ioBehavior, CancellationToken cance
 			{
 				try
 				{
-					using var cmd = new MySqlCommand("rollback", Connection, this);
-					await cmd.ExecuteNonQueryAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
+					await DoRollback(ioBehavior, cancellationToken).ConfigureAwait(false);
 				}
 				catch (IOException)
 				{
@@ -245,6 +253,22 @@ internal MySqlTransaction(MySqlConnection connection, IsolationLevel isolationLe
 		IsolationLevel = isolationLevel;
 	}
 
+	private async Task DoRollback(IOBehavior ioBehavior, CancellationToken cancellationToken)
+	{
+		using var activity = Connection!.Session.StartActivity("Rollback");
+		try
+		{
+			using var cmd = new MySqlCommand("rollback", Connection, this) { NoActivity = true };
+			await cmd.ExecuteNonQueryAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
+			activity.SetSuccess();
+		}
+		catch (Exception ex) when(activity is { IsAllDataRequested: true })
+		{
+			activity.SetException(ex);
+			throw;
+		}
+	}
+
 	private void VerifyValid()
 	{
 		if (m_isDisposed)