* Post-merge fixes.

Author: lukebakken

projects/Benchmarks/ConsumerDispatching/ConsumerDispatcher.cs

@@ -55,8 +55,8 @@ public async Task AsyncConsumerDispatcher()
             {
                 for (int i = 0; i < Count; i++)
                 {
-                    await _dispatcher.HandleBasicDeliverAsync(_consumerTag, _deliveryTag, false, _exchange, _routingKey, _properties, body,
-                        CancellationToken.None);
+                    await _dispatcher.HandleBasicDeliverAsync(_consumerTagBytes, _deliveryTag,
+                        false, _exchange, _routingKey, _properties, body, CancellationToken.None);
                 }
                 _autoResetEvent.Wait();
                 _autoResetEvent.Reset();
@@ -78,8 +78,8 @@ public async Task ConsumerDispatcher()
             {
                 for (int i = 0; i < Count; i++)
                 {
-                    await _dispatcher.HandleBasicDeliverAsync(_consumerTag, _deliveryTag, false, _exchange, _routingKey, _properties, body,
-                        CancellationToken.None);
+                    await _dispatcher.HandleBasicDeliverAsync(_consumerTagBytes, _deliveryTag,
+                        false, _exchange, _routingKey, _properties, body, CancellationToken.None);
                 }
                 _autoResetEvent.Wait();
                 _autoResetEvent.Reset();

projects/RabbitMQ.Client/client/impl/ChannelBase.cs

@@ -670,7 +670,7 @@ protected async Task<bool> HandleBasicDeliverAsync(IncomingCommand cmd, Cancella
         {
             try
             {
-                var method = new Client.Framing.Impl.BasicDeliver(cmd.MethodSpan);
+                var method = new Client.Framing.Impl.BasicDeliver(cmd.MethodMemory);
                 var header = new ReadOnlyBasicProperties(cmd.HeaderSpan);
                 await ConsumerDispatcher.HandleBasicDeliverAsync(
                         method._consumerTag,

projects/RabbitMQ.Client/client/impl/IncomingCommand.cs

@@ -55,6 +55,14 @@ public IncomingCommand(ProtocolCommandId commandId,
             Body = body;
         }
 
+        public ReadOnlyMemory<byte> MethodMemory
+        {
+            get
+            {
+                return Method.Memory;
+            }
+        }
+
         public ReadOnlySpan<byte> MethodSpan
         {
             get

projects/RabbitMQ.Client/client/impl/RabbitMQActivitySource.cs

@@ -117,18 +117,25 @@ internal static Activity Deliver(BasicDeliverEventArgs deliverEventArgs)
                 return null;
             }
 
+            // TODO
+            string routingKey = Encoding.UTF8.GetString(deliverEventArgs.RoutingKey.ToArray());
+            string exchange = Encoding.UTF8.GetString(deliverEventArgs.Exchange.ToArray());
+
             // Extract the PropagationContext of the upstream parent from the message headers.
             DistributedContextPropagator.Current.ExtractTraceIdAndState(deliverEventArgs.BasicProperties.Headers,
                 ExtractTraceIdAndState, out string traceparent, out string traceState);
+
             ActivityContext.TryParse(traceparent, traceState, out ActivityContext parentContext);
+
             Activity activity = s_subscriberSource.StartLinkedRabbitMQActivity(
-                UseRoutingKeyAsOperationName ? $"{deliverEventArgs.RoutingKey} deliver" : "deliver",
+                UseRoutingKeyAsOperationName ? $"{routingKey} deliver" : "deliver",
                 ActivityKind.Consumer, parentContext);
+
             if (activity != null && activity.IsAllDataRequested)
             {
                 PopulateMessagingTags("deliver",
-                    deliverEventArgs.RoutingKey,
-                    deliverEventArgs.Exchange,
+                    routingKey,
+                    exchange,
                     deliverEventArgs.DeliveryTag,
                     deliverEventArgs.BasicProperties,
                     deliverEventArgs.Body.Length,

projects/Test/Common/TestConnectionRecoveryBase.cs

@@ -318,8 +318,8 @@ public TestBasicConsumer(IChannel channel, ushort totalMessageCount, TaskComplet
             public override Task HandleBasicDeliverAsync(string consumerTag,
                 ulong deliveryTag,
                 bool redelivered,
-                string exchange,
-                string routingKey,
+                ReadOnlyMemory<byte> exchange,
+                ReadOnlyMemory<byte> routingKey,
                 ReadOnlyBasicProperties properties,
                 ReadOnlyMemory<byte> body)
             {