[EventHubs] Track Two: Second Preview (Diagnostics Tests)

sdk/eventhub/Azure.Messaging.EventHubs/samples/Sample7_ConsumeEvents.cs

@@ -103,7 +103,7 @@ public async Task RunAsync(string connectionString,
                     // time that we've allowed.
                     //
                     // We will ask for just our event, but allow a fairly long wait period to ensure that we're able to receive it.
-                    // If you observe the time that the call takes, it is extremely likely that the request to recieve will complete
+                    // If you observe the time that the call takes, it is extremely likely that the request to receive will complete
                     // long before the maximum wait time.
 
                     Stopwatch watch = Stopwatch.StartNew();

sdk/eventhub/Azure.Messaging.EventHubs/src/Compatibility/TrackOneExceptionExtensions.cs

@@ -13,7 +13,7 @@ namespace Azure.Messaging.EventHubs.Compatibility
     internal static class TrackOneExceptionExtensions
     {
         /// <summary>
-        ///   Maps a <see cref="TrackOne.EventHubsException" /> or a child of it to the equivilent
+        ///   Maps a <see cref="TrackOne.EventHubsException" /> or a child of it to the equivalent
         ///   exception for the new API surface.
         /// </summary>
         ///

sdk/eventhub/Azure.Messaging.EventHubs/src/Diagnostics/EventDataDiagnosticsExtensions.cs

@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System.Diagnostics;
+
+namespace Azure.Messaging.EventHubs.Diagnostics
+{
+    /// <summary>
+    ///   Diagnostic extension methods for <see cref="EventData"/>.
+    /// </summary>
+    ///
+    internal static class EventDataDiagnosticsExtensions
+    {
+        /// <summary>
+        ///   Creates <see cref="Activity"/> based on the tracing context stored in the <see cref="EventData"/>.
+        /// </summary>
+        ///
+        /// <param name="eventData">The event received from EventHub.</param>
+        /// <param name="activityName">Optional Activity name.</param>
+        ///
+        /// <returns>New <see cref="Activity"/> with tracing context.</returns>
+        ///
+        public static Activity ExtractActivity(this EventData eventData, string activityName = null)
+        {
+            static TrackOne.EventData TransformEvent(EventData eventData) =>
+                new TrackOne.EventData(eventData.Body.ToArray())
+                {
+                    Properties = eventData.Properties
+                };
+
+            return TrackOne.EventDataDiagnosticExtensions.ExtractActivity(TransformEvent(eventData), activityName);
+        }
+    }
+}

sdk/eventhub/Azure.Messaging.EventHubs/src/ExponentialRetry.cs

@@ -94,7 +94,7 @@ internal override Retry Clone() =>
         /// <returns>The set of properties for the retry policy.</returns>
         ///
         /// <remarks>
-        ///   This method is intended to allow for compatibility shims to create the equivilent retry
+        ///   This method is intended to allow for compatibility shims to create the equivalent retry
         ///   policy within the track one code;  it will be removed after the first preview and should
         ///   not be depended upon outside of that context.
         /// </remarks>

sdk/eventhub/Azure.Messaging.EventHubs/src/Metadata/ConnectionStringProperties.cs

@@ -44,7 +44,7 @@ internal struct ConnectionStringProperties
         ///   Initializes a new instance of the <see cref="ConnectionStringProperties"/> struct.
         /// </summary>
         ///
-        /// <param name="endpoint">The endpoint of the EVent Hubs namespace.</param>
+        /// <param name="endpoint">The endpoint of the Event Hubs namespace.</param>
         /// <param name="eventHubPath">The path to the specific Event Hub under the namespace.</param>
         /// <param name="sharedAccessKeyName">The name of the shared access key, to use authorization.</param>
         /// <param name="sharedAccessKey">The shared access key to use for authorization.</param>

sdk/eventhub/Azure.Messaging.EventHubs/src/TrackOneClient/EventDataDiagnosticExtensions.cs

@@ -65,7 +65,7 @@ internal static class EventDataDiagnosticExtensions
         /// 
         /// </example>
 
-        public static Activity ExtractActivity(this EventData eventData, string activityName = null)
+        internal static Activity ExtractActivity(this EventData eventData, string activityName = null)
         {
             Guard.ArgumentNotNull(nameof(eventData), eventData);
 

sdk/eventhub/Azure.Messaging.EventHubs/src/TrackOneClient/EventDataSender.cs

@@ -26,9 +26,12 @@ protected EventDataSender(EventHubClient eventHubClient, string partitionId)
         public async Task SendAsync(IEnumerable<EventData> eventDatas, string partitionKey)
         {
             int count = ValidateEvents(eventDatas);
+            var diagnosticPartitionKey = String.IsNullOrEmpty(partitionKey) ?
+                this.PartitionId :
+                partitionKey;
 
             EventHubsEventSource.Log.EventSendStart(this.ClientId, count, partitionKey);
-            Activity activity = EventHubsDiagnosticSource.StartSendActivity(this.ClientId, this.EventHubClient.ConnectionStringBuilder, partitionKey, eventDatas, count);
+            Activity activity = EventHubsDiagnosticSource.StartSendActivity(this.ClientId, this.EventHubClient.ConnectionStringBuilder, diagnosticPartitionKey, eventDatas, count);
 
             Task sendTask = null;
             try
@@ -41,13 +44,13 @@ public async Task SendAsync(IEnumerable<EventData> eventDatas, string partitionK
             catch (Exception exception)
             {
                 EventHubsEventSource.Log.EventSendException(this.ClientId, exception.ToString());
-                EventHubsDiagnosticSource.FailSendActivity(activity, this.EventHubClient.ConnectionStringBuilder, partitionKey, eventDatas, exception);
+                EventHubsDiagnosticSource.FailSendActivity(activity, this.EventHubClient.ConnectionStringBuilder, diagnosticPartitionKey, eventDatas, exception);
                 throw;
             }
             finally
             {
                 EventHubsEventSource.Log.EventSendStop(this.ClientId);
-                EventHubsDiagnosticSource.StopSendActivity(activity, this.EventHubClient.ConnectionStringBuilder, partitionKey, eventDatas, sendTask);
+                EventHubsDiagnosticSource.StopSendActivity(activity, this.EventHubClient.ConnectionStringBuilder, diagnosticPartitionKey, eventDatas, sendTask);
             }
         }
 

sdk/eventhub/Azure.Messaging.EventHubs/src/TrackOneClient/EventHubsDiagnosticSource.cs

@@ -14,7 +14,7 @@ namespace TrackOne
     /// </summary>
     internal static class EventHubsDiagnosticSource
     {
-        public const string DiagnosticSourceName = "TrackOne";
+        public const string DiagnosticSourceName = "Azure.Messaging.EventHubs";
 
         public const string ActivityIdPropertyName = "Diagnostic-Id";
         public const string CorrelationContextPropertyName = "Correlation-Context";
@@ -64,7 +64,7 @@ internal static Activity StartSendActivity(string clientId, EventHubsConnectionS
                         csb.Endpoint,
                         Entity = csb.EntityPath,
                         PartitionKey = partitionKey,
-                        EventDatas = eventDatas
+                        EventDatas = eventDatas.Select(TransformEvent)
                     });
             }
             else
@@ -90,7 +90,7 @@ internal static void FailSendActivity(Activity activity, EventHubsConnectionStri
                     csb.Endpoint,
                     Entity = csb.EntityPath,
                     PartitionKey = partitionKey,
-                    EventDatas = eventDatas,
+                    EventDatas = eventDatas.Select(TransformEvent),
                     Exception = ex
                 });
         }
@@ -108,7 +108,7 @@ internal static void StopSendActivity(Activity activity, EventHubsConnectionStri
                     csb.Endpoint,
                     Entity = csb.EntityPath,
                     PartitionKey = partitionKey,
-                    EventDatas = eventDatas,
+                    EventDatas = eventDatas.Select(TransformEvent),
                     sendTask?.Status
                 });
         }
