Merge pull request #116 from Microsoft/develop

Merge develop to master

Author: upendras

NuGet.config

@@ -2,7 +2,8 @@
 <configuration>
   <packageSources>
     <add key="ASP.NET 5 Dev" value="https://www.myget.org/F/aspnetvnext/" />
-    <add key="ASP.NET 5" value="https://www.myget.org/F/aspnetrelease/api/v2/" />
-    <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
+    <add key="ASP.NET 5" value="https://www.myget.org/F/aspnetrelease/" />
+    <add key="nuget.org feed" value="https://www.nuget.org/api/v2/" />
   </packageSources>
+  <disabledPackageSources />
 </configuration>

src/Microsoft.ApplicationInsights.AspNet/Extensions/ApplicationInsightsExtensions.cs

@@ -66,7 +66,7 @@ public static void AddApplicationInsightsTelemetry(this IServiceCollection servi
 
         public static IConfigurationBuilder AddApplicationInsightsSettings(this IConfigurationBuilder configurationSourceRoot, bool? developerMode = null, string endpointAddress = null, string instrumentationKey = null)
         {
-            var telemetryConfigurationSource = new MemoryConfigurationSource();
+            var telemetryConfigurationSource = new MemoryConfigurationProvider();
             bool wasAnythingSet = false;
 
             if (developerMode != null)

src/Microsoft.ApplicationInsights.AspNet/TelemetryInitializers/ClientIpHeaderTelemetryInitializer.cs

@@ -136,7 +136,7 @@ protected override void OnInitializeTelemetry(HttpContext platformContext, Reque
 
                 if (string.IsNullOrEmpty(resultIp))
                 {
-                    var connectionFeature = platformContext.GetFeature<IHttpConnectionFeature>();
+                    var connectionFeature = platformContext.Features.Get<IHttpConnectionFeature>();
 
                     if (connectionFeature != null)
                     {

src/Microsoft.ApplicationInsights.AspNet/TelemetryInitializers/OperationNameTelemetryInitializer.cs

@@ -1,28 +1,35 @@
 namespace Microsoft.ApplicationInsights.AspNet.TelemetryInitializers
 {
     using System;
+    using System.Diagnostics.Tracing;
     using System.Linq;
 
     using Microsoft.ApplicationInsights.Channel;
     using Microsoft.ApplicationInsights.DataContracts;
     using Microsoft.AspNet.Hosting;
     using Microsoft.AspNet.Http;
     using Microsoft.AspNet.Mvc;
+    using Microsoft.AspNet.Mvc.Abstractions;
     using Microsoft.AspNet.Mvc.Routing;
     using Microsoft.AspNet.Routing;
     using Microsoft.Framework.DependencyInjection;
-    using Microsoft.Framework.Notification;
-
+    using Microsoft.Framework.TelemetryAdapter;
+    
     public class OperationNameTelemetryInitializer : TelemetryInitializerBase
     {
         public const string BeforeActionNotificationName = "Microsoft.AspNet.Mvc.BeforeAction";
 
-        public OperationNameTelemetryInitializer(IHttpContextAccessor httpContextAccessor, INotifier notifier) 
+        public OperationNameTelemetryInitializer(IHttpContextAccessor httpContextAccessor, TelemetryListener telemetryListener) 
             : base(httpContextAccessor)
         {
-            if (notifier != null)
+            if (telemetryListener == null)
+            {
+                throw new ArgumentNullException("telemetryListener");
+            }
+
+            if (telemetryListener != null)
             {
-                notifier.EnlistTarget(this);
+                telemetryListener.SubscribeWithAdapter(this);
             }
         }
 
@@ -49,7 +56,7 @@ protected override void OnInitializeTelemetry(HttpContext platformContext, Reque
             }
         }
 
-        [NotificationName(BeforeActionNotificationName)]
+        [TelemetryName(BeforeActionNotificationName)]
         public void OnBeforeAction(ActionDescriptor actionDescriptor, HttpContext httpContext, RouteData routeData)
         {
             string name = this.GetNameFromRouteContext(routeData);

src/Microsoft.ApplicationInsights.AspNet/TelemetryInitializers/WebSessionTelemetryInitializer.cs

@@ -40,7 +40,7 @@ private static void UpdateRequestTelemetryFromPlatformContext(RequestTelemetry r
                 var sessionCookieValue = platformContext.Request.Cookies[WebSessionCookieName];
                 if (!string.IsNullOrEmpty(sessionCookieValue))
                 {
-                    var sessionCookieParts = sessionCookieValue.Split('|');
+                    var sessionCookieParts = ((string)sessionCookieValue).Split('|');
                     if (sessionCookieParts.Length > 0)
                     {
                         // Currently SessionContext takes in only SessionId. 

src/Microsoft.ApplicationInsights.AspNet/TelemetryInitializers/WebUserTelemetryInitializer.cs

@@ -46,7 +46,7 @@ private static void UpdateRequestTelemetryFromPlatformContext(RequestTelemetry r
                 var userCookieValue = platformContext.Request.Cookies[WebUserCookieName];
                 if (!string.IsNullOrEmpty(userCookieValue))
                 {
-                    var userCookieParts = userCookieValue.Split('|');
+                    var userCookieParts = ((string)userCookieValue).Split('|');
                     if (userCookieParts.Length >= 2)
                     {
                         // todo: add tracing

src/Microsoft.ApplicationInsights.AspNet/project.json

@@ -2,7 +2,7 @@
     "title": "Application Insights for ASP.NET 5 Web Applications",
     "description": "Application Insights for ASP.NET 5 web applications. See http://go.microsoft.com/fwlink/?LinkID=510752 for more information.",
     "authors": [ "Microsoft" ],
-    "version": "1.0.0-beta7-*",
+    "version": "1.0.0-beta8-*",
     "copyright": "Copyright © Microsoft. All Rights Reserved.",
     "projectUrl": "https://github.com/Microsoft/ApplicationInsights-aspnet5",
     "licenseUrl": "http://go.microsoft.com/fwlink/?LinkID=510709",
@@ -11,13 +11,13 @@
     "tags": [ "Analytics", "ApplicationInsights", "Telemetry", "AppInsights", "ASP.NET 5" ],
     "dependencies": {
         "Microsoft.ApplicationInsights": "1.1.1-beta",
-        "Microsoft.AspNet.Hosting.Abstractions": "1.0.0-beta7-*",
-        "Microsoft.AspNet.Http.Abstractions": "1.0.0-beta7-*",
-        "Microsoft.AspNet.Http.Features": "1.0.0-beta7-*",
-        "Microsoft.AspNet.Mvc": "6.0.0-beta7-*",
-        "Microsoft.Framework.Logging.Abstractions": "1.0.0-beta7-*",
-        "Microsoft.Framework.Configuration": "1.0.0-beta7-*",
-        "Microsoft.Framework.Notification": "1.0.0-beta7-*"
+        "Microsoft.AspNet.Hosting.Abstractions": "1.0.0-beta8-*",
+        "Microsoft.AspNet.Http.Abstractions": "1.0.0-beta8-*",
+        "Microsoft.AspNet.Http.Features": "1.0.0-beta8-*",
+        "Microsoft.AspNet.Mvc": "6.0.0-beta8-*",
+        "Microsoft.Framework.Logging.Abstractions": "1.0.0-beta8-*",
+        "Microsoft.Framework.Configuration": "1.0.0-beta8-*",
+        "Microsoft.Framework.TelemetryAdapter": "1.0.0-beta8-*"
     },
 
     "frameworks": {
@@ -27,7 +27,7 @@
                 "define": [ "dnxcore50" ]
             },
             "dependencies": {
-              "System.Net.NameResolution": "4.0.0-beta-22816",
+              "System.Net.NameResolution": "4.0.0-beta-23302",
               "System.Reflection": "4.0.10-beta-23109"
             }
         }

test/EmptyApp.FunctionalTests/EmptyApp.FunctionalTests.xproj

@@ -19,4 +19,5 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="..\..\Common.targets" />
 </Project>

test/EmptyApp.FunctionalTests/Startup.cs

@@ -31,7 +31,7 @@ public void ConfigureServices(IServiceCollection services)
         public void Configure(IApplicationBuilder app)
         {
             app.UseApplicationInsightsRequestTelemetry();
-            app.UseErrorPage(new ErrorPageOptions());
+            app.UseDeveloperExceptionPage(new ErrorPageOptions());
             app.UseApplicationInsightsExceptionTelemetry();
 
             app.Use(next =>