Merge pull request #380 from Azure/chgagnon/addProperties

Add site event properties

Author: Charles-Gagnon

src/Telemetry/TelemetryCommonProperties.cs

@@ -14,14 +14,18 @@ public class TelemetryCommonProperties
         private readonly string _productVersion;
         private readonly string _azureFunctionsEnvironment;
         private readonly bool _hasWebsiteInstanceId;
+        private readonly string _websiteInstanceId;
+        private readonly string _websiteSiteName;
         private readonly string _functionsWorkerRuntime;
 
         public TelemetryCommonProperties(string productVersion, TelemetryClient telemetryClient, IConfiguration config)
         {
             this._productVersion = productVersion;
             this._userLevelCacheWriter = new UserLevelCacheWriter(telemetryClient);
             this._azureFunctionsEnvironment = config.GetValue(AZURE_FUNCTIONS_ENVIRONMENT_KEY, "");
-            this._hasWebsiteInstanceId = config.GetValue(WEBSITE_INSTANCE_ID_KEY, "") != "";
+            this._websiteInstanceId = config.GetValue(WEBSITE_INSTANCE_ID_KEY, "");
+            this._hasWebsiteInstanceId = !string.IsNullOrEmpty(this._websiteInstanceId);
+            this._websiteSiteName = config.GetValue(WEBSITE_SITE_NAME_KEY, "");
             this._functionsWorkerRuntime = config.GetValue(FUNCTIONS_WORKER_RUNTIME_KEY, "");
         }
 
@@ -32,10 +36,13 @@ public TelemetryCommonProperties(string productVersion, TelemetryClient telemetr
         private const string MachineId = "MachineId";
         private const string AzureFunctionsEnvironment = "AzureFunctionsEnvironment";
         private const string HasWebsiteInstanceId = "HasWebsiteInstanceId";
+        private const string WebsiteInstanceId = "WebsiteInstanceId";
+        private const string WebsiteSiteName = "WebsiteSiteName";
         private const string FunctionsWorkerRuntime = "FunctionsWorkerRuntime";
 
         private const string AZURE_FUNCTIONS_ENVIRONMENT_KEY = "AZURE_FUNCTIONS_ENVIRONMENT";
         private const string WEBSITE_INSTANCE_ID_KEY = "WEBSITE_INSTANCE_ID";
+        private const string WEBSITE_SITE_NAME_KEY = "WEBSITE_SITE_NAME";
         private const string FUNCTIONS_WORKER_RUNTIME_KEY = "FUNCTIONS_WORKER_RUNTIME";
 
         public Dictionary<string, string> GetTelemetryCommonProperties()
@@ -47,6 +54,8 @@ public Dictionary<string, string> GetTelemetryCommonProperties()
                 {MachineId, this.GetMachineId()},
                 {AzureFunctionsEnvironment, this._azureFunctionsEnvironment},
                 {HasWebsiteInstanceId, this._hasWebsiteInstanceId.ToString()},
+                {WebsiteInstanceId, this._websiteInstanceId },
+                {WebsiteSiteName, this._websiteSiteName},
                 {FunctionsWorkerRuntime, this._functionsWorkerRuntime}
             };
         }