sql version telemetry data from input bindings

src/SqlAsyncEnumerable.cs

@@ -7,13 +7,12 @@
 using System.Threading.Tasks;
 using Microsoft.Data.SqlClient;
 using Newtonsoft.Json;
-
 namespace Microsoft.Azure.WebJobs.Extensions.Sql
 {
     /// <typeparam name="T">A user-defined POCO that represents a row of the user's table</typeparam>
     internal class SqlAsyncEnumerable<T> : IAsyncEnumerable<T>
     {
-        private readonly SqlConnection _connection;
+        public SqlConnection Connection { get; private set; }
         private readonly SqlAttribute _attribute;
 
         /// <summary>
@@ -26,8 +25,9 @@ internal class SqlAsyncEnumerable<T> : IAsyncEnumerable<T>
         /// </exception>
         public SqlAsyncEnumerable(SqlConnection connection, SqlAttribute attribute)
         {
-            this._connection = connection ?? throw new ArgumentNullException(nameof(connection));
+            this.Connection = connection ?? throw new ArgumentNullException(nameof(connection));
             this._attribute = attribute ?? throw new ArgumentNullException(nameof(attribute));
+            this.Connection.Open();
         }
         /// <summary>
         /// Returns the enumerator associated with this enumerable. The enumerator will execute the query specified
@@ -38,7 +38,7 @@ public SqlAsyncEnumerable(SqlConnection connection, SqlAttribute attribute)
         /// <returns>The enumerator</returns>
         public IAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken cancellationToken = default)
         {
-            return new SqlAsyncEnumerator(this._connection, this._attribute);
+            return new SqlAsyncEnumerator(this.Connection, this._attribute);
         }
 
 
@@ -47,7 +47,6 @@ private class SqlAsyncEnumerator : IAsyncEnumerator<T>
             private readonly SqlConnection _connection;
             private readonly SqlAttribute _attribute;
             private SqlDataReader _reader;
-
             /// <summary>
             /// Initializes a new instance of the <see cref="SqlAsyncEnumerator<typeparamref name="T"/>"/> class.
             /// </summary>
@@ -77,7 +76,7 @@ public SqlAsyncEnumerator(SqlConnection connection, SqlAttribute attribute)
             public ValueTask DisposeAsync()
             {
                 // Doesn't seem like there's an async version of closing the reader/connection
-                this._reader.Close();
+                this._reader?.Close();
                 this._connection.Close();
                 return new ValueTask(Task.CompletedTask);
             }
@@ -101,23 +100,24 @@ public ValueTask<bool> MoveNextAsync()
             /// </returns>
             private async Task<bool> GetNextRowAsync()
             {
-                if (this._reader == null)
+                // check connection state before trying to access the reader
+                // if DisposeAsync has already closed it due to the issue described here https://github.com/Azure/azure-functions-sql-extension/issues/350
+                if (this._connection.State != System.Data.ConnectionState.Closed)
                 {
-                    using (SqlCommand command = SqlBindingUtilities.BuildCommand(this._attribute, this._connection))
+                    if (this._reader == null)
                     {
-                        await command.Connection.OpenAsync();
-                        this._reader = await command.ExecuteReaderAsync();
+                        using (SqlCommand command = SqlBindingUtilities.BuildCommand(this._attribute, this._connection))
+                        {
+                            this._reader = await command.ExecuteReaderAsync();
+                        }
+                    }
+                    if (await this._reader.ReadAsync())
+                    {
+                        this.Current = JsonConvert.DeserializeObject<T>(this.SerializeRow());
+                        return true;
                     }
                 }
-                if (await this._reader.ReadAsync())
-                {
-                    this.Current = JsonConvert.DeserializeObject<T>(this.SerializeRow());
-                    return true;
-                }
-                else
-                {
-                    return false;
-                }
+                return false;
             }
 
             /// <summary>

src/SqlConverters.cs

@@ -105,12 +105,11 @@ public SqlGenericsConverter(IConfiguration configuration, ILogger logger)
             /// <returns>An IEnumerable containing the rows read from the user's database in the form of the user-defined POCO</returns>
             public async Task<IEnumerable<T>> ConvertAsync(SqlAttribute attribute, CancellationToken cancellationToken)
             {
-                TelemetryInstance.TrackConvert(ConvertType.IEnumerable);
                 this._logger.LogDebugWithThreadId("BEGIN ConvertAsync (IEnumerable)");
                 var sw = Stopwatch.StartNew();
                 try
                 {
-                    string json = await this.BuildItemFromAttributeAsync(attribute);
+                    string json = await this.BuildItemFromAttributeAsync(attribute, ConvertType.IEnumerable);
                     IEnumerable<T> result = JsonConvert.DeserializeObject<IEnumerable<T>>(json);
                     this._logger.LogDebugWithThreadId($"END ConvertAsync (IEnumerable) Duration={sw.ElapsedMilliseconds}ms");
                     return result;
@@ -140,12 +139,11 @@ public async Task<IEnumerable<T>> ConvertAsync(SqlAttribute attribute, Cancellat
             /// </returns>
             async Task<string> IAsyncConverter<SqlAttribute, string>.ConvertAsync(SqlAttribute attribute, CancellationToken cancellationToken)
             {
-                TelemetryInstance.TrackConvert(ConvertType.Json);
                 this._logger.LogDebugWithThreadId("BEGIN ConvertAsync (Json)");
                 var sw = Stopwatch.StartNew();
                 try
                 {
-                    string result = await this.BuildItemFromAttributeAsync(attribute);
+                    string result = await this.BuildItemFromAttributeAsync(attribute, ConvertType.Json);
                     this._logger.LogDebugWithThreadId($"END ConvertAsync (Json) Duration={sw.ElapsedMilliseconds}ms");
                     return result;
                 }
@@ -167,8 +165,11 @@ async Task<string> IAsyncConverter<SqlAttribute, string>.ConvertAsync(SqlAttribu
             /// <param name="attribute">
             /// The binding attribute that contains the name of the connection string app setting and query.
             /// </param>
+            /// <param name="type">
+            /// The type of conversion being performed by the input binding.
+            /// </param>
             /// <returns></returns>
-            public virtual async Task<string> BuildItemFromAttributeAsync(SqlAttribute attribute)
+            public virtual async Task<string> BuildItemFromAttributeAsync(SqlAttribute attribute, ConvertType type)
             {
                 using (SqlConnection connection = SqlBindingUtilities.BuildConnection(attribute.ConnectionStringSetting, this._configuration))
                 // Ideally, we would like to move away from using SqlDataAdapter both here and in the
@@ -178,6 +179,8 @@ public virtual async Task<string> BuildItemFromAttributeAsync(SqlAttribute attri
                 {
                     adapter.SelectCommand = command;
                     await connection.OpenAsync();
+                    Dictionary<TelemetryPropertyName, string> props = connection.AsConnectionProps();
+                    TelemetryInstance.TrackConvert(type, props);
                     var dataTable = new DataTable();
                     adapter.Fill(dataTable);
                     this._logger.LogInformation($"{dataTable.Rows.Count} row(s) queried from database: {connection.Database} using Command: {command.CommandText}");
@@ -188,10 +191,12 @@ public virtual async Task<string> BuildItemFromAttributeAsync(SqlAttribute attri
 
             IAsyncEnumerable<T> IConverter<SqlAttribute, IAsyncEnumerable<T>>.Convert(SqlAttribute attribute)
             {
-                TelemetryInstance.TrackConvert(ConvertType.IAsyncEnumerable);
                 try
                 {
-                    return new SqlAsyncEnumerable<T>(SqlBindingUtilities.BuildConnection(attribute.ConnectionStringSetting, this._configuration), attribute);
+                    var asyncEnumerable = new SqlAsyncEnumerable<T>(SqlBindingUtilities.BuildConnection(attribute.ConnectionStringSetting, this._configuration), attribute);
+                    Dictionary<TelemetryPropertyName, string> props = asyncEnumerable.Connection.AsConnectionProps();
+                    TelemetryInstance.TrackConvert(ConvertType.IAsyncEnumerable, props);
+                    return asyncEnumerable;
                 }
                 catch (Exception ex)
                 {
@@ -214,10 +219,9 @@ IAsyncEnumerable<T> IConverter<SqlAttribute, IAsyncEnumerable<T>>.Convert(SqlAtt
             /// <returns>JArray containing the rows read from the user's database in the form of the user-defined POCO</returns>
             async Task<JArray> IAsyncConverter<SqlAttribute, JArray>.ConvertAsync(SqlAttribute attribute, CancellationToken cancellationToken)
             {
-                TelemetryInstance.TrackConvert(ConvertType.JArray);
                 try
                 {
-                    string json = await this.BuildItemFromAttributeAsync(attribute);
+                    string json = await this.BuildItemFromAttributeAsync(attribute, ConvertType.JArray);
                     return JArray.Parse(json);
                 }
                 catch (Exception ex)

test/Unit/SqlInputBindingTests.cs

@@ -12,6 +12,7 @@
 using Moq;
 using Xunit;
 using Microsoft.Azure.WebJobs.Extensions.Sql.Tests.Common;
+using Microsoft.Azure.WebJobs.Extensions.Sql.Telemetry;
 
 namespace Microsoft.Azure.WebJobs.Extensions.Sql.Tests.Unit
 {
@@ -60,17 +61,18 @@ public void TestNullCommand()
         [Fact]
         public void TestNullArgumentsSqlAsyncEnumerableConstructor()
         {
-
             Assert.Throws<ArgumentNullException>(() => new SqlAsyncEnumerable<string>(connection, null));
             Assert.Throws<ArgumentNullException>(() => new SqlAsyncEnumerable<string>(null, new SqlAttribute("")));
         }
 
+        /// <summary>
+        /// SqlAsyncEnumerable should throw InvalidOperationExcepion when invoked with an invalid connection 
+        /// string setting and It should fail here since we're passing an empty connection string.
+        /// <summary>
         [Fact]
-        public void TestNullCurrentValueEnumerator()
+        public void TestInvalidOperationSqlAsyncEnumerableConstructor()
         {
-            var enumerable = new SqlAsyncEnumerable<string>(connection, new SqlAttribute(""));
-            IAsyncEnumerator<string> enumerator = enumerable.GetAsyncEnumerator();
-            Assert.Null(enumerator.Current);
+            Assert.Throws<InvalidOperationException>(() => new SqlAsyncEnumerable<string>(connection, new SqlAttribute("")));
         }
 
         [Fact]
@@ -230,7 +232,7 @@ public async void TestWellformedDeserialization()
             var converter = new Mock<SqlGenericsConverter<TestData>>(config.Object, logger.Object);
             string json = "[{ \"ID\":1,\"Name\":\"Broom\",\"Cost\":32.5,\"Timestamp\":\"2019-11-22T06:32:15\"},{ \"ID\":2,\"Name\":\"Brush\",\"Cost\":12.3," +
                 "\"Timestamp\":\"2017-01-27T03:13:11\"},{ \"ID\":3,\"Name\":\"Comb\",\"Cost\":100.12,\"Timestamp\":\"1997-05-03T10:11:56\"}]";
-            converter.Setup(_ => _.BuildItemFromAttributeAsync(arg)).ReturnsAsync(json);
+            converter.Setup(_ => _.BuildItemFromAttributeAsync(arg, ConvertType.IEnumerable)).ReturnsAsync(json);
             var list = new List<TestData>();
             var data1 = new TestData
             {
@@ -268,7 +270,7 @@ public async void TestMalformedDeserialization()
 
             // SQL data is missing a field
             string json = "[{ \"ID\":1,\"Name\":\"Broom\",\"Timestamp\":\"2019-11-22T06:32:15\"}]";
-            converter.Setup(_ => _.BuildItemFromAttributeAsync(arg)).ReturnsAsync(json);
+            converter.Setup(_ => _.BuildItemFromAttributeAsync(arg, ConvertType.IEnumerable)).ReturnsAsync(json);
             var list = new List<TestData>();
             var data = new TestData
             {
@@ -283,7 +285,7 @@ public async void TestMalformedDeserialization()
 
             // SQL data's columns are named differently than the POCO's fields
             json = "[{ \"ID\":1,\"Product Name\":\"Broom\",\"Price\":32.5,\"Timessstamp\":\"2019-11-22T06:32:15\"}]";
-            converter.Setup(_ => _.BuildItemFromAttributeAsync(arg)).ReturnsAsync(json);
+            converter.Setup(_ => _.BuildItemFromAttributeAsync(arg, ConvertType.IEnumerable)).ReturnsAsync(json);
             list = new List<TestData>();
             data = new TestData
             {
@@ -297,7 +299,7 @@ public async void TestMalformedDeserialization()
 
             // Confirm that the JSON fields are case-insensitive (technically malformed string, but still works)
             json = "[{ \"id\":1,\"nAme\":\"Broom\",\"coSt\":32.5,\"TimEStamp\":\"2019-11-22T06:32:15\"}]";
-            converter.Setup(_ => _.BuildItemFromAttributeAsync(arg)).ReturnsAsync(json);
+            converter.Setup(_ => _.BuildItemFromAttributeAsync(arg, ConvertType.IEnumerable)).ReturnsAsync(json);
             list = new List<TestData>();
             data = new TestData
             {