Skip to content

Commit a1291c5

Browse files
gzubergzuber
committed
Added support for overwriting app insights endpoints for telemetry and quick pulse.
1 parent 2e96648 commit a1291c5

File tree

20 files changed

+162
-117
lines changed

20 files changed

+162
-117
lines changed

‎src/WebJobs.Script.Host/WebJobs.Script.Host.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<HintPath>..\..\packages\Microsoft.Azure.NotificationHubs.1.0.7\lib\net45-full\Microsoft.Azure.NotificationHubs.dll</HintPath>
106106
</Reference>
107107
<Reference Include="Microsoft.Azure.WebJobs, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
108-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.4.0-beta1-11751\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
108+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.4.0-beta1-11780\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
109109
</Reference>
110110
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
111111
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.3.0-beta1-10663\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
@@ -135,13 +135,13 @@
135135
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.3.0-beta1-10663\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
136136
</Reference>
137137
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
138-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.4.0-beta1-11751\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
138+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.4.0-beta1-11780\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
139139
</Reference>
140140
<Reference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
141-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.2.4.0-beta1-11751\lib\net45\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.dll</HintPath>
141+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.2.4.0-beta1-11780\lib\net45\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.dll</HintPath>
142142
</Reference>
143143
<Reference Include="Microsoft.Azure.WebJobs.ServiceBus, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
144-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.4.0-beta1-11751\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
144+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.4.0-beta1-11780\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
145145
</Reference>
146146
<Reference Include="Microsoft.Bot.Connector.DirectLine, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
147147
<HintPath>..\..\packages\Microsoft.Bot.Connector.DirectLine.3.0.0-beta\lib\net45\Microsoft.Bot.Connector.DirectLine.dll</HintPath>

‎src/WebJobs.Script.Host/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<package id="Microsoft.Azure.Mobile.Client" version="3.1.0" targetFramework="net471" />
1818
<package id="Microsoft.Azure.NotificationHubs" version="1.0.7" targetFramework="net471" />
1919
<package id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.10" targetFramework="net471" />
20-
<package id="Microsoft.Azure.WebJobs" version="2.4.0-beta1-11751" targetFramework="net471" />
21-
<package id="Microsoft.Azure.WebJobs.Core" version="2.4.0-beta1-11751" targetFramework="net471" />
20+
<package id="Microsoft.Azure.WebJobs" version="2.4.0-beta1-11780" targetFramework="net471" />
21+
<package id="Microsoft.Azure.WebJobs.Core" version="2.4.0-beta1-11780" targetFramework="net471" />
2222
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.3.0-beta1-10663" targetFramework="net471" />
2323
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta9-10663" targetFramework="net471" />
2424
<package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.15-beta" targetFramework="net471" />
@@ -28,8 +28,8 @@
2828
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.3.0-beta1-10663" targetFramework="net471" />
2929
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.3.0-beta1-10663" targetFramework="net471" />
3030
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.3.0-beta1-10663" targetFramework="net471" />
31-
<package id="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" version="2.4.0-beta1-11751" targetFramework="net471" />
32-
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.4.0-beta1-11751" targetFramework="net471" />
31+
<package id="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" version="2.4.0-beta1-11780" targetFramework="net471" />
32+
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.4.0-beta1-11780" targetFramework="net471" />
3333
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net471" />
3434
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net471" />
3535
<package id="Microsoft.Bot.Connector.DirectLine" version="3.0.0-beta" targetFramework="net471" />

‎src/WebJobs.Script.NuGet/WebJobs.Script.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<dependency id="Edge.js" version="6.11.3" />
1818
<dependency id="FSharp.Compiler.Service" version="9.0.1" />
1919
<dependency id="FSharp.Core" version="4.0.0.1" />
20-
<dependency id="Microsoft.Azure.WebJobs" version="2.4.0-beta1-11751" />
20+
<dependency id="Microsoft.Azure.WebJobs" version="2.4.0-beta1-11780" />
2121
<dependency id="Microsoft.ApplicationInsights.WindowsServer" version="2.4.1" />
2222
<dependency id="Microsoft.Azure.AppService.Proxy" version="1.0.0.3" />
2323
<dependency id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.10" />

