Merge pull request #8 from olegburov/Issue-#4

Fixed issue #4.

Author: ob1dev

src/Sitecore.Azure.Diagnostics/Sitecore.Azure.Diagnostics.csproj

@@ -60,11 +60,6 @@
       <HintPath>..\packages\Microsoft.Data.Services.Client.5.7.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.1\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.WindowsAzure.Storage, Version=7.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\WindowsAzure.Storage.7.1.2\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
       <Private>True</Private>

src/Sitecore.Azure.Diagnostics/Storage/AzureBlobStorageProvider.cs

@@ -1,14 +1,14 @@
-using System.Collections.Generic;
+using Microsoft.WindowsAzure.Storage;
+using Microsoft.WindowsAzure.Storage.Blob;
+using Sitecore.Azure.Diagnostics.Storage.RetryPolicies;
+using Sitecore.Diagnostics;
+using System;
+using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Configuration;
 using System.Configuration.Provider;
 using System.Linq;
 using System.Text;
-using Microsoft.Azure;
-using Microsoft.WindowsAzure.ServiceRuntime;
-using Microsoft.WindowsAzure.Storage;
-using Microsoft.WindowsAzure.Storage.Blob;
-using Sitecore.Azure.Diagnostics.Storage.RetryPolicies;
-using Sitecore.Diagnostics;
 
 namespace Sitecore.Azure.Diagnostics.Storage
 {
@@ -29,6 +29,16 @@ public class AzureBlobStorageProvider : ProviderBase
     /// </summary>
     private const string AppSettingName = "Azure.Storage.ConnectionString.AppSettingName";
 
+    /// <summary>
+    /// The web apps environment variables that contains the name of the site.
+    /// </summary>
+    private const string WebsiteNameEnvVar = "WEBSITE_SITE_NAME";
+
+    /// <summary>
+    /// The web apps environment variables that contains the VM's id where the site is running on.
+    /// </summary>
+    private const string WebsiteInstanceIdEnvVar = "WEBSITE_INSTANCE_ID ";
+
     /// <summary>
     /// The cloud BLOB client.
     /// </summary>
@@ -38,7 +48,7 @@ public class AzureBlobStorageProvider : ProviderBase
     /// The cloud blob container name
     /// </summary>
     public string CloudBlobContainerName { get; protected set; }
-    
+
     /// <summary>
     /// The BLOB container public access type
     /// </summary>
@@ -69,7 +79,7 @@ public class AzureBlobStorageProvider : ProviderBase
     public AzureBlobStorageProvider()
     {
       string appSetting = Configuration.Settings.GetSetting(AppSettingName);
-      string storageConnectionString = CloudConfigurationManager.GetSetting(appSetting);
+      string storageConnectionString = ConfigurationManager.AppSettings[appSetting];
 
       // Retrieve storage account from connection string.
       this.StorageAccount = CloudStorageAccount.Parse(storageConnectionString);
@@ -187,7 +197,7 @@ protected string Encoding
         }
       }
     }
-    
+
     #endregion
 
     #region Public Methods
@@ -224,9 +234,9 @@ public virtual CloudBlobContainer GetContainer(string containerName)
       {
         RetryPolicy = new ContainerBeingDeletedRetryPolicy(),
       };
-     
+
       container.CreateIfNotExists(this.PublicAccessType, options);
-      
+
       return container;
     }
 
