Store absolute blob URIs instead of just the blob name

src/DurableTask.AzureStorage/MessageManager.cs

@@ -222,6 +222,12 @@ public Task<bool> DeleteBlobAsync(string blobName)
             return blob.DeleteIfExistsAsync(); 
         }
 
+        public Task<bool> DeleteBlobAsync(Uri blobUri)
+        {
+            Blob blob = this.azureStorageClient.GetBlobReference(blobUri);
+            return blob.DeleteIfExistsAsync();
+        }
+
         private async Task<string> DownloadAndDecompressAsBytesAsync(Blob blob)
         {
             using (MemoryStream memory = new MemoryStream(MaxStorageQueuePayloadSizeInBytes * 2))

src/DurableTask.AzureStorage/Tracking/AzureTableTrackingStore.cs

@@ -1127,7 +1127,17 @@ public override async Task<string> UpdateStateAsync(
                 var tasks = new List<Task>(blobsToDelete.Count);
                 foreach (var blobName in blobsToDelete)
                 {
-                    tasks.Add(this.messageManager.DeleteBlobAsync(blobName));
+                    Task task;
+                    if (Uri.TryCreate(blobName, UriKind.Absolute, out Uri blobUri))
+                    {
+                        task = this.messageManager.DeleteBlobAsync(blobUri);
+                    }
+                    else
+                    {
+                        // backwards compatibility path: construct blob URI from blob name and delete
+                        task = this.messageManager.DeleteBlobAsync(blobName);
+                    }
+                    tasks.Add(task);
                 }
                 await Task.WhenAll(tasks);
             }
@@ -1190,8 +1200,21 @@ void SetInstancesTablePropertyFromHistoryProperty(
             if (historyEntity.Properties.TryGetValue(blobPropertyName, out EntityProperty blobProperty))
             {
                 // This is a large message
-                string blobName = blobProperty.StringValue;
-                string blobUrl = this.messageManager.GetBlobUrl(blobName);
+                string blobData = blobProperty.StringValue;
+
+                // We now store blobs as absolute URIs to minimize chance of 'blob not found' errors
+                // For backwards compatibility to versions where we only stored the blobname, we check if the blob is a URI
+                string blobUrl;
+                if (!Uri.TryCreate(blobData, UriKind.Absolute, out Uri _))
+                {
+                    // backwards compatibility path: we construct the URL from the blobName
+                    blobUrl = this.messageManager.GetBlobUrl(blobData);
+                }
+                else
+                {
+                    blobUrl = blobData;
+                }
+
                 instanceEntity.Properties[instancePropertyName] = new EntityProperty(blobUrl);
             }
             else
@@ -1216,7 +1239,10 @@ async Task CompressLargeMessageAsync(DynamicTableEntity entity, List<string> lis
                     // Clear out the original property value and create a new "*BlobName"-suffixed property.
                     // The runtime will look for the new "*BlobName"-suffixed column to know if a property is stored in a blob.
                     string blobPropertyName = GetBlobPropertyName(propertyName);
-                    entity.Properties.Add(blobPropertyName, new EntityProperty(blobName));
+
+                    // Store blob URL so the blob can always be downloaded from the absolute path
+                    string bloburl = this.messageManager.GetBlobUrl(blobName);
+                    entity.Properties.Add(blobPropertyName, new EntityProperty(bloburl));
                     entity.Properties[propertyName].StringValue = string.Empty;
 
                     // if necessary, keep track of all the blobs associated with this execution
@@ -1234,7 +1260,19 @@ async Task DecompressLargeEntityProperties(DynamicTableEntity entity, List<strin
                 if (entity.Properties.TryGetValue(blobPropertyName, out EntityProperty property))
                 {
                     string blobName = property.StringValue;
-                    string decompressedMessage = await this.messageManager.DownloadAndDecompressAsBytesAsync(blobName);
+
+                    // We now store blob URIs instead of just blob names to prevent blob not found errors
+                    string decompressedMessage;
+                    if (Uri.TryCreate(blobName, UriKind.Absolute, out Uri blobUri))
+                    {
+                        decompressedMessage = await this.messageManager.DownloadAndDecompressAsBytesAsync(blobUri);
+                    }
+                    else
+                    {
+                        // backwards compatibility path: construct blob URI from blob name and download
+                        decompressedMessage = await this.messageManager.DownloadAndDecompressAsBytesAsync(blobName);
+                    }
+
                     entity.Properties[propertyName] = new EntityProperty(decompressedMessage);
                     entity.Properties.Remove(blobPropertyName);