‎src/WebJobs.Script.WebHost/App_Start/WebHostResolver.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,12 @@ private ILoggerFactory CreateDefaultLoggerFactory(WebHostSettings settings)
302302
if (!string.IsNullOrEmpty(_settingsManager.ApplicationInsightsInstrumentationKey))
303303
{
304304
var config = GetScriptHostConfiguration(settings);
305-
var clientFactory = new ScriptTelemetryClientFactory(_settingsManager.ApplicationInsightsInstrumentationKey, config.ApplicationInsightsSamplingSettings, config.LogFilter.Filter);
305+
var clientFactory = new ScriptTelemetryClientFactory(
306+
_settingsManager.ApplicationInsightsInstrumentationKey,
307+
config.ApplicationInsightsSamplingSettings,
308+
config.ApplicationInsightsIngestionEndpoint,
309+
config.ApplicationInsightsLiveEndpoint,
310+
config.LogFilter.Filter);
306311
loggerFactory.AddApplicationInsights(clientFactory);
307312
}
308313

‎src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
<HintPath>..\..\packages\Microsoft.Azure.NotificationHubs.1.0.7\lib\net45-full\Microsoft.Azure.NotificationHubs.dll</HintPath>
179179
</Reference>
180180
<Reference Include="Microsoft.Azure.WebJobs, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
181-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.4.0-beta1-11751\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
181+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.4.0-beta1-11780\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
182182
</Reference>
183183
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
184184
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.3.0-beta1-10663\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
@@ -211,16 +211,16 @@
211211
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.3.0-beta1-10663\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
212212
</Reference>
213213
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
214-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.4.0-beta1-11751\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
214+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.4.0-beta1-11780\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
215215
</Reference>
216216
<Reference Include="Microsoft.Azure.WebJobs.Logging, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
217-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.2.4.0-beta1-11751\lib\net45\Microsoft.Azure.WebJobs.Logging.dll</HintPath>
217+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.2.4.0-beta1-11780\lib\net45\Microsoft.Azure.WebJobs.Logging.dll</HintPath>
218218
</Reference>
219219
<Reference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
220-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.2.4.0-beta1-11751\lib\net45\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.dll</HintPath>
220+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.2.4.0-beta1-11780\lib\net45\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.dll</HintPath>
221221
</Reference>
222222
<Reference Include="Microsoft.Azure.WebJobs.ServiceBus, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
223-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.4.0-beta1-11751\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
223+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.4.0-beta1-11780\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
224224
</Reference>
225225
<Reference Include="Microsoft.Azure.WebSites.DataProtection, Version=0.1.6.0, Culture=neutral, processorArchitecture=MSIL">
226226
<HintPath>..\..\packages\Microsoft.Azure.WebSites.DataProtection.0.1.81-alpha\lib\net46\Microsoft.Azure.WebSites.DataProtection.dll</HintPath>

‎src/WebJobs.Script.WebHost/packages.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
<package id="Microsoft.Azure.Mobile.Client" version="3.1.0" targetFramework="net471" />
4646
<package id="Microsoft.Azure.NotificationHubs" version="1.0.7" targetFramework="net471" />
4747
<package id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.10" targetFramework="net471" />
48-
<package id="Microsoft.Azure.WebJobs" version="2.4.0-beta1-11751" targetFramework="net471" />
49-
<package id="Microsoft.Azure.WebJobs.Core" version="2.4.0-beta1-11751" targetFramework="net471" />
48+
<package id="Microsoft.Azure.WebJobs" version="2.4.0-beta1-11780" targetFramework="net471" />
49+
<package id="Microsoft.Azure.WebJobs.Core" version="2.4.0-beta1-11780" targetFramework="net471" />
5050
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.3.0-beta1-10663" targetFramework="net471" />
5151
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta9-10663" targetFramework="net471" />
5252
<package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.15-beta" targetFramework="net471" />
@@ -57,9 +57,9 @@
5757
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.3.0-beta1-10663" targetFramework="net471" />
5858
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.3.0-beta1-10663" targetFramework="net471" />
5959
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.3.0-beta1-10663" targetFramework="net471" />
60-
<package id="Microsoft.Azure.WebJobs.Logging" version="2.4.0-beta1-11751" targetFramework="net471" />
61-
<package id="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" version="2.4.0-beta1-11751" targetFramework="net471" />
62-
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.4.0-beta1-11751" targetFramework="net471" />
60+
<package id="Microsoft.Azure.WebJobs.Logging" version="2.4.0-beta1-11780" targetFramework="net471" />
61+
<package id="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" version="2.4.0-beta1-11780" targetFramework="net471" />
62+
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.4.0-beta1-11780" targetFramework="net471" />
6363
<package id="Microsoft.Azure.WebSites.DataProtection" version="0.1.81-alpha" targetFramework="net471" />
6464
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net471" />
6565
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net471" />