@@ -239,13 +249,13 @@ public virtual ICloudBlob CreateBlob(string blobName)
     {
       Assert.ArgumentNotNull(blobName, "blobName");
 
-      string webRoleRelativeAddress = this.GetWebRoleRelativeAddress();
+      string webRoleRelativeAddress = this.GetWebsiteRelativeAddress();
 
       // Build blob name for a Role Environment using the following format: {DeploymentId}/{RoleInstanceId}/{BlobName}.
       blobName = string.IsNullOrEmpty(webRoleRelativeAddress) ? blobName : string.Format("{0}/{1}", webRoleRelativeAddress, blobName);
-      
-      ICloudBlob blob = this.CloudBlobContainer.Exists() ? 
-        this.CloudBlobContainer.GetAppendBlobReference(blobName) : 
+
+      ICloudBlob blob = this.CloudBlobContainer.Exists() ?
+        this.CloudBlobContainer.GetAppendBlobReference(blobName) :
         this.GetContainer(this.ContainerName).GetAppendBlobReference(blobName);
 
       return blob;
@@ -261,8 +271,8 @@ public virtual ICloudBlob GetBlob(string blobName)
     {
       Assert.ArgumentNotNull(blobName, "blobName");
 
-      ICloudBlob blob = this.CloudBlobContainer.Exists() ? 
-        this.CloudBlobContainer.GetBlobReferenceFromServer(blobName) : 
+      ICloudBlob blob = this.CloudBlobContainer.Exists() ?
+        this.CloudBlobContainer.GetBlobReferenceFromServer(blobName) :
         this.GetContainer(this.ContainerName).GetBlobReferenceFromServer(blobName);
 
       return blob;
@@ -321,7 +331,7 @@ public virtual ICollection<ICloudBlob> ListBlobs(CloudBlobContainer container, s
       Assert.ArgumentNotNull(container, "container");
       Assert.ArgumentNotNull(searchPattern, "searchPattern");
 
-      string webRoleRelativeAddress = this.GetWebRoleRelativeAddress();
+      string webRoleRelativeAddress = this.GetWebsiteRelativeAddress();
       var blobList = container.ListBlobs(webRoleRelativeAddress, true).Cast<ICloudBlob>().ToList();
 
       var filteredBlobList = new List<ICloudBlob>();
@@ -342,29 +352,21 @@ public virtual ICollection<ICloudBlob> ListBlobs(CloudBlobContainer container, s
 
     #region Protected Methods
 
-    /// <summary>
-    /// Gets the deployment relative address.
-    /// </summary>
-    /// <returns>The deployment address that includes {DeploymentId}.</returns>
-    protected virtual string GetDeploymentRelativeAddress()
-    {
-      return RoleEnvironment.IsAvailable ? RoleEnvironment.DeploymentId : string.Empty;
-    }
-
     /// <summary>
     /// Gets the WebRole relative address.
     /// </summary>
     /// <returns>
     /// The WebRole address that includes {DeploymentId}/{RoleInstanceId}.
     /// </returns>
-    protected virtual string GetWebRoleRelativeAddress()
+    protected virtual string GetWebsiteRelativeAddress()
     {
       string webRoleRelativeAddress = string.Empty;
-      string deploymentRelativeAddress = this.GetDeploymentRelativeAddress();
+      var websiteName = Environment.GetEnvironmentVariable(WebsiteNameEnvVar);
 
-      if (!string.IsNullOrEmpty(deploymentRelativeAddress))
+      if (!string.IsNullOrEmpty(websiteName))
       {
-        webRoleRelativeAddress = string.Format("{0}/{1}", deploymentRelativeAddress, RoleEnvironment.CurrentRoleInstance.Id);
+        var websiteInstanceId = Environment.GetEnvironmentVariable(WebsiteInstanceIdEnvVar);
+        webRoleRelativeAddress = $"{websiteName}/{websiteInstanceId}";
       }
 
       return webRoleRelativeAddress;

src/Sitecore.Azure.Diagnostics/packages.config

@@ -4,7 +4,6 @@
   <package id="Microsoft.Data.Edm" version="5.7.0" targetFramework="net45" />
   <package id="Microsoft.Data.OData" version="5.7.0" targetFramework="net45" />
   <package id="Microsoft.Data.Services.Client" version="5.7.0" targetFramework="net45" />
-  <package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
   <package id="SC.Sitecore.Client" version="8.1.3.160519" targetFramework="net45" />
   <package id="SC.Sitecore.Kernel" version="8.1.3.160519" targetFramework="net45" />