Merge master into net7.

Author: bgrainger

src/MySqlConnector/MySqlDataReader.cs

@@ -474,8 +474,14 @@ internal static async Task<MySqlDataReader> CreateAsync(CommandListPosition comm
 				await dataReader.NextResultAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
 			}
 		}
-		catch (Exception)
+		catch (Exception ex)
 		{
+			if (activity is { IsAllDataRequested: true })
+			{
+				activity.SetException(ex);
+				activity.Stop();
+			}
+			dataReader.m_creationFailed = true;
 			dataReader.Dispose();
 			throw;
 		}
@@ -617,7 +623,8 @@ internal async Task DisposeAsync(IOBehavior ioBehavior, CancellationToken cancel
 			Command.CancellableCommand.SetTimeout(Constants.InfiniteTimeout);
 			connection.FinishQuerying(m_hasWarnings);
 
-			Activity?.SetSuccess();
+			if (!m_creationFailed)
+				Activity?.SetSuccess();
 			Activity?.Stop();
 
 			if ((m_behavior & CommandBehavior.CloseConnection) != 0)
@@ -677,7 +684,8 @@ private ResultSet GetResultSet()
 	private CommandListPosition m_commandListPosition;
 	private bool m_closed;
 	private bool m_hasWarnings;
-	private ResultSet? m_resultSet;
 	private bool m_hasMoreResults;
+	private bool m_creationFailed;
+	private ResultSet? m_resultSet;
 	private DataTable? m_schemaTable;
 }

src/MySqlConnector/Utilities/ActivitySourceHelper.cs

@@ -36,12 +36,22 @@ internal static class ActivitySourceHelper
 		return activity;
 	}
 
-	public static void SetSuccess(this Activity activity) => activity.SetTag(StatusCodeTagName, "OK");
+	public static void SetSuccess(this Activity activity)
+	{
+#if NET6_0_OR_GREATER
+		activity.SetStatus(ActivityStatusCode.Ok);
+#endif
+		activity.SetTag(StatusCodeTagName, "OK");
+	}
 
 	public static void SetException(this Activity activity, Exception exception)
 	{
+		var description = exception is MySqlException mySqlException ? mySqlException.ErrorCode.ToString() : exception.Message;
+#if NET6_0_OR_GREATER
+		activity.SetStatus(ActivityStatusCode.Error, description);
+#endif
 		activity.SetTag(StatusCodeTagName, "ERROR");
-		activity.SetTag("otel.status_description", exception is MySqlException mySqlException ? mySqlException.ErrorCode.ToString() : exception.Message);
+		activity.SetTag("otel.status_description", description);
 		activity.AddEvent(new ActivityEvent("exception", tags: new ActivityTagsCollection
 		{
 			{ "exception.type", exception.GetType().FullName },