@@ -201,7 +201,7 @@ internal static void StopReceiveActivity(Activity activity, EventHubsConnectionS
                     Entity = csb.EntityPath,
                     PartitionKey = partitionKey,
                     ConsumerGroup = consumerGroup,
-                    EventDatas = events,
+                    EventDatas = events.Select(TransformEvent),
                     receiveTask?.Status
                 });
         }
@@ -262,5 +262,11 @@ private static void SetRelatedOperations(Activity activity, IEnumerable<EventDat
         }
 
         #endregion Diagnostic Context Injection
+
+        private static Azure.Messaging.EventHubs.EventData TransformEvent(EventData eventData) =>
+            new Azure.Messaging.EventHubs.EventData(eventData.Body.ToArray())
+            {
+                Properties = eventData.Properties
+            };
     }
 }

sdk/eventhub/Azure.Messaging.EventHubs/tests/Compatibility/TrackOneComparerTests.cs

@@ -142,7 +142,7 @@ public void IsEventPositionEquivalentDetectsDifferentOffsets()
             var trackOnePosition = TrackOne.EventPosition.FromOffset("12", false);
             var trackTwoPosition = EventPosition.FromOffset(12);
 
-            Assert.That(TrackOneComparer.IsEventPositionEquivalent(trackOnePosition, trackTwoPosition), Is.False, "The offset for track two is inclusive; even the same base offset with non-inclusive is not equivilent.");
+            Assert.That(TrackOneComparer.IsEventPositionEquivalent(trackOnePosition, trackTwoPosition), Is.False, "The offset for track two is inclusive; even the same base offset with non-inclusive is not equivalent.");
         }
 
         /// <summary>