‎src/WebJobs.Script/Config/ScriptHostConfiguration.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,16 @@ public ScriptHostConfiguration()
119119
/// </summary>
120120
public SamplingPercentageEstimatorSettings ApplicationInsightsSamplingSettings { get; set; }
121121

122+
/// <summary>
123+
/// Gets or sets the IngestionEndpoint to be used for Application Insights <see cref="ServerTelemetryChannel"/>
124+
/// </summary>
125+
public string ApplicationInsightsIngestionEndpoint { get; set; }
126+
127+
/// <summary>
128+
/// Gets or sets the LiveEndpoint to be used for Application Insights <see cref="QuickPulseTelemetryModule"/>
129+
/// </summary>
130+
public string ApplicationInsightsLiveEndpoint { get; set; }
131+
122132
/// <summary>
123133
/// Gets or sets the <see cref="ILoggerFactoryBuilder"/> used to register <see cref="ILoggerProvider"/>s with
124134
/// the host's <see cref="ILoggerFactory"/>.

‎src/WebJobs.Script/Diagnostics/DefaultLoggerFactoryBuilder.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,12 @@ public virtual void AddLoggerProviders(ILoggerFactory factory, ScriptHostConfigu
2828
metricsLogger?.LogEvent(MetricEventNames.ApplicationInsightsEnabled);
2929

3030
ITelemetryClientFactory clientFactory = scriptConfig.HostConfig.GetService<ITelemetryClientFactory>() ??
31-
new ScriptTelemetryClientFactory(settingsManager.ApplicationInsightsInstrumentationKey, scriptConfig.ApplicationInsightsSamplingSettings, scriptConfig.LogFilter.Filter);
31+
new ScriptTelemetryClientFactory(
32+
settingsManager.ApplicationInsightsInstrumentationKey,
33+
scriptConfig.ApplicationInsightsSamplingSettings,
34+
scriptConfig.ApplicationInsightsIngestionEndpoint,
35+
scriptConfig.ApplicationInsightsLiveEndpoint,
36+
scriptConfig.LogFilter.Filter);
3237

3338
scriptConfig.HostConfig.LoggerFactory.AddApplicationInsights(clientFactory);
3439
}

‎src/WebJobs.Script/Host/ScriptHost.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1793,6 +1793,16 @@ internal static void ApplyApplicationInsightsConfig(JObject configJson, ScriptHo
17931793
}
17941794
}
17951795
}
1796+
1797+
if (configSection.TryGetValue("ingestionEndpoint", out value))
1798+
{
1799+
scriptConfig.ApplicationInsightsIngestionEndpoint = (string)value;
1800+
}
1801+
1802+
if (configSection.TryGetValue("liveEndpoint", out value))
1803+
{
1804+
scriptConfig.ApplicationInsightsLiveEndpoint = (string)value;
1805+
}
17961806
}
17971807
}
17981808

‎src/WebJobs.Script/Host/ScriptTelemetryClientFactory.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,21 @@ public ScriptTelemetryClientFactory(string instrumentationKey, SamplingPercentag
2020
{
2121
}
2222

23+
public ScriptTelemetryClientFactory(
24+
string instrumentationKey,
25+
SamplingPercentageEstimatorSettings samplingSettings,
26+
string ingestionEndpoint,
27+
string liveEndpoint,
28+
Func<string, LogLevel, bool> filter)
29+
: base(
30+
instrumentationKey,
31+
samplingSettings,
32+
ingestionEndpoint,
33+
liveEndpoint,
34+
filter)
35+
{
36+
}
37+
2338
public override TelemetryClient Create()
2439
{
2540
TelemetryClient client = base.Create();

0 commit comments

Comments
 (0)