Add environment and has website instance ID flag to events (#203)

Author: Charles-Gagnon

src/Telemetry/Telemetry.cs

@@ -57,11 +57,32 @@ public void Initialize(IConfiguration config, ILoggerFactory loggerFactory)
             CurrentSessionId = Guid.NewGuid().ToString();
 
             string productVersion = typeof(Telemetry).Assembly.GetName().Version.ToString();
-            //initialize in task to offload to parallel thread
-            this._trackEventTask = Task.Factory.StartNew(() => this.InitializeTelemetry(productVersion));
+            // initialize in task to offload to parallel thread
+            this._trackEventTask = Task.Factory.StartNew(() => this.InitializeTelemetry(productVersion, config));
             this._initialized = true;
         }
 
+        private void InitializeTelemetry(string productVersion, IConfiguration config)
+        {
+            try
+            {
+                var telemetryConfig = new TelemetryConfiguration(InstrumentationKey);
+                this._client = new TelemetryClient(telemetryConfig);
+                this._client.Context.Session.Id = CurrentSessionId;
+                this._client.Context.Device.OperatingSystem = RuntimeInformation.OSDescription;
+
+                this._commonProperties = new TelemetryCommonProperties(productVersion, this._client, config).GetTelemetryCommonProperties();
+                this._commonMeasurements = new Dictionary<string, double>();
+            }
+            catch (Exception e)
+            {
+                this._client.TrackException(e);
+                this._client = null;
+                // we don't want to fail the tool if telemetry fails.
+                Debug.Fail(e.ToString());
+            }
+        }
+
         public bool Enabled { get; private set; }
 
         public void TrackEvent(TelemetryEventName eventName, IDictionary<string, string> properties = null,
@@ -177,27 +198,6 @@ public void TrackError(TelemetryErrorName errorName, Exception ex, IDictionary<s
             }
         }
 
-        private void InitializeTelemetry(string productVersion)
-        {
-            try
-            {
-                var config = new TelemetryConfiguration(InstrumentationKey);
-                this._client = new TelemetryClient(config);
-                this._client.Context.Session.Id = CurrentSessionId;
-                this._client.Context.Device.OperatingSystem = RuntimeInformation.OSDescription;
-
-                this._commonProperties = new TelemetryCommonProperties(productVersion, this._client).GetTelemetryCommonProperties();
-                this._commonMeasurements = new Dictionary<string, double>();
-            }
-            catch (Exception e)
-            {
-                this._client.TrackException(e);
-                this._client = null;
-                // we don't want to fail the tool if telemetry fails.
-                Debug.Fail(e.ToString());
-            }
-        }
-
         private void TrackEventTask(
             string eventName,
             IDictionary<string, string> properties,

src/Telemetry/TelemetryCommonProperties.cs

@@ -5,24 +5,34 @@
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using Microsoft.ApplicationInsights;
+using Microsoft.Extensions.Configuration;
 
 namespace Microsoft.Azure.WebJobs.Extensions.Sql.Telemetry
 {
     public class TelemetryCommonProperties
     {
         private readonly string _productVersion;
+        private readonly string _azureFunctionsEnvironment;
+        private readonly bool _hasWebsiteInstanceId;
 
-        public TelemetryCommonProperties(string productVersion, TelemetryClient telemetryClient)
+        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, "") != "";
         }
 
         private readonly UserLevelCacheWriter _userLevelCacheWriter;
 
         private const string OSVersion = "OSVersion";
         private const string ProductVersion = "ProductVersion";
         private const string MachineId = "MachineId";
+        private const string AzureFunctionsEnvironment = "AzureFunctionsEnvironment";
+        private const string HasWebsiteInstanceId = "HasWebsiteInstanceId";
+
+        private const string AZURE_FUNCTIONS_ENVIRONMENT_KEY = "AZURE_FUNCTIONS_ENVIRONMENT";
+        private const string WEBSITE_INSTANCE_ID_KEY = "WEBSITE_INSTANCE_ID";
 
         public Dictionary<string, string> GetTelemetryCommonProperties()
         {
@@ -31,6 +41,8 @@ public Dictionary<string, string> GetTelemetryCommonProperties()
                 {OSVersion, RuntimeInformation.OSDescription},
                 {ProductVersion, this._productVersion},
                 {MachineId, this.GetMachineId()},
+                {AzureFunctionsEnvironment, this._azureFunctionsEnvironment},
+                {HasWebsiteInstanceId, this._hasWebsiteInstanceId.ToString()}
             };
         }