Updating application and host id to use host name

fabiocav · fabiocav · commit 1a2520a3ee0d · 2016-11-02T10:33:06.000-07:00
diff --git a/src/WebJobs.Script.WebHost/App_Start/WebHostResolver.cs b/src/WebJobs.Script.WebHost/App_Start/WebHostResolver.cs
@@ -160,8 +160,8 @@ private static ScriptHostConfiguration GetScriptHostConfiguration(string scriptP
                 FileLoggingMode = FileLoggingMode.DebugOnly
             };
 
-            // If running on Azure Web App, derive the host ID from the site name
-            string hostId = _settingsManager.GetSetting(EnvironmentSettingNames.AzureWebsiteName);
+            // If running on Azure Web App, derive the host ID from the default subdomain
+            string hostId = _settingsManager.AzureWebsiteDefaultSubdomain;
             if (!String.IsNullOrEmpty(hostId))
             {
                 // Truncate to the max host name length if needed
diff --git a/src/WebJobs.Script.WebHost/Diagnostics/MetricsEventManager.cs b/src/WebJobs.Script.WebHost/Diagnostics/MetricsEventManager.cs
@@ -15,7 +15,7 @@
 namespace Microsoft.Azure.WebJobs.Script.WebHost.Diagnostics
 {
     public class MetricsEventManager : IDisposable
-    {        
+    {
         private static FunctionActivityTracker instance = null;
         private readonly IEventGenerator _eventGenerator;
         private readonly int _functionActivityFlushIntervalSeconds;
@@ -31,7 +31,7 @@ public class MetricsEventManager : IDisposable
         public MetricsEventManager(ScriptSettingsManager settingsManager, IEventGenerator generator, int functionActivityFlushIntervalSeconds, int metricsFlushIntervalMS = DefaultFlushIntervalMS)
         {
             // we read these in the ctor (not static ctor) since it can change on the fly
-            appName = GetNormalizedString(settingsManager.GetSetting(EnvironmentSettingNames.AzureWebsiteName)) ?? string.Empty;
+            appName = GetNormalizedString(settingsManager.AzureWebsiteDefaultSubdomain);
             subscriptionId = Utility.GetSubscriptionId() ?? string.Empty;
 
             _eventGenerator = generator;
@@ -74,7 +74,7 @@ public void EndEvent(object eventHandle)
                 evt.Duration = DateTime.UtcNow - evt.Timestamp;
                 long latencyMS = (long)evt.Duration.TotalMilliseconds;
 
-                QueuedEvents.AddOrUpdate(evt.EventName, 
+                QueuedEvents.AddOrUpdate(evt.EventName,
                     (name) =>
                     {
                         // create the default event that will be added
@@ -87,7 +87,7 @@ public void EndEvent(object eventHandle)
                             Average = latencyMS,
                             Count = 1
                         };
-                    }, 
+                    },
                     (name, evtToUpdate) =>
                     {
                         // Aggregate into the existing event
@@ -110,7 +110,7 @@ public void LogEvent(string eventName)
                 throw new ArgumentNullException(nameof(eventName));
             }
 
-            QueuedEvents.AddOrUpdate(eventName, 
+            QueuedEvents.AddOrUpdate(eventName,
                 (name) =>
                 {
                     // create the default event that will be added
@@ -120,7 +120,7 @@ public void LogEvent(string eventName)
                         EventName = eventName.ToLowerInvariant(),
                         Count = 1
                     };
-                }, 
+                },
                 (name, evtToUpdate) =>
                 {
                     // update the existing event
@@ -180,7 +180,7 @@ internal void HostStarted(ScriptHost scriptHost)
                         ? SerializeBindings(function.Metadata.InputBindings)
                         : GetNormalizedString(null),
                     function.Metadata != null
-                        ? SerializeBindings(function.Metadata.OutputBindings) 
+                        ? SerializeBindings(function.Metadata.OutputBindings)
                         : GetNormalizedString(null),
                     function.Metadata.ScriptType.ToString(),
                     function.Metadata != null ? function.Metadata.IsDisabled : false);
@@ -278,7 +278,7 @@ internal FunctionActivityTracker(IEventGenerator generator, int functionActivity
                             while (!_etwTaskCancellationSource.Token.IsCancellationRequested)
                             {
                                 RaiseMetricsPerFunctionEvent();
-                                
+
                                 if (currentSecond >= _functionActivityFlushInterval)
                                 {
                                     RaiseFunctionMetricEvents();
@@ -300,7 +300,7 @@ internal FunctionActivityTracker(IEventGenerator generator, int functionActivity
                     },
                     _etwTaskCancellationSource.Token);
             }
-            
+
             internal bool IsActive
             {
                 get
@@ -309,12 +309,12 @@ internal bool IsActive
                 }
             }
 
-            internal IEventGenerator MetricsEventGenerator { get; private set; }            
+            internal IEventGenerator MetricsEventGenerator { get; private set; }
 
             protected virtual void Dispose(bool disposing)
             {
                 if (disposing)
-                {                    
+                {
                     _etwTaskCancellationSource.Dispose();
                 }
             }
@@ -458,7 +458,7 @@ private List<FunctionMetrics> GetMetricsQueueSnapshot()
             }
 
             private class RunningFunctionInfo
-            {                
+            {
                 public RunningFunctionInfo(string name, Guid invocationId, DateTime startTime, bool success, ExecutionStage executionStage = ExecutionStage.InProgress)
                 {
                     Name = name;
diff --git a/src/WebJobs.Script.WebHost/Diagnostics/SystemTraceWriter.cs b/src/WebJobs.Script.WebHost/Diagnostics/SystemTraceWriter.cs
@@ -14,15 +14,15 @@ public class SystemTraceWriter : TraceWriter
         private ScriptSettingsManager _settingsManager;
         private string _appName;
         private string _subscriptionId;
-        
+
         public SystemTraceWriter(TraceLevel level) : this(new EventGenerator(), ScriptSettingsManager.Instance, level)
         {
         }
 
         public SystemTraceWriter(IEventGenerator eventGenerator, ScriptSettingsManager settingsManager, TraceLevel level) : base(level)
         {
             _settingsManager = settingsManager;
-            _appName = _settingsManager.GetSetting(EnvironmentSettingNames.AzureWebsiteName);
+            _appName = _settingsManager.AzureWebsiteDefaultSubdomain;
             _subscriptionId = Utility.GetSubscriptionId();
             _eventGenerator = eventGenerator;
         }
diff --git a/src/WebJobs.Script/Config/ScriptSettingsManager.cs b/src/WebJobs.Script/Config/ScriptSettingsManager.cs
@@ -2,12 +2,14 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System;
+using System.Collections.Concurrent;
 
 namespace Microsoft.Azure.WebJobs.Script.Config
 {
     public class ScriptSettingsManager
     {
         private static ScriptSettingsManager _instance = new ScriptSettingsManager();
+        private readonly ConcurrentDictionary<string, string> _settingsCache = new ConcurrentDictionary<string, string>();
 
         protected ScriptSettingsManager()
         {
@@ -23,8 +25,29 @@ public static ScriptSettingsManager Instance
 
         public bool IsRemoteDebuggingEnabled => !string.IsNullOrEmpty(GetSetting(EnvironmentSettingNames.RemoteDebuggingPort));
 
+        public string AzureWebsiteDefaultSubdomain
+        {
+            get
+            {
+                return _settingsCache.GetOrAdd(nameof(AzureWebsiteDefaultSubdomain), k =>
+                {
+                    string siteHostName = GetSetting(EnvironmentSettingNames.AzureWebsiteHostName);
+
+                    int? periodIndex = siteHostName?.IndexOf('.');
+
+                    if (periodIndex != null && periodIndex > 0)
+                    {
+                        return siteHostName.Substring(0, periodIndex.Value);
+                    }
+
+                    return null;
+                });
+            }
+        }
+
         public virtual void Reset()
-        {            
+        {
+            _settingsCache.Clear();
         }
 
         public virtual string GetSetting(string settingKey)
diff --git a/src/WebJobs.Script/EnvironmentSettingNames.cs b/src/WebJobs.Script/EnvironmentSettingNames.cs
@@ -8,6 +8,7 @@ namespace Microsoft.Azure.WebJobs.Script
     public static class EnvironmentSettingNames
     {
         public const string AzureWebsiteName = "WEBSITE_SITE_NAME";
+        public const string AzureWebsiteHostName = "WEBSITE_HOSTNAME";
         public const string AzureWebsiteOwnerName = "WEBSITE_OWNER_NAME";
         public const string AzureWebsiteInstanceId = "WEBSITE_INSTANCE_ID";
         public const string AzureWebsiteSku = "WEBSITE_SKU";
diff --git a/test/WebJobs.Script.Tests/SystemTraceWriterTests.cs b/test/WebJobs.Script.Tests/SystemTraceWriterTests.cs
@@ -27,7 +27,7 @@ public SystemTraceWriterTests()
             _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteOwnerName, $"{_subscriptionId}+westuswebspace");
 
             _websiteName = "functionstest";
-            _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteName, _websiteName);
+            _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteHostName, $"{_websiteName}.azurewebsites.net");
 
             _mockEventGenerator = new Mock<IEventGenerator>(MockBehavior.Strict);
             _traceWriter = new SystemTraceWriter(_mockEventGenerator.Object, _settingsManager, TraceLevel.Verbose);
@@ -76,7 +76,7 @@ public void Trace_Error_EmitsExpectedEvent()
         public void Dispose()
         {
             _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteOwnerName, null);
-            _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteName, null);
+            _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteHostName, null);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`namespace Microsoft.Azure.WebJobs.Script.WebHost.Diagnostics`
`16`	`16`	`{`
`17`	`17`	`public class MetricsEventManager : IDisposable`
`18`		`- {`
	`18`	`+ {`
`19`	`19`	`private static FunctionActivityTracker instance = null;`
`20`	`20`	`private readonly IEventGenerator _eventGenerator;`
`21`	`21`	`private readonly int _functionActivityFlushIntervalSeconds;`
`@@ -31,7 +31,7 @@ public class MetricsEventManager : IDisposable`
`31`	`31`	`public MetricsEventManager(ScriptSettingsManager settingsManager, IEventGenerator generator, int functionActivityFlushIntervalSeconds, int metricsFlushIntervalMS = DefaultFlushIntervalMS)`
`32`	`32`	`{`
`33`	`33`	`// we read these in the ctor (not static ctor) since it can change on the fly`
`34`		`- appName = GetNormalizedString(settingsManager.GetSetting(EnvironmentSettingNames.AzureWebsiteName)) ?? string.Empty;`
	`34`	`+ appName = GetNormalizedString(settingsManager.AzureWebsiteDefaultSubdomain);`
`35`	`35`	`subscriptionId = Utility.GetSubscriptionId() ?? string.Empty;`
`36`	`36`
`37`	`37`	`_eventGenerator = generator;`
`@@ -74,7 +74,7 @@ public void EndEvent(object eventHandle)`
`74`	`74`	`evt.Duration = DateTime.UtcNow - evt.Timestamp;`
`75`	`75`	`long latencyMS = (long)evt.Duration.TotalMilliseconds;`
`76`	`76`
`77`		`- QueuedEvents.AddOrUpdate(evt.EventName,`
	`77`	`+ QueuedEvents.AddOrUpdate(evt.EventName,`
`78`	`78`	`(name) =>`
`79`	`79`	`{`
`80`	`80`	`// create the default event that will be added`
`@@ -87,7 +87,7 @@ public void EndEvent(object eventHandle)`
`87`	`87`	`Average = latencyMS,`
`88`	`88`	`Count = 1`
`89`	`89`	`};`
`90`		`- },`
	`90`	`+ },`
`91`	`91`	`(name, evtToUpdate) =>`
`92`	`92`	`{`
`93`	`93`	`// Aggregate into the existing event`
`@@ -110,7 +110,7 @@ public void LogEvent(string eventName)`
`110`	`110`	`throw new ArgumentNullException(nameof(eventName));`
`111`	`111`	`}`
`112`	`112`
`113`		`- QueuedEvents.AddOrUpdate(eventName,`
	`113`	`+ QueuedEvents.AddOrUpdate(eventName,`
`114`	`114`	`(name) =>`
`115`	`115`	`{`
`116`	`116`	`// create the default event that will be added`
`@@ -120,7 +120,7 @@ public void LogEvent(string eventName)`
`120`	`120`	`EventName = eventName.ToLowerInvariant(),`
`121`	`121`	`Count = 1`
`122`	`122`	`};`
`123`		`- },`
	`123`	`+ },`
`124`	`124`	`(name, evtToUpdate) =>`
`125`	`125`	`{`
`126`	`126`	`// update the existing event`
`@@ -180,7 +180,7 @@ internal void HostStarted(ScriptHost scriptHost)`
`180`	`180`	`? SerializeBindings(function.Metadata.InputBindings)`
`181`	`181`	`: GetNormalizedString(null),`
`182`	`182`	`function.Metadata != null`
`183`		`- ? SerializeBindings(function.Metadata.OutputBindings)`
	`183`	`+ ? SerializeBindings(function.Metadata.OutputBindings)`
`184`	`184`	`: GetNormalizedString(null),`
`185`	`185`	`function.Metadata.ScriptType.ToString(),`
`186`	`186`	`function.Metadata != null ? function.Metadata.IsDisabled : false);`
`@@ -278,7 +278,7 @@ internal FunctionActivityTracker(IEventGenerator generator, int functionActivity`
`278`	`278`	`while (!_etwTaskCancellationSource.Token.IsCancellationRequested)`
`279`	`279`	`{`
`280`	`280`	`RaiseMetricsPerFunctionEvent();`
`281`		`-`
	`281`	`+`
`282`	`282`	`if (currentSecond >= _functionActivityFlushInterval)`
`283`	`283`	`{`
`284`	`284`	`RaiseFunctionMetricEvents();`
`@@ -300,7 +300,7 @@ internal FunctionActivityTracker(IEventGenerator generator, int functionActivity`
`300`	`300`	`},`
`301`	`301`	`_etwTaskCancellationSource.Token);`
`302`	`302`	`}`
`303`		`-`
	`303`	`+`
`304`	`304`	`internal bool IsActive`
`305`	`305`	`{`
`306`	`306`	`get`
`@@ -309,12 +309,12 @@ internal bool IsActive`
`309`	`309`	`}`
`310`	`310`	`}`
`311`	`311`
`312`		`- internal IEventGenerator MetricsEventGenerator { get; private set; }`
	`312`	`+ internal IEventGenerator MetricsEventGenerator { get; private set; }`
`313`	`313`
`314`	`314`	`protected virtual void Dispose(bool disposing)`
`315`	`315`	`{`
`316`	`316`	`if (disposing)`
`317`		`- {`
	`317`	`+ {`
`318`	`318`	`_etwTaskCancellationSource.Dispose();`
`319`	`319`	`}`
`320`	`320`	`}`
`@@ -458,7 +458,7 @@ private List<FunctionMetrics> GetMetricsQueueSnapshot()`
`458`	`458`	`}`
`459`	`459`
`460`	`460`	`private class RunningFunctionInfo`
`461`		`- {`
	`461`	`+ {`
`462`	`462`	`public RunningFunctionInfo(string name, Guid invocationId, DateTime startTime, bool success, ExecutionStage executionStage = ExecutionStage.InProgress)`
`463`	`463`	`{`
`464`	`464`	`Name = name;`
Original file line number	Diff line number	Diff line change
`@@ -14,15 +14,15 @@ public class SystemTraceWriter : TraceWriter`
`14`	`14`	`private ScriptSettingsManager _settingsManager;`
`15`	`15`	`private string _appName;`
`16`	`16`	`private string _subscriptionId;`
`17`		`-`
	`17`	`+`
`18`	`18`	`public SystemTraceWriter(TraceLevel level) : this(new EventGenerator(), ScriptSettingsManager.Instance, level)`
`19`	`19`	`{`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public SystemTraceWriter(IEventGenerator eventGenerator, ScriptSettingsManager settingsManager, TraceLevel level) : base(level)`
`23`	`23`	`{`
`24`	`24`	`_settingsManager = settingsManager;`
`25`		`- _appName = _settingsManager.GetSetting(EnvironmentSettingNames.AzureWebsiteName);`
	`25`	`+ _appName = _settingsManager.AzureWebsiteDefaultSubdomain;`
`26`	`26`	`_subscriptionId = Utility.GetSubscriptionId();`
`27`	`27`	`_eventGenerator = eventGenerator;`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ namespace Microsoft.Azure.WebJobs.Script`
`8`	`8`	`public static class EnvironmentSettingNames`
`9`	`9`	`{`
`10`	`10`	`public const string AzureWebsiteName = "WEBSITE_SITE_NAME";`
	`11`	`+ public const string AzureWebsiteHostName = "WEBSITE_HOSTNAME";`
`11`	`12`	`public const string AzureWebsiteOwnerName = "WEBSITE_OWNER_NAME";`
`12`	`13`	`public const string AzureWebsiteInstanceId = "WEBSITE_INSTANCE_ID";`
`13`	`14`	`public const string AzureWebsiteSku = "WEBSITE_SKU";`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public SystemTraceWriterTests()`
`27`	`27`	`_settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteOwnerName, $"{_subscriptionId}+westuswebspace");`
`28`	`28`
`29`	`29`	`_websiteName = "functionstest";`
`30`		`- _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteName, _websiteName);`
	`30`	`+ _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteHostName, $"{_websiteName}.azurewebsites.net");`
`31`	`31`
`32`	`32`	`_mockEventGenerator = new Mock<IEventGenerator>(MockBehavior.Strict);`
`33`	`33`	`_traceWriter = new SystemTraceWriter(_mockEventGenerator.Object, _settingsManager, TraceLevel.Verbose);`
`@@ -76,7 +76,7 @@ public void Trace_Error_EmitsExpectedEvent()`
`76`	`76`	`public void Dispose()`
`77`	`77`	`{`
`78`	`78`	`_settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteOwnerName, null);`
`79`		`- _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteName, null);`
	`79`	`+ _settingsManager.SetSetting(EnvironmentSettingNames.AzureWebsiteHostName, null);`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`	`}`