From 7fbf52a086c4e728503baf61d0bf312b4a3e635a Mon Sep 17 00:00:00 2001
From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
Date: Wed, 25 Jan 2023 15:37:28 -0800
Subject: [PATCH 01/14] Support serializing received message to/from AMQP bytes

---
 NuGet.Config                                  |   1 +
 eng/Packages.Data.props                       |   4 +-
 .../src/TestEnvironment.cs                    |   2 +-
 ...ure.Messaging.ServiceBus.netstandard2.0.cs |   8 ++
 .../src/Amqp/AmqpMessageConverter.cs          | 127 +++++++++++-------
 .../src/Amqp/AmqpMessageExtensions.cs         |  12 +-
 .../src/Amqp/AmqpReceiver.cs                  |   6 +-
 .../Compatibility/ServiceBusAmqpExtensions.cs |  42 ++++++
 .../src/Primitives/ServiceBusModelFactory.cs  |   2 +-
 .../tests/Amqp/AmqpConverterTests.cs          |  14 +-
 .../tests/Message/MessageLiveTests.cs         |  85 ++++++++++++
 .../ServiceBusExtensionConfigProvider.cs      |  19 +++
 ...Azure.WebJobs.Extensions.ServiceBus.csproj |   4 +
 .../tests/MessageInteropTests.cs              |  51 +++++++
 14 files changed, 306 insertions(+), 71 deletions(-)
 create mode 100644 sdk/servicebus/Azure.Messaging.ServiceBus/src/Compatibility/ServiceBusAmqpExtensions.cs

diff --git a/NuGet.Config b/NuGet.Config
index be103949f661d..28e636a99c344 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -5,6 +5,7 @@
     <!-- Do not add any additional feeds if new packages are needed they need to come from nuget.org or our azure-sdk-for-net DevOps feed -->
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="azure-sdk-for-net" value="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json" />
+    <add key="azure_app_service_staging" value="https://www.myget.org/F/azure-appservice-staging/api/v2" />
 
     <!-- 
       Used for azure-sdk-tools repo until issue https://github.com/Azure/azure-sdk-tools/issues/1329 is addressed
diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
index 4740f00ed7968..1036db2de14fb 100644
--- a/eng/Packages.Data.props
+++ b/eng/Packages.Data.props
@@ -134,8 +134,8 @@
     <PackageReference Update="Microsoft.Azure.SignalR.Management" Version="1.18.0" />
     <PackageReference Update="Microsoft.Azure.SignalR.Protocols" Version="1.18.0" />
     <PackageReference Update="Microsoft.Azure.SignalR.Serverless.Protocols" Version="1.9.0" />
-    <PackageReference Update="Microsoft.Azure.WebJobs" Version="3.0.33" />
-    <PackageReference Update="Microsoft.Azure.WebJobs.Sources" Version="3.0.30" />
+    <PackageReference Update="Microsoft.Azure.WebJobs" Version="3.0.35" />
+    <PackageReference Update="Microsoft.Azure.WebJobs.Sources" Version="3.0.35" />
     <PackageReference Update="Microsoft.Spatial" Version="7.5.3" />
     <PackageReference Update="Newtonsoft.Json" Version="10.0.3" />
   </ItemGroup>
diff --git a/sdk/core/Azure.Core.TestFramework/src/TestEnvironment.cs b/sdk/core/Azure.Core.TestFramework/src/TestEnvironment.cs
index 20a9ab316c30c..c59cfde9f5952 100644
--- a/sdk/core/Azure.Core.TestFramework/src/TestEnvironment.cs
+++ b/sdk/core/Azure.Core.TestFramework/src/TestEnvironment.cs
@@ -309,7 +309,7 @@ private async Task ExtendResourceGroupExpirationAsync()
             string clientSecret = GetOptionalVariable("CLIENT_SECRET");
             string authorityHost = GetOptionalVariable("AZURE_AUTHORITY_HOST");
 
-            if (tenantId == null || clientId == null || clientSecret == null || authorityHost == null)
+            if (tenantId == null || clientId == null || clientSecret == null || authorityHost == null || ResourceManagerUrl == null)
             {
                 return;
             }
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/api/Azure.Messaging.ServiceBus.netstandard2.0.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/api/Azure.Messaging.ServiceBus.netstandard2.0.cs
index 6376077d1b36d..394a023a2ddfd 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/api/Azure.Messaging.ServiceBus.netstandard2.0.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/api/Azure.Messaging.ServiceBus.netstandard2.0.cs
@@ -1005,6 +1005,14 @@ public TrueRuleFilter() : base (default(string)) { }
         public override string ToString() { throw null; }
     }
 }
+namespace Azure.Messaging.ServiceBus.Primitives
+{
+    public static partial class ServiceBusAmqpExtensions
+    {
+        public static Azure.Messaging.ServiceBus.ServiceBusReceivedMessage FromAmqpBytes(System.BinaryData messageBytes, System.BinaryData lockTokenBytes) { throw null; }
+        public static System.BinaryData ToAmqpBytes(this Azure.Messaging.ServiceBus.ServiceBusReceivedMessage message) { throw null; }
+    }
+}
 namespace Microsoft.Extensions.Azure
 {
     public static partial class ServiceBusClientBuilderExtensions
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs
index a1ffa09fa4073..3dd1306243f47 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs
@@ -171,26 +171,30 @@ private static ArraySegment<byte> ReadStreamToArraySegment(Stream stream)
             }
         }
 