@@ -156,7 +156,7 @@ public void IsEventPositionEquivalentRecognizesSameOffsets()
             var trackOnePosition = TrackOne.EventPosition.FromOffset("12", true);
             var trackTwoPosition = EventPosition.FromOffset(12);
 
-            Assert.That(TrackOneComparer.IsEventPositionEquivalent(trackOnePosition, trackTwoPosition), Is.True, "The offset for track two is inclusive; the equivilent offset set as inclusive should match.");
+            Assert.That(TrackOneComparer.IsEventPositionEquivalent(trackOnePosition, trackTwoPosition), Is.True, "The offset for track two is inclusive; the equivalent offset set as inclusive should match.");
         }
 
         /// <summary>

sdk/eventhub/Azure.Messaging.EventHubs/tests/Compatibility/TrackOneEventHubProducerTests.cs

@@ -98,8 +98,8 @@ public async Task SendAsyncTransformsSimpleEvents()
             var sentEvents = mock.SendCalledWithParameters.Events.ToArray();
             Assert.That(sentEvents.Length, Is.EqualTo(sourceEvents.Length), "The number of events sent should match the number of source events.");
 
-            // The events should not only be structurally equivilent, the ordering of them should be preserved.  Compare the
-            // sequence in order and validate that the events in each position are equivilent.
+            // The events should not only be structurally equivalent, the ordering of them should be preserved.  Compare the
+            // sequence in order and validate that the events in each position are equivalent.
 
             for (var index = 0; index < sentEvents.Length; ++index)
             {
@@ -138,8 +138,8 @@ public async Task SendAsyncTransformsComplexEvents()
             var sentEvents = mock.SendCalledWithParameters.Events.ToArray();
             Assert.That(sentEvents.Length, Is.EqualTo(sourceEvents.Length), "The number of events sent should match the number of source events.");
 
-            // The events should not only be structurally equivilent, the ordering of them should be preserved.  Compare the
-            // sequence in order and validate that the events in each position are equivilent.
+            // The events should not only be structurally equivalent, the ordering of them should be preserved.  Compare the
+            // sequence in order and validate that the events in each position are equivalent.
 
             for (var index = 0; index < sentEvents.Length; ++index)
             {

sdk/eventhub/Azure.Messaging.EventHubs/tests/Core/ExponentialRetryTests.cs

@@ -62,7 +62,7 @@ public void ConstructorValidatesArguments()
         ///
         [Test]
         [TestCaseSource(nameof(SameConfigurationCases))]
-        public void HaveSameConfigurationRecognizesEquivilentConfiguration(ExponentialRetry first,
+        public void HaveSameConfigurationRecognizesEquivalentConfiguration(ExponentialRetry first,
                                                                            ExponentialRetry second,
                                                                            string description)
         {