-        public virtual AmqpMessage SBMessageToAmqpMessage(ServiceBusMessage sbMessage)
+        public virtual AmqpMessage SBMessageToAmqpMessage(ServiceBusMessage sbMessage) => AmqpAnnotatedMessageToAmqpMessage(sbMessage.AmqpMessage);
+
+        public virtual AmqpMessage AmqpAnnotatedMessageToAmqpMessage(AmqpAnnotatedMessage annotatedMessage)
         {
+            Argument.AssertNotNull(annotatedMessage, nameof(annotatedMessage));
+
             // body
-            var amqpMessage = sbMessage.ToAmqpMessage();
+            AmqpMessage amqpMessage = annotatedMessage.ToAmqpMessage();
 
             // properties
-            amqpMessage.Properties.MessageId = sbMessage.MessageId;
-            amqpMessage.Properties.CorrelationId = sbMessage.CorrelationId;
-            amqpMessage.Properties.ContentType = sbMessage.ContentType;
-            amqpMessage.Properties.ContentEncoding = sbMessage.AmqpMessage.Properties.ContentEncoding;
-            amqpMessage.Properties.Subject = sbMessage.Subject;
-            amqpMessage.Properties.To = sbMessage.To;
-            amqpMessage.Properties.ReplyTo = sbMessage.ReplyTo;
-            amqpMessage.Properties.GroupId = sbMessage.SessionId;
-            amqpMessage.Properties.ReplyToGroupId = sbMessage.ReplyToSessionId;
-            amqpMessage.Properties.GroupSequence = sbMessage.AmqpMessage.Properties.GroupSequence;
-
-            if (sbMessage.AmqpMessage.Properties.UserId.HasValue)
-            {
-                ReadOnlyMemory<byte> userId = sbMessage.AmqpMessage.Properties.UserId.Value;
+            amqpMessage.Properties.MessageId = annotatedMessage.Properties.MessageId?.ToString();
+            amqpMessage.Properties.CorrelationId = annotatedMessage.Properties.CorrelationId?.ToString();
+            amqpMessage.Properties.ContentType = annotatedMessage.Properties.ContentType;
+            amqpMessage.Properties.ContentEncoding = annotatedMessage.Properties.ContentEncoding;
+            amqpMessage.Properties.Subject = annotatedMessage.Properties.Subject;
+            amqpMessage.Properties.To = annotatedMessage.Properties.To?.ToString();
+            amqpMessage.Properties.ReplyTo = annotatedMessage.Properties.ReplyTo?.ToString();
+            amqpMessage.Properties.GroupId = annotatedMessage.Properties.GroupId;
+            amqpMessage.Properties.ReplyToGroupId = annotatedMessage.Properties.ReplyToGroupId;
+            amqpMessage.Properties.GroupSequence = annotatedMessage.Properties.GroupSequence;
+
+            if (annotatedMessage.Properties.UserId.HasValue)
+            {
+                ReadOnlyMemory<byte> userId = annotatedMessage.Properties.UserId.Value;
                 if (MemoryMarshal.TryGetArray(userId, out ArraySegment<byte> segment))
                 {
                     amqpMessage.Properties.UserId = segment;
@@ -202,14 +206,15 @@ public virtual AmqpMessage SBMessageToAmqpMessage(ServiceBusMessage sbMessage)
             }
 
             // If TTL is set, it is used to calculate AbsoluteExpiryTime and CreationTime
-            if (sbMessage.TimeToLive != TimeSpan.MaxValue)
+            TimeSpan ttl = annotatedMessage.GetTimeToLive();
+            if (ttl != TimeSpan.MaxValue)
             {
-                amqpMessage.Header.Ttl = (uint)sbMessage.TimeToLive.TotalMilliseconds;
+                amqpMessage.Header.Ttl = (uint)ttl.TotalMilliseconds;
                 amqpMessage.Properties.CreationTime = DateTime.UtcNow;
 
-                if (AmqpConstants.MaxAbsoluteExpiryTime - amqpMessage.Properties.CreationTime.Value > sbMessage.TimeToLive)
+                if (AmqpConstants.MaxAbsoluteExpiryTime - amqpMessage.Properties.CreationTime.Value > ttl)
                 {
-                    amqpMessage.Properties.AbsoluteExpiryTime = amqpMessage.Properties.CreationTime.Value + sbMessage.TimeToLive;
+                    amqpMessage.Properties.AbsoluteExpiryTime = amqpMessage.Properties.CreationTime.Value + ttl;
                 }
                 else
                 {
@@ -218,38 +223,41 @@ public virtual AmqpMessage SBMessageToAmqpMessage(ServiceBusMessage sbMessage)
             }
             else
             {
-                if (sbMessage.AmqpMessage.Properties.CreationTime.HasValue)
+                if (annotatedMessage.Properties.CreationTime.HasValue)
                 {
-                    amqpMessage.Properties.CreationTime = sbMessage.AmqpMessage.Properties.CreationTime.Value.UtcDateTime;
+                    amqpMessage.Properties.CreationTime = annotatedMessage.Properties.CreationTime.Value.UtcDateTime;
                 }
-                if (sbMessage.AmqpMessage.Properties.AbsoluteExpiryTime.HasValue)
+                if (annotatedMessage.Properties.AbsoluteExpiryTime.HasValue)
                 {
-                    amqpMessage.Properties.AbsoluteExpiryTime = sbMessage.AmqpMessage.Properties.AbsoluteExpiryTime.Value.UtcDateTime;
+                    amqpMessage.Properties.AbsoluteExpiryTime = annotatedMessage.Properties.AbsoluteExpiryTime.Value.UtcDateTime;
                 }
             }
 
             // message annotations
 
-            foreach (KeyValuePair<string, object> kvp in sbMessage.AmqpMessage.MessageAnnotations)
+            foreach (KeyValuePair<string, object> kvp in annotatedMessage.MessageAnnotations)
             {
                 switch (kvp.Key)
                 {
                     case AmqpMessageConstants.ScheduledEnqueueTimeUtcName:
-                        if ((sbMessage.ScheduledEnqueueTime != null) && sbMessage.ScheduledEnqueueTime > DateTimeOffset.MinValue)
+                        DateTimeOffset scheduledEnqueueTime = annotatedMessage.GetScheduledEnqueueTime();
+                        if (scheduledEnqueueTime != default && scheduledEnqueueTime > DateTimeOffset.MinValue)
                         {
-                            amqpMessage.MessageAnnotations.Map.Add(AmqpMessageConstants.ScheduledEnqueueTimeUtcName, sbMessage.ScheduledEnqueueTime.UtcDateTime);
+                            amqpMessage.MessageAnnotations.Map.Add(AmqpMessageConstants.ScheduledEnqueueTimeUtcName, scheduledEnqueueTime.UtcDateTime);
                         }
                         break;
                     case AmqpMessageConstants.PartitionKeyName:
-                        if (sbMessage.PartitionKey != null)
+                        string partitionKey = annotatedMessage.GetPartitionKey();
+                        if (partitionKey != null)
                         {
-                            amqpMessage.MessageAnnotations.Map.Add(AmqpMessageConstants.PartitionKeyName, sbMessage.PartitionKey);
+                            amqpMessage.MessageAnnotations.Map.Add(AmqpMessageConstants.PartitionKeyName, partitionKey);
                         }
                         break;
                     case AmqpMessageConstants.ViaPartitionKeyName:
-                        if (sbMessage.TransactionPartitionKey != null)
+                        string viaPartitionKey = annotatedMessage.GetViaPartitionKey();
+                        if (viaPartitionKey != null)
                         {
-                            amqpMessage.MessageAnnotations.Map.Add(AmqpMessageConstants.ViaPartitionKeyName, sbMessage.TransactionPartitionKey);
+                            amqpMessage.MessageAnnotations.Map.Add(AmqpMessageConstants.ViaPartitionKeyName, viaPartitionKey);
                         }
                         break;
                     default:
@@ -260,14 +268,14 @@ public virtual AmqpMessage SBMessageToAmqpMessage(ServiceBusMessage sbMessage)
 
             // application properties
 
-            if (sbMessage.ApplicationProperties != null && sbMessage.ApplicationProperties.Count > 0)
+            if (annotatedMessage.ApplicationProperties.Count > 0)
             {
                 if (amqpMessage.ApplicationProperties == null)
                 {
                     amqpMessage.ApplicationProperties = new ApplicationProperties();
                 }
 
-                foreach (KeyValuePair<string, object> pair in sbMessage.ApplicationProperties)
+                foreach (KeyValuePair<string, object> pair in annotatedMessage.ApplicationProperties)
                 {
                     if (TryGetAmqpObjectFromNetObject(pair.Value, MappingType.ApplicationProperty, out var amqpObject))
                     {
@@ -282,7 +290,7 @@ public virtual AmqpMessage SBMessageToAmqpMessage(ServiceBusMessage sbMessage)
 
             // delivery annotations
 
-            foreach (KeyValuePair<string, object> kvp in sbMessage.AmqpMessage.DeliveryAnnotations)
+            foreach (KeyValuePair<string, object> kvp in annotatedMessage.DeliveryAnnotations)
             {
                 if (TryGetAmqpObjectFromNetObject(kvp.Value, MappingType.ApplicationProperty, out var amqpObject))
                 {
@@ -292,26 +300,26 @@ public virtual AmqpMessage SBMessageToAmqpMessage(ServiceBusMessage sbMessage)
 
             // header - except for ttl which is set above with the properties
 
-            if (sbMessage.AmqpMessage.Header.DeliveryCount != null)
+            if (annotatedMessage.Header.DeliveryCount != null)
             {
-                amqpMessage.Header.DeliveryCount = sbMessage.AmqpMessage.Header.DeliveryCount;
+                amqpMessage.Header.DeliveryCount = annotatedMessage.Header.DeliveryCount;
             }
-            if (sbMessage.AmqpMessage.Header.Durable != null)
+            if (annotatedMessage.Header.Durable != null)
             {
-                amqpMessage.Header.Durable = sbMessage.AmqpMessage.Header.Durable;
+                amqpMessage.Header.Durable = annotatedMessage.Header.Durable;
             }
-            if (sbMessage.AmqpMessage.Header.FirstAcquirer != null)
+            if (annotatedMessage.Header.FirstAcquirer != null)
             {
-                amqpMessage.Header.FirstAcquirer = sbMessage.AmqpMessage.Header.FirstAcquirer;
+                amqpMessage.Header.FirstAcquirer = annotatedMessage.Header.FirstAcquirer;
             }
-            if (sbMessage.AmqpMessage.Header.Priority != null)
+            if (annotatedMessage.Header.Priority != null)
             {
-                amqpMessage.Header.Priority = sbMessage.AmqpMessage.Header.Priority;
+                amqpMessage.Header.Priority = annotatedMessage.Header.Priority;
             }
 
             // footer
 
-            foreach (KeyValuePair<string, object> kvp in sbMessage.AmqpMessage.Footer)
+            foreach (KeyValuePair<string, object> kvp in annotatedMessage.Footer)
             {
                 amqpMessage.Footer.Map.Add(kvp.Key, kvp.Value);
             }
@@ -319,11 +327,10 @@ public virtual AmqpMessage SBMessageToAmqpMessage(ServiceBusMessage sbMessage)
             return amqpMessage;
         }
 
-        public virtual ServiceBusReceivedMessage AmqpMessageToSBMessage(AmqpMessage amqpMessage, bool isPeeked = false)
+        private static AmqpAnnotatedMessage AmqpMessageToAnnotatedMessage(AmqpMessage amqpMessage, bool isPeeked)
         {
             Argument.AssertNotNull(amqpMessage, nameof(amqpMessage));
             AmqpAnnotatedMessage annotatedMessage;
-
             // body
 
             if ((amqpMessage.BodyType & SectionFlag.Data) != 0 && amqpMessage.DataBody != null)
@@ -351,7 +358,6 @@ public virtual ServiceBusReceivedMessage AmqpMessageToSBMessage(AmqpMessage amqp
             {
                 annotatedMessage = new AmqpAnnotatedMessage(new AmqpMessageBody(Enumerable.Empty<ReadOnlyMemory<byte>>()));
             }
-            ServiceBusReceivedMessage sbMessage = new ServiceBusReceivedMessage(annotatedMessage);
 
             SectionFlag sections = amqpMessage.Sections;
 
@@ -540,22 +546,39 @@ public virtual ServiceBusReceivedMessage AmqpMessageToSBMessage(AmqpMessage amqp
                 }
             }
 
+            return annotatedMessage;
+        }
+
+        public virtual ServiceBusReceivedMessage AmqpMessageToSBReceivedMessage(AmqpMessage amqpMessage, bool isPeeked = false)
+        {
+            AmqpAnnotatedMessage annotatedMessage = AmqpMessageToAnnotatedMessage(amqpMessage, isPeeked);
+
+            ServiceBusReceivedMessage sbMessage = new ServiceBusReceivedMessage(annotatedMessage);
+
             // lock token
 
-            if (amqpMessage.DeliveryTag.Count == GuidSizeInBytes)
+            sbMessage.LockTokenGuid = ParseGuidBytes(amqpMessage.DeliveryTag);
+
+            amqpMessage.Dispose();
+
+            return sbMessage;
+        }
+
+        public virtual Guid ParseGuidBytes(ReadOnlyMemory<byte> bytes)
+        {
+            if (bytes.Length == GuidSizeInBytes)
             {
                 Span<byte> guidBytes = stackalloc byte[GuidSizeInBytes];
-                amqpMessage.DeliveryTag.AsSpan().CopyTo(guidBytes);
+                bytes.Span.CopyTo(guidBytes);
                 if (!MemoryMarshal.TryRead<Guid>(guidBytes, out var lockTokenGuid))
                 {
                     lockTokenGuid = new Guid(guidBytes.ToArray());
                 }
-                sbMessage.LockTokenGuid = lockTokenGuid;
-            }
 
-            amqpMessage.Dispose();
+                return lockTokenGuid;
+            }
 
-            return sbMessage;
+            return default;
         }
 
         internal static bool TryGetAmqpObjectFromNetObject(object netObject, MappingType mappingType, out object amqpObject)
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageExtensions.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageExtensions.cs
index 02ad4bf063a43..f9315b500c54f 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageExtensions.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageExtensions.cs
@@ -15,13 +15,15 @@ namespace Azure.Messaging.ServiceBus.Amqp
 {
     internal static class AmqpMessageExtensions
     {
-        public static AmqpMessage ToAmqpMessage(this ServiceBusMessage message)
+        public static AmqpMessage ToAmqpMessage(this ServiceBusMessage message) => ToAmqpMessage(message.AmqpMessage);
+
+        public static AmqpMessage ToAmqpMessage(this AmqpAnnotatedMessage message)
         {
-            if (message.AmqpMessage.Body.TryGetData(out IEnumerable<ReadOnlyMemory<byte>> dataBody))
+            if (message.Body.TryGetData(out IEnumerable<ReadOnlyMemory<byte>> dataBody))
             {
                 return AmqpMessage.Create(dataBody.AsAmqpData());
             }
-            if (message.AmqpMessage.Body.TryGetValue(out object value))
+            if (message.Body.TryGetValue(out object value))
             {
                 if (AmqpMessageConverter.TryGetAmqpObjectFromNetObject(value, MappingType.MessageBody, out object amqpObject))
                 {
@@ -32,12 +34,12 @@ public static AmqpMessage ToAmqpMessage(this ServiceBusMessage message)
                     throw new NotSupportedException(Resources.InvalidAmqpMessageValueBody.FormatForUser(amqpObject?.GetType()));
                 }
             }
-            if (message.AmqpMessage.Body.TryGetSequence(out IEnumerable<IList<object>> sequence))
+            if (message.Body.TryGetSequence(out IEnumerable<IList<object>> sequence))
             {
                 return AmqpMessage.Create(sequence.Select(s => new AmqpSequence((IList)s)).ToList());
             }
 
-            throw new NotSupportedException($"{message.AmqpMessage.Body.GetType()} is not a supported message body type.");
+            throw new NotSupportedException($"{message.Body.GetType()} is not a supported message body type.");
         }
 
         private static IEnumerable<Data> AsAmqpData(this IEnumerable<ReadOnlyMemory<byte>> binaryData)
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpReceiver.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpReceiver.cs
index a403a023e968f..59075a1708e2f 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpReceiver.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpReceiver.cs
@@ -368,7 +368,7 @@ private async Task<IReadOnlyList<ServiceBusReceivedMessage>> ReceiveMessagesAsyn
                         link.DisposeDelivery(message, true, AmqpConstants.AcceptedOutcome);
                     }
 
-                    receivedMessages.Add(_messageConverter.AmqpMessageToSBMessage(message));
+                    receivedMessages.Add(_messageConverter.AmqpMessageToSBReceivedMessage(message));
                     message.Dispose();
                 }
 
@@ -984,7 +984,7 @@ private async Task<IReadOnlyList<ServiceBusReceivedMessage>> PeekMessagesInterna
 
                     var payload = (ArraySegment<byte>)entry[ManagementConstants.Properties.Message];
                     var amqpMessage = AmqpMessage.CreateAmqpStreamMessage(new BufferListStream(new[] { payload }), true);
-                    message = _messageConverter.AmqpMessageToSBMessage(amqpMessage, true);
+                    message = _messageConverter.AmqpMessageToSBReceivedMessage(amqpMessage, true);
                     messages.Add(message);
                 }
 
@@ -1294,7 +1294,7 @@ internal virtual async Task<IReadOnlyList<ServiceBusReceivedMessage>> ReceiveDef
                         var payload = (ArraySegment<byte>)entry[ManagementConstants.Properties.Message];
                         var amqpMessage =
                             AmqpMessage.CreateAmqpStreamMessage(new BufferListStream(new[] { payload }), true);
-                        var message = _messageConverter.AmqpMessageToSBMessage(amqpMessage);
+                        var message = _messageConverter.AmqpMessageToSBReceivedMessage(amqpMessage);
                         if (entry.TryGetValue<Guid>(ManagementConstants.Properties.LockToken, out var lockToken))
                         {
                             message.LockTokenGuid = lockToken;
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Compatibility/ServiceBusAmqpExtensions.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Compatibility/ServiceBusAmqpExtensions.cs
new file mode 100644
index 0000000000000..41580ef2dd476
--- /dev/null
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Compatibility/ServiceBusAmqpExtensions.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using Azure.Messaging.ServiceBus.Amqp;
+using Microsoft.Azure.Amqp;
+using AmqpLib = Microsoft.Azure.Amqp;
+
+namespace Azure.Messaging.ServiceBus.Primitives
+{
+    /// <summary>
+    /// Extensions for converting to and from AMQP.
+    /// </summary>
+    public static class ServiceBusAmqpExtensions
+    {
+        /// <summary>
+        /// Converts the <see cref="ServiceBusReceivedMessage"/> to its serialized AMQP form.
+        /// </summary>
+        /// <returns></returns>
+        public static BinaryData ToAmqpBytes(this ServiceBusReceivedMessage message)
+        {
+            var stream = AmqpMessageConverter.Default.AmqpAnnotatedMessageToAmqpMessage(message.GetRawAmqpMessage()).ToStream();
+            return BinaryData.FromStream(stream);
+        }
+
+        /// <summary>
+        /// Constructs a <see cref="ServiceBusReceivedMessage"/> from its serialized AMQP form.
+        /// </summary>
+        /// <param name="messageBytes">The AMQP message bytes.</param>
+        /// <param name="lockTokenBytes">The lock token bytes.</param>
+        /// <returns></returns>
+        public static ServiceBusReceivedMessage FromAmqpBytes(BinaryData messageBytes, BinaryData lockTokenBytes)
+        {
+            var bufferStream = BufferListStream.Create(messageBytes.ToStream(), 4096);
+            var amqpMessage = AmqpLib.AmqpMessage.CreateInputMessage(bufferStream);
+
+            var message = AmqpMessageConverter.Default.AmqpMessageToSBReceivedMessage(amqpMessage);
+            message.LockTokenGuid = AmqpMessageConverter.Default.ParseGuidBytes(lockTokenBytes);
+            return message;
+        }
+    }
+}
\ No newline at end of file
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusModelFactory.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusModelFactory.cs
index bbfdc43cb1a89..907d27efb565b 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusModelFactory.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusModelFactory.cs
@@ -131,7 +131,7 @@ public static ServiceBusReceivedMessage ServiceBusReceivedMessage(
             amqpMessage.MessageAnnotations[AmqpMessageConstants.DeadLetterSourceName] = deadLetterSource;
             amqpMessage.MessageAnnotations[AmqpMessageConstants.EnqueueSequenceNumberName] = enqueuedSequenceNumber;
             amqpMessage.MessageAnnotations[AmqpMessageConstants.EnqueuedTimeUtcName] = enqueuedTime.UtcDateTime;
-            amqpMessage.MessageAnnotations[AmqpMessageConstants.MessageStateName] = serviceBusMessageState;
+            amqpMessage.MessageAnnotations[AmqpMessageConstants.MessageStateName] = (int)serviceBusMessageState;
 
             return new ServiceBusReceivedMessage(amqpMessage)
             {
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Amqp/AmqpConverterTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Amqp/AmqpConverterTests.cs
index 1bc028adcf724..f430cceecf188 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Amqp/AmqpConverterTests.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Amqp/AmqpConverterTests.cs
@@ -25,7 +25,7 @@ public void ConvertAmqpMessageToSBMessage()
             data.Value = messageBody;
             var amqpMessage = AmqpMessage.Create(data);
 
-            var sbMessage = converter.AmqpMessageToSBMessage(amqpMessage);
+            var sbMessage = converter.AmqpMessageToSBReceivedMessage(amqpMessage);
             ReadOnlyMemory<byte> sbBody = sbMessage.Body;
             Assert.AreEqual(messageBody, sbBody.ToArray());
         }
@@ -65,7 +65,7 @@ public void ConvertSBMessageToAmqpMessageAndBack()
             sbMessage.ApplicationProperties.Add("UserProperty", "SomeUserProperty");
 
             var amqpMessage = converter.SBMessageToAmqpMessage(sbMessage);
-            var convertedSbMessage = converter.AmqpMessageToSBMessage(amqpMessage);
+            var convertedSbMessage = converter.AmqpMessageToSBReceivedMessage(amqpMessage);
 
             Assert.AreEqual("SomeUserProperty", convertedSbMessage.ApplicationProperties["UserProperty"]);
             Assert.AreEqual(messageBody, convertedSbMessage.Body.ToArray());
@@ -104,7 +104,7 @@ public void PeekedMessageShouldNotIncrementDeliveryCount()
             var amqpMessage = AmqpMessage.Create(amqpValue);
             amqpMessage.Header.DeliveryCount = 2;
 
-            var sbMessage = converter.AmqpMessageToSBMessage(amqpMessage, isPeeked: true);
+            var sbMessage = converter.AmqpMessageToSBReceivedMessage(amqpMessage, isPeeked: true);
             sbMessage.SequenceNumber = 1L;
 
             Assert.AreEqual(2, sbMessage.DeliveryCount);
@@ -121,7 +121,7 @@ public void ReceivedMessageShouldIncrementDeliveryCount()
             var amqpMessage = AmqpMessage.Create(amqpValue);
             amqpMessage.Header.DeliveryCount = 2;
 
-            var sbMessage = converter.AmqpMessageToSBMessage(amqpMessage, isPeeked: false);
+            var sbMessage = converter.AmqpMessageToSBReceivedMessage(amqpMessage, isPeeked: false);
             sbMessage.SequenceNumber = 1L;
 
             Assert.AreEqual(3, sbMessage.DeliveryCount);
@@ -132,13 +132,13 @@ public void CanParseDictionaryValueSection()
         {
             var converter = new AmqpMessageConverter();
             var amqpMessage = AmqpMessage.Create(new AmqpValue { Value = new Dictionary<string, string> { { "key", "value" } } });
-            var sbMessage = converter.AmqpMessageToSBMessage(amqpMessage);
+            var sbMessage = converter.AmqpMessageToSBReceivedMessage(amqpMessage);
             var body = sbMessage.GetRawAmqpMessage().Body;
             Assert.IsTrue(body.TryGetValue(out object val));
             Assert.AreEqual("value", ((Dictionary<string, string>)val)["key"]);
 
             amqpMessage = AmqpMessage.Create(new AmqpValue { Value = new AmqpMap { { new MapKey("key"), "value" } } });
-            sbMessage = converter.AmqpMessageToSBMessage(amqpMessage);
+            sbMessage = converter.AmqpMessageToSBReceivedMessage(amqpMessage);
             body = sbMessage.GetRawAmqpMessage().Body;
             Assert.IsTrue(body.TryGetValue(out val));
             Assert.AreEqual("value", ((Dictionary<string, object>)val)["key"]);
@@ -152,7 +152,7 @@ public void CanParseMaxAbsoluteExpiryTime()
             var amqpMessage = AmqpMessage.Create(data);
             amqpMessage.Properties.AbsoluteExpiryTime = DateTime.MaxValue;
 
-            var convertedSbMessage = converter.AmqpMessageToSBMessage(amqpMessage);
+            var convertedSbMessage = converter.AmqpMessageToSBReceivedMessage(amqpMessage);
 
             Assert.AreEqual(DateTimeOffset.MaxValue, convertedSbMessage.ExpiresAt);
         }
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Message/MessageLiveTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Message/MessageLiveTests.cs
index 59b4c995d5a96..91af18ea6ec3b 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Message/MessageLiveTests.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Message/MessageLiveTests.cs
@@ -9,6 +9,7 @@
 using Azure.Core.Amqp;
 using Azure.Core.Serialization;
 using Azure.Messaging.ServiceBus.Amqp;
+using Azure.Messaging.ServiceBus.Primitives;
 using Microsoft.Azure.Amqp.Encoding;
 using NUnit.Framework;
 
@@ -71,6 +72,33 @@ public async Task MessagePropertiesShouldSupportValidPropertyTypes()
                 Assert.IsInstanceOf(typeof(DateTime), receivedMsg.ApplicationProperties["DateTime"]);
                 Assert.IsInstanceOf(typeof(DateTimeOffset), receivedMsg.ApplicationProperties["DateTimeOffset"]);
                 Assert.IsInstanceOf(typeof(TimeSpan), receivedMsg.ApplicationProperties["TimeSpan"]);
+
+                var bytes = receivedMsg.ToAmqpBytes();
+
+                var copyReceivedMessage = ServiceBusAmqpExtensions.FromAmqpBytes(
+                    bytes,
+                    BinaryData.FromBytes(receivedMsg.LockTokenGuid.ToByteArray()));
+
+                Assert.AreEqual(receivedMsg.LockToken, copyReceivedMessage.LockToken);
+                Assert.IsInstanceOf(typeof(byte), copyReceivedMessage.ApplicationProperties["byte"]);
+                Assert.IsInstanceOf(typeof(sbyte), copyReceivedMessage.ApplicationProperties["sbyte"]);
+                Assert.IsInstanceOf(typeof(char), copyReceivedMessage.ApplicationProperties["char"]);
+                Assert.IsInstanceOf(typeof(short), copyReceivedMessage.ApplicationProperties["short"]);
+                Assert.IsInstanceOf(typeof(ushort), copyReceivedMessage.ApplicationProperties["ushort"]);
+                Assert.IsInstanceOf(typeof(int), copyReceivedMessage.ApplicationProperties["int"]);
+                Assert.IsInstanceOf(typeof(uint), copyReceivedMessage.ApplicationProperties["uint"]);
+                Assert.IsInstanceOf(typeof(long), copyReceivedMessage.ApplicationProperties["long"]);
+                Assert.IsInstanceOf(typeof(ulong), copyReceivedMessage.ApplicationProperties["ulong"]);
+                Assert.IsInstanceOf(typeof(float), copyReceivedMessage.ApplicationProperties["float"]);
+                Assert.IsInstanceOf(typeof(double), copyReceivedMessage.ApplicationProperties["double"]);
+                Assert.IsInstanceOf(typeof(decimal), copyReceivedMessage.ApplicationProperties["decimal"]);
+                Assert.IsInstanceOf(typeof(bool), copyReceivedMessage.ApplicationProperties["bool"]);
+                Assert.IsInstanceOf(typeof(Guid), copyReceivedMessage.ApplicationProperties["Guid"]);
+                Assert.IsInstanceOf(typeof(string), copyReceivedMessage.ApplicationProperties["string"]);
+                Assert.IsInstanceOf(typeof(Uri), copyReceivedMessage.ApplicationProperties["Uri"]);
+                Assert.IsInstanceOf(typeof(DateTime), copyReceivedMessage.ApplicationProperties["DateTime"]);
+                Assert.IsInstanceOf(typeof(DateTimeOffset), copyReceivedMessage.ApplicationProperties["DateTimeOffset"]);
+                Assert.IsInstanceOf(typeof(TimeSpan), copyReceivedMessage.ApplicationProperties["TimeSpan"]);
             }
         }
 
@@ -615,6 +643,63 @@ public async Task CanRoundTripAbsoluteExpiryCreationTime()
             }
         }
 
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public async Task CanSerializeDeserializeAmqpBytes(bool useSession)
+        {
+            await using (var scope = await ServiceBusScope.CreateWithQueue(enablePartitioning: true, enableSession: useSession))
+            {
+                await using var client = new ServiceBusClient(TestEnvironment.ServiceBusConnectionString);
+                var sender = client.CreateSender(scope.QueueName);
+                var msg = new ServiceBusMessage(new BinaryData(ServiceBusTestUtilities.GetRandomBuffer(100)));
+                msg.ContentType = "contenttype";
+                msg.CorrelationId = "correlationid";
+                msg.Subject = "label";
+                msg.MessageId = "messageId";
+                msg.PartitionKey = "key";
+                msg.ApplicationProperties.Add("testProp", "my prop");
+                msg.ReplyTo = "replyto";
+
+                msg.ScheduledEnqueueTime = DateTimeOffset.Now;
+                if (useSession)
+                {
+                    msg.SessionId = "key";
+                    msg.ReplyToSessionId = "replytosession";
+                }
+
+                msg.TimeToLive = TimeSpan.FromSeconds(60);
+                msg.To = "to";
+                await sender.SendMessageAsync(msg);
+
+                ServiceBusReceiver receiver;
+                if (useSession)
+                    receiver = await client.AcceptNextSessionAsync(scope.QueueName);
+                else
+                    receiver = client.CreateReceiver(scope.QueueName);
+
+                ServiceBusReceivedMessage received = await receiver.ReceiveMessageAsync();
+
+                var serializedBytes = received.ToAmqpBytes();
+                var deserialized = ServiceBusAmqpExtensions.FromAmqpBytes(
+                    serializedBytes,
+                    BinaryData.FromBytes(received.LockTokenGuid.ToByteArray()));
+                Assert.AreEqual(received.ContentType, deserialized.ContentType);
+                Assert.AreEqual(received.CorrelationId, deserialized.CorrelationId);
+                Assert.AreEqual(received.Subject, deserialized.Subject);
+                Assert.AreEqual(received.MessageId, deserialized.MessageId);
+                Assert.AreEqual(received.PartitionKey, deserialized.PartitionKey);
+                Assert.AreEqual(received.ApplicationProperties["testProp"], deserialized.ApplicationProperties["testProp"]);
+                Assert.AreEqual(received.ReplyTo, deserialized.ReplyTo);
+                Assert.AreEqual(received.ReplyToSessionId, deserialized.ReplyToSessionId);
+                Assert.AreEqual(received.ScheduledEnqueueTime, deserialized.ScheduledEnqueueTime);
+                Assert.AreEqual(received.SessionId, deserialized.SessionId);
+                Assert.AreEqual(received.TimeToLive, deserialized.TimeToLive);
+                Assert.AreEqual(received.To, deserialized.To);
+                Assert.AreEqual(received.LockTokenGuid, deserialized.LockTokenGuid);
+            }
+        }
+
         private class TestBody
         {
             public string A { get; set; }
diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusExtensionConfigProvider.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusExtensionConfigProvider.cs
index bc07d2fe0d9f0..232afb1f25606 100644
--- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusExtensionConfigProvider.cs
+++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusExtensionConfigProvider.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Threading.Tasks;
 using Azure.Messaging.ServiceBus;
+using Azure.Messaging.ServiceBus.Primitives;
 using Microsoft.Azure.WebJobs.Description;
 using Microsoft.Azure.WebJobs.Extensions.ServiceBus.Config;
 using Microsoft.Azure.WebJobs.Host.Bindings;
@@ -96,6 +97,7 @@ public void Initialize(ExtensionConfigContext context)
                 .AddConverter(new MessageToStringConverter())
                 .AddConverter(new MessageToByteArrayConverter())
                 .AddConverter<ServiceBusReceivedMessage, BinaryData>(message => message.Body)
+                .AddConverter<ServiceBusReceivedMessage, ParameterBindingData>(ConvertReceivedMessageToBindingData)
                 .AddOpenConverter<ServiceBusReceivedMessage, OpenType.Poco>(typeof(MessageToPocoConverter<>), _options.JsonSerializerSettings);
 
             // register our trigger binding provider
@@ -108,6 +110,23 @@ public void Initialize(ExtensionConfigContext context)
             context.AddBindingRule<ServiceBusAttribute>().Bind(bindingProvider);
         }
 
+        internal static ParameterBindingData ConvertReceivedMessageToBindingData(ServiceBusReceivedMessage message)
+        {
+            byte[] messageBytes = message.ToAmqpBytes().ToArray();
+            byte[] lockTokenBytes = Guid.Parse(message.LockToken).ToByteArray();
+            const int lockTokenLength = 16;
+
+            byte[] combinedBytes = new byte[messageBytes.Length + lockTokenLength];
+
+            // The 16 lock token bytes go in the beginning
+            lockTokenBytes.CopyTo(combinedBytes.AsSpan());
+
+            // The AMQP message bytes go after the lock token bytes
+            messageBytes.CopyTo(combinedBytes.AsSpan(lockTokenLength));
+
+            return new ParameterBindingData("1.0", "AzureServiceBus", BinaryData.FromBytes(combinedBytes), "application/octet-stream");
+        }
+
         internal static void LogExceptionReceivedEvent(ProcessErrorEventArgs e, ILoggerFactory loggerFactory)
         {
             try
diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Microsoft.Azure.WebJobs.Extensions.ServiceBus.csproj b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Microsoft.Azure.WebJobs.Extensions.ServiceBus.csproj
index 5360089de09b0..2dfcc3a79b85f 100644
--- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Microsoft.Azure.WebJobs.Extensions.ServiceBus.csproj
+++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Microsoft.Azure.WebJobs.Extensions.ServiceBus.csproj
@@ -35,4 +35,8 @@
     <Compile Include="$(AzureCoreSharedSources)AppContextSwitchHelper.cs" LinkBase="Shared" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\Azure.Messaging.ServiceBus\src\Azure.Messaging.ServiceBus.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/MessageInteropTests.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/MessageInteropTests.cs
index 0b97ded5a253c..bc85e3d66d3c4 100644
--- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/MessageInteropTests.cs
+++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/MessageInteropTests.cs
@@ -9,6 +9,8 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.Serialization;
+using Azure.Messaging.ServiceBus.Primitives;
+using Microsoft.Azure.WebJobs.ServiceBus.Config;
 
 namespace Microsoft.Azure.ServiceBus.UnitTests.MessageInterop
 {
@@ -33,6 +35,55 @@ public void RunSerializerTests(string testCaseName)
             Assert.AreEqual(book, returned);
         }
 
+        [Test]
+        public void ParameterBindingDataTest()
+        {
+            var lockToken = Guid.NewGuid();
+            var message = ServiceBusModelFactory.ServiceBusReceivedMessage(
+                body: BinaryData.FromString("body"),
+                messageId: "messageId",
+                correlationId: "correlationId",
+                sessionId: "sessionId",
+                replyTo: "replyTo",
+                replyToSessionId: "replyToSessionId",
+                contentType: "contentType",
+                subject: "label",
+                to: "to",
+                partitionKey: "partitionKey",
+                viaPartitionKey: "viaPartitionKey",
+                deadLetterSource: "deadLetterSource",
+                enqueuedSequenceNumber: 1,
+                lockTokenGuid: lockToken);
+
+            var bindingData = ServiceBusExtensionConfigProvider.ConvertReceivedMessageToBindingData(message);
+            Assert.AreEqual("application/octet-stream", bindingData.ContentType);
+            Assert.AreEqual("1.0", bindingData.Version);
+            Assert.AreEqual("AzureServiceBus", bindingData.Source);
+
+            var bytes = bindingData.Content.ToMemory();
+            var lockTokenBytes = bytes.Slice(0, 16).ToArray();
+            Assert.AreEqual(lockToken.ToByteArray(), lockTokenBytes);
+
+            var deserialized = ServiceBusAmqpExtensions.FromAmqpBytes(
+                BinaryData.FromBytes(bytes.Slice(16, bytes.Length - 16)),
+                BinaryData.FromBytes(lockTokenBytes));
+
+            Assert.AreEqual(message.Body.ToArray(), deserialized.Body.ToArray());
+            Assert.AreEqual(message.MessageId, deserialized.MessageId);
+            Assert.AreEqual(message.CorrelationId, deserialized.CorrelationId);
+            Assert.AreEqual(message.SessionId, deserialized.SessionId);
+            Assert.AreEqual(message.ReplyTo, deserialized.ReplyTo);
+            Assert.AreEqual(message.ReplyToSessionId, deserialized.ReplyToSessionId);
+            Assert.AreEqual(message.ContentType, deserialized.ContentType);
+            Assert.AreEqual(message.Subject, deserialized.Subject);
+            Assert.AreEqual(message.To, deserialized.To);
+            Assert.AreEqual(message.PartitionKey, deserialized.PartitionKey);
+            Assert.AreEqual(message.TransactionPartitionKey, deserialized.TransactionPartitionKey);
+            Assert.AreEqual(message.DeadLetterSource, deserialized.DeadLetterSource);
+            Assert.AreEqual(message.EnqueuedSequenceNumber, deserialized.EnqueuedSequenceNumber);
+            Assert.AreEqual(message.LockToken, deserialized.LockToken);
+        }
+
         private ServiceBusMessage GetBrokeredMessage(XmlObjectSerializer serializer, TestBook book)
         {
             byte[] payload = null;

From 709bc99c467919ca822aceefbe85398c59fb0aec Mon Sep 17 00:00:00 2001
From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
Date: Wed, 25 Jan 2023 16:19:11 -0800
Subject: [PATCH 02/14] Use ToMemory to avoid extra allocation

---
 .../src/Config/ServiceBusExtensionConfigProvider.cs           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusExtensionConfigProvider.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusExtensionConfigProvider.cs
index 232afb1f25606..695f2317b5a02 100644
--- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusExtensionConfigProvider.cs
+++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusExtensionConfigProvider.cs
@@ -112,7 +112,7 @@ public void Initialize(ExtensionConfigContext context)
 
         internal static ParameterBindingData ConvertReceivedMessageToBindingData(ServiceBusReceivedMessage message)
         {
-            byte[] messageBytes = message.ToAmqpBytes().ToArray();
+            ReadOnlyMemory<byte> messageBytes = message.ToAmqpBytes().ToMemory();
             byte[] lockTokenBytes = Guid.Parse(message.LockToken).ToByteArray();
             const int lockTokenLength = 16;
 
@@ -122,7 +122,7 @@ internal static ParameterBindingData ConvertReceivedMessageToBindingData(Service
             lockTokenBytes.CopyTo(combinedBytes.AsSpan());
 
             // The AMQP message bytes go after the lock token bytes
-            messageBytes.CopyTo(combinedBytes.AsSpan(lockTokenLength));
+            messageBytes.CopyTo(combinedBytes.AsMemory(lockTokenLength));
 
             return new ParameterBindingData("1.0", "AzureServiceBus", BinaryData.FromBytes(combinedBytes), "application/octet-stream");
         }

From 5a1471a89e963a3c78307bcb88c4f668ede442a2 Mon Sep 17 00:00:00 2001
From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
Date: Fri, 27 Jan 2023 11:34:31 -0800
Subject: [PATCH 03/14] PR fb

---
 .../src/Amqp/AmqpMessageConverter.cs                  | 11 ++---------
 .../src/Config/ServiceBusExtensionConfigProvider.cs   |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs
index 3dd1306243f47..747b5edaf7bfd 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs
@@ -241,7 +241,7 @@ public virtual AmqpMessage AmqpAnnotatedMessageToAmqpMessage(AmqpAnnotatedMessag
                 {
                     case AmqpMessageConstants.ScheduledEnqueueTimeUtcName:
                         DateTimeOffset scheduledEnqueueTime = annotatedMessage.GetScheduledEnqueueTime();
-                        if (scheduledEnqueueTime != default && scheduledEnqueueTime > DateTimeOffset.MinValue)
+                        if (scheduledEnqueueTime != default)
                         {
                             amqpMessage.MessageAnnotations.Map.Add(AmqpMessageConstants.ScheduledEnqueueTimeUtcName, scheduledEnqueueTime.UtcDateTime);
                         }
@@ -568,14 +568,7 @@ public virtual Guid ParseGuidBytes(ReadOnlyMemory<byte> bytes)
         {
             if (bytes.Length == GuidSizeInBytes)
             {
-                Span<byte> guidBytes = stackalloc byte[GuidSizeInBytes];
-                bytes.Span.CopyTo(guidBytes);
-                if (!MemoryMarshal.TryRead<Guid>(guidBytes, out var lockTokenGuid))
-                {
-                    lockTokenGuid = new Guid(guidBytes.ToArray());
-                }
-
-                return lockTokenGuid;
+                return new Guid(bytes.Span.ToArray());
             }
 
             return default;
diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusExtensionConfigProvider.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusExtensionConfigProvider.cs
index 695f2317b5a02..51a0a462fec42 100644
--- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusExtensionConfigProvider.cs
+++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusExtensionConfigProvider.cs
@@ -124,7 +124,7 @@ internal static ParameterBindingData ConvertReceivedMessageToBindingData(Service
             // The AMQP message bytes go after the lock token bytes
             messageBytes.CopyTo(combinedBytes.AsMemory(lockTokenLength));
 
-            return new ParameterBindingData("1.0", "AzureServiceBus", BinaryData.FromBytes(combinedBytes), "application/octet-stream");
+            return new ParameterBindingData("1.0", "AzureServiceBusReceivedMessage", BinaryData.FromBytes(combinedBytes), "application/octet-stream");
         }
 
         internal static void LogExceptionReceivedEvent(ProcessErrorEventArgs e, ILoggerFactory loggerFactory)

From 5c743fe17807cf54639ba200a9950f981e7e7a89 Mon Sep 17 00:00:00 2001
From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
Date: Fri, 27 Jan 2023 11:36:44 -0800
Subject: [PATCH 04/14] PR fb

---
 .../src/Config/ServiceBusExtensionConfigProvider.cs             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusExtensionConfigProvider.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusExtensionConfigProvider.cs
index 51a0a462fec42..7141f4fe1d2bc 100644
--- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusExtensionConfigProvider.cs
+++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusExtensionConfigProvider.cs
@@ -114,6 +114,8 @@ internal static ParameterBindingData ConvertReceivedMessageToBindingData(Service
         {
             ReadOnlyMemory<byte> messageBytes = message.ToAmqpBytes().ToMemory();
             byte[] lockTokenBytes = Guid.Parse(message.LockToken).ToByteArray();
+
+            // The lock token is a 16 byte GUID
             const int lockTokenLength = 16;
 
             byte[] combinedBytes = new byte[messageBytes.Length + lockTokenLength];

From 3b48964e21b104df8e2868a793434a245aa01d82 Mon Sep 17 00:00:00 2001
From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
Date: Fri, 27 Jan 2023 13:17:18 -0800
Subject: [PATCH 05/14] Update test

---
 .../tests/MessageInteropTests.cs                                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/MessageInteropTests.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/MessageInteropTests.cs
index bc85e3d66d3c4..358273f61b2d9 100644
--- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/MessageInteropTests.cs
+++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/MessageInteropTests.cs
@@ -58,7 +58,7 @@ public void ParameterBindingDataTest()
             var bindingData = ServiceBusExtensionConfigProvider.ConvertReceivedMessageToBindingData(message);
             Assert.AreEqual("application/octet-stream", bindingData.ContentType);
             Assert.AreEqual("1.0", bindingData.Version);
-            Assert.AreEqual("AzureServiceBus", bindingData.Source);
+            Assert.AreEqual("AzureServiceBusReceivedMessage", bindingData.Source);
 
             var bytes = bindingData.Content.ToMemory();
             var lockTokenBytes = bytes.Slice(0, 16).ToArray();

From 97a60fa0c7b28fa4df22bf16d48be514b2f80e35 Mon Sep 17 00:00:00 2001
From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
Date: Mon, 30 Jan 2023 12:47:29 -0800
Subject: [PATCH 06/14] Add back TryRead

---
 .../src/Amqp/AmqpMessageConverter.cs                     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs
index 747b5edaf7bfd..6c9ff61ad725c 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs
@@ -568,7 +568,14 @@ public virtual Guid ParseGuidBytes(ReadOnlyMemory<byte> bytes)
         {
             if (bytes.Length == GuidSizeInBytes)
             {
-                return new Guid(bytes.Span.ToArray());
+                // Use TryRead to avoid allocating an array
+                if (!MemoryMarshal.TryRead<Guid>(bytes.Span, out var lockTokenGuid))
+                {
+                    // We expect the constructor to fail at this point, but we invoke it to leverage the Guid validation rather than
+                    // throwing ourselves.
+                    lockTokenGuid = new Guid(bytes.ToArray());
+                }
+                return lockTokenGuid;
             }
 
             return default;

From 9519b3279bc61682238a522f5c20b6e68f5f64c0 Mon Sep 17 00:00:00 2001
From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
Date: Mon, 30 Jan 2023 18:24:46 -0800
Subject: [PATCH 07/14] Add endianness check

---
 .../Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs
index 6c9ff61ad725c..db87f2f5076d2 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs
@@ -569,7 +569,7 @@ public virtual Guid ParseGuidBytes(ReadOnlyMemory<byte> bytes)
             if (bytes.Length == GuidSizeInBytes)
             {
                 // Use TryRead to avoid allocating an array
-                if (!MemoryMarshal.TryRead<Guid>(bytes.Span, out var lockTokenGuid))
+                if (!BitConverter.IsLittleEndian || !MemoryMarshal.TryRead<Guid>(bytes.Span, out var lockTokenGuid))
                 {
                     // We expect the constructor to fail at this point, but we invoke it to leverage the Guid validation rather than
                     // throwing ourselves.

From c63aee7f71d17b0204318e0a4d4fefaf6a3764cf Mon Sep 17 00:00:00 2001
From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
Date: Mon, 30 Jan 2023 18:52:08 -0800
Subject: [PATCH 08/14] Fix comment

---
 .../src/Amqp/AmqpMessageConverter.cs                        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs
index db87f2f5076d2..6438709c9d9f3 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs
@@ -568,11 +568,11 @@ public virtual Guid ParseGuidBytes(ReadOnlyMemory<byte> bytes)
         {
             if (bytes.Length == GuidSizeInBytes)
             {
-                // Use TryRead to avoid allocating an array
+                // Use TryRead to avoid allocating an array if we are on a little endian machine.
                 if (!BitConverter.IsLittleEndian || !MemoryMarshal.TryRead<Guid>(bytes.Span, out var lockTokenGuid))
                 {
-                    // We expect the constructor to fail at this point, but we invoke it to leverage the Guid validation rather than
-                    // throwing ourselves.
+                    // Either we are on a big endian machine or the bytes were not a valid GUID.
+                    // Even if the bytes were not valid, use the Guid constructor to leverage the Guid validation rather than throwing ourselves.
                     lockTokenGuid = new Guid(bytes.ToArray());
                 }
                 return lockTokenGuid;

From ae014e28c0f157e4097837088e603c0262182d47 Mon Sep 17 00:00:00 2001
From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
Date: Wed, 1 Feb 2023 21:15:01 -0800
Subject: [PATCH 09/14] Update WebJobs version and remove nuget config change

---
 NuGet.Config            | 1 -
 eng/Packages.Data.props | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/NuGet.Config b/NuGet.Config
index 28e636a99c344..be103949f661d 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -5,7 +5,6 @@
     <!-- Do not add any additional feeds if new packages are needed they need to come from nuget.org or our azure-sdk-for-net DevOps feed -->
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="azure-sdk-for-net" value="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json" />
-    <add key="azure_app_service_staging" value="https://www.myget.org/F/azure-appservice-staging/api/v2" />
 
     <!-- 
       Used for azure-sdk-tools repo until issue https://github.com/Azure/azure-sdk-tools/issues/1329 is addressed
diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
index 1036db2de14fb..4fbff872b75fc 100644
--- a/eng/Packages.Data.props
+++ b/eng/Packages.Data.props
@@ -134,8 +134,8 @@
     <PackageReference Update="Microsoft.Azure.SignalR.Management" Version="1.18.0" />
     <PackageReference Update="Microsoft.Azure.SignalR.Protocols" Version="1.18.0" />
     <PackageReference Update="Microsoft.Azure.SignalR.Serverless.Protocols" Version="1.9.0" />
-    <PackageReference Update="Microsoft.Azure.WebJobs" Version="3.0.35" />
-    <PackageReference Update="Microsoft.Azure.WebJobs.Sources" Version="3.0.35" />
+    <PackageReference Update="Microsoft.Azure.WebJobs" Version="3.0.36" />
+    <PackageReference Update="Microsoft.Azure.WebJobs.Sources" Version="3.0.36" />
     <PackageReference Update="Microsoft.Spatial" Version="7.5.3" />
     <PackageReference Update="Newtonsoft.Json" Version="10.0.3" />
   </ItemGroup>

From d5252ac6bcff7515564964503ff8acf5ca3fdcfd Mon Sep 17 00:00:00 2001
From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
Date: Thu, 2 Feb 2023 09:45:35 -0800
Subject: [PATCH 10/14] Fix build break

---
 .../src/Listeners/ServiceBusScaleMonitor.cs                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Listeners/ServiceBusScaleMonitor.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Listeners/ServiceBusScaleMonitor.cs
index cd399a1d2e190..692b75ce5327f 100644
--- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Listeners/ServiceBusScaleMonitor.cs
+++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Listeners/ServiceBusScaleMonitor.cs
@@ -34,7 +34,7 @@ public ServiceBusScaleMonitor(string functionId, ServiceBusEntityType serviceBus
             _functionId = functionId;
             _serviceBusEntityType = serviceBusEntityType;
             _entityPath = entityPath;
-            _scaleMonitorDescriptor = new ScaleMonitorDescriptor($"{_functionId}-ServiceBusTrigger-{_entityPath}".ToLower(CultureInfo.InvariantCulture));
+            _scaleMonitorDescriptor = new ScaleMonitorDescriptor($"{_functionId}-ServiceBusTrigger-{_entityPath}".ToLower(CultureInfo.InvariantCulture), _functionId);
             _isListeningOnDeadLetterQueue = entityPath.EndsWith(DeadLetterQueuePath, StringComparison.OrdinalIgnoreCase);
             _receiver = receiver;
             _administrationClient = new Lazy<ServiceBusAdministrationClient>(() => clientFactory.CreateAdministrationClient(connection));

From 1cdb46da33827e222cca956d83e6c05988232624 Mon Sep 17 00:00:00 2001
From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
Date: Thu, 2 Feb 2023 13:12:59 -0800
Subject: [PATCH 11/14] build break fix

---
 .../src/Listeners/EventHubsScaleMonitor.cs                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Listeners/EventHubsScaleMonitor.cs b/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Listeners/EventHubsScaleMonitor.cs
index 6a413e37ec5c4..3b90281f811b0 100644
--- a/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Listeners/EventHubsScaleMonitor.cs
+++ b/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Listeners/EventHubsScaleMonitor.cs
@@ -38,7 +38,7 @@ public EventHubsScaleMonitor(
             _nextPartitionWarningTime = DateTime.UtcNow;
             _client = client;
 
-            Descriptor = new ScaleMonitorDescriptor($"{_functionId}-EventHubTrigger-{_client.EventHubName}-{_client.ConsumerGroup}".ToLowerInvariant());
+            Descriptor = new ScaleMonitorDescriptor($"{_functionId}-EventHubTrigger-{_client.EventHubName}-{_client.ConsumerGroup}".ToLowerInvariant(), _functionId);
         }
 
         public ScaleMonitorDescriptor Descriptor { get; }

From 6a135722a7e8c480cf5505447f1f0bf8343fc129 Mon Sep 17 00:00:00 2001
From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
Date: Thu, 2 Feb 2023 13:44:09 -0800
Subject: [PATCH 12/14] Storage fix

---
 .../src/Shared/Queues/QueueListener.cs                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueListener.cs b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueListener.cs
index 2e8458c62a4b6..3e12bf1d2c2b6 100644
--- a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueListener.cs
+++ b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueListener.cs
@@ -130,7 +130,7 @@ public QueueListener(QueueClient queue,
 
             _delayStrategy = new RandomizedExponentialBackoffStrategy(QueuePollingIntervals.Minimum, maximumInterval);
 
-            _scaleMonitorDescriptor = new ScaleMonitorDescriptor($"{_functionId}-QueueTrigger-{_queue.Name}".ToLower(CultureInfo.InvariantCulture));
+            _scaleMonitorDescriptor = new ScaleMonitorDescriptor($"{_functionId}-QueueTrigger-{_queue.Name}".ToLower(CultureInfo.InvariantCulture), _functionId);
             _shutdownCancellationTokenSource = new CancellationTokenSource();
 
             _concurrencyManager = concurrencyManager;

From b7566e0d5a460f00e2ae8bcc58a6f7c2e1cd26a3 Mon Sep 17 00:00:00 2001
From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
Date: Thu, 2 Feb 2023 14:42:41 -0800
Subject: [PATCH 13/14] revert to 3.0.35

---
 eng/Packages.Data.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
index a50e50b8c8d37..f750c090ab4d4 100644
--- a/eng/Packages.Data.props
+++ b/eng/Packages.Data.props
@@ -134,8 +134,8 @@
     <PackageReference Update="Microsoft.Azure.SignalR.Management" Version="1.19.2" />
     <PackageReference Update="Microsoft.Azure.SignalR.Protocols" Version="1.19.2" />
     <PackageReference Update="Microsoft.Azure.SignalR.Serverless.Protocols" Version="1.9.0" />
-    <PackageReference Update="Microsoft.Azure.WebJobs" Version="3.0.36" />
-    <PackageReference Update="Microsoft.Azure.WebJobs.Sources" Version="3.0.36" />
+    <PackageReference Update="Microsoft.Azure.WebJobs" Version="3.0.35" />
+    <PackageReference Update="Microsoft.Azure.WebJobs.Sources" Version="3.0.35" />
     <PackageReference Update="Microsoft.Spatial" Version="7.5.3" />
     <PackageReference Update="Newtonsoft.Json" Version="10.0.3" />
   </ItemGroup>

From ac51df193717fa644cf1b0f226468f93e93785a8 Mon Sep 17 00:00:00 2001
From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
Date: Thu, 2 Feb 2023 14:48:44 -0800
Subject: [PATCH 14/14] revert

---
 .../src/Listeners/EventHubsScaleMonitor.cs                      | 2 +-
 .../src/Listeners/ServiceBusScaleMonitor.cs                     | 2 +-
 .../src/Shared/Queues/QueueListener.cs                          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Listeners/EventHubsScaleMonitor.cs b/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Listeners/EventHubsScaleMonitor.cs
index 3b90281f811b0..6a413e37ec5c4 100644
--- a/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Listeners/EventHubsScaleMonitor.cs
+++ b/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Listeners/EventHubsScaleMonitor.cs
@@ -38,7 +38,7 @@ public EventHubsScaleMonitor(
             _nextPartitionWarningTime = DateTime.UtcNow;
             _client = client;
 
-            Descriptor = new ScaleMonitorDescriptor($"{_functionId}-EventHubTrigger-{_client.EventHubName}-{_client.ConsumerGroup}".ToLowerInvariant(), _functionId);
+            Descriptor = new ScaleMonitorDescriptor($"{_functionId}-EventHubTrigger-{_client.EventHubName}-{_client.ConsumerGroup}".ToLowerInvariant());
         }
 
         public ScaleMonitorDescriptor Descriptor { get; }
diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Listeners/ServiceBusScaleMonitor.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Listeners/ServiceBusScaleMonitor.cs
index 692b75ce5327f..cd399a1d2e190 100644
--- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Listeners/ServiceBusScaleMonitor.cs
+++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Listeners/ServiceBusScaleMonitor.cs
@@ -34,7 +34,7 @@ public ServiceBusScaleMonitor(string functionId, ServiceBusEntityType serviceBus
             _functionId = functionId;
             _serviceBusEntityType = serviceBusEntityType;
             _entityPath = entityPath;
-            _scaleMonitorDescriptor = new ScaleMonitorDescriptor($"{_functionId}-ServiceBusTrigger-{_entityPath}".ToLower(CultureInfo.InvariantCulture), _functionId);
+            _scaleMonitorDescriptor = new ScaleMonitorDescriptor($"{_functionId}-ServiceBusTrigger-{_entityPath}".ToLower(CultureInfo.InvariantCulture));
             _isListeningOnDeadLetterQueue = entityPath.EndsWith(DeadLetterQueuePath, StringComparison.OrdinalIgnoreCase);
             _receiver = receiver;
             _administrationClient = new Lazy<ServiceBusAdministrationClient>(() => clientFactory.CreateAdministrationClient(connection));
diff --git a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueListener.cs b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueListener.cs
index 3e12bf1d2c2b6..2e8458c62a4b6 100644
--- a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueListener.cs
+++ b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueListener.cs
@@ -130,7 +130,7 @@ public QueueListener(QueueClient queue,
 
             _delayStrategy = new RandomizedExponentialBackoffStrategy(QueuePollingIntervals.Minimum, maximumInterval);
 
-            _scaleMonitorDescriptor = new ScaleMonitorDescriptor($"{_functionId}-QueueTrigger-{_queue.Name}".ToLower(CultureInfo.InvariantCulture), _functionId);
+            _scaleMonitorDescriptor = new ScaleMonitorDescriptor($"{_functionId}-QueueTrigger-{_queue.Name}".ToLower(CultureInfo.InvariantCulture));
             _shutdownCancellationTokenSource = new CancellationTokenSource();
 
             _concurrencyManager = concurrencyManager;