Addressing synchronization issues in InMemoryStorage class with the f…

.gitignore

@@ -233,5 +233,9 @@ $RECYCLE.BIN/
 *.msp
 
 project.lock.json
+_SystemWeb_project.lock.json
 .vs
 /src/Glimpse.*.Sample/wwwroot/lib/
+
+# Temp whilst we are prototyping SystemWebAdapter
+!wrap/**

Glimpse.SystemWeb.sln

@@ -0,0 +1,61 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6AD4BC4F-CA12-4EE0-A6D5-BBE4B9CC56EC}"
+	ProjectSection(SolutionItems) = preProject
+		src\readme.md = src\readme.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{618A5846-961D-4DBE-8850-678F01CB61D1}"
+	ProjectSection(SolutionItems) = preProject
+		global.json = global.json
+		NuGet.Config = NuGet.Config
+	EndProjectSection
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Glimpse.Common", "src\Glimpse.Common\Glimpse.Common.xproj", "{C0FB7983-E851-4567-8540-153F9B7EC42D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{214245A9-D0ED-479C-B514-B482510C5F73}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Glimpse.Server", "src\Glimpse.Server\Glimpse.Server.xproj", "{C6EFFA30-9D16-412C-8FD7-C87B909E030E}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Glimpse.Agent.AspNet", "src\Glimpse.Agent.AspNet\Glimpse.Agent.AspNet.xproj", "{06F2EF61-61D8-40C9-8BEE-EBF64352DE6F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{4F6B131C-CBEE-44D2-891A-FD88998A3331}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glimpse.AgentServer.SystemWeb.Mvc.Sample", "sample\Glimpse.AgentServer.SystemWeb.Mvc.Sample\Glimpse.AgentServer.SystemWeb.Mvc.Sample.csproj", "{342C28CC-82F5-4DAD-A176-669BD567479A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C0FB7983-E851-4567-8540-153F9B7EC42D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0FB7983-E851-4567-8540-153F9B7EC42D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0FB7983-E851-4567-8540-153F9B7EC42D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C0FB7983-E851-4567-8540-153F9B7EC42D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C6EFFA30-9D16-412C-8FD7-C87B909E030E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6EFFA30-9D16-412C-8FD7-C87B909E030E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6EFFA30-9D16-412C-8FD7-C87B909E030E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C6EFFA30-9D16-412C-8FD7-C87B909E030E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06F2EF61-61D8-40C9-8BEE-EBF64352DE6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06F2EF61-61D8-40C9-8BEE-EBF64352DE6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06F2EF61-61D8-40C9-8BEE-EBF64352DE6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06F2EF61-61D8-40C9-8BEE-EBF64352DE6F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{342C28CC-82F5-4DAD-A176-669BD567479A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{342C28CC-82F5-4DAD-A176-669BD567479A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{342C28CC-82F5-4DAD-A176-669BD567479A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{342C28CC-82F5-4DAD-A176-669BD567479A}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{C0FB7983-E851-4567-8540-153F9B7EC42D} = {6AD4BC4F-CA12-4EE0-A6D5-BBE4B9CC56EC}
+		{C6EFFA30-9D16-412C-8FD7-C87B909E030E} = {6AD4BC4F-CA12-4EE0-A6D5-BBE4B9CC56EC}
+		{06F2EF61-61D8-40C9-8BEE-EBF64352DE6F} = {6AD4BC4F-CA12-4EE0-A6D5-BBE4B9CC56EC}
+		{342C28CC-82F5-4DAD-A176-669BD567479A} = {4F6B131C-CBEE-44D2-891A-FD88998A3331}
+	EndGlobalSection
+EndGlobal

Glimpse.sln

@@ -44,6 +44,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Glimpse.Server.AspNet.Sampl
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Glimpse.Prototype.UnitTest", "test\Glimpse.Prototype.UnitTest\Glimpse.Prototype.UnitTest.xproj", "{C61DDFCD-D875-4C81-B3C2-D3F6943B4CE4}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "support", "support", "{8453FD95-F0D0-4204-9D1D-BFD3DF328353}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -104,7 +106,7 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{C0FB7983-E851-4567-8540-153F9B7EC42D} = {6AD4BC4F-CA12-4EE0-A6D5-BBE4B9CC56EC}
-		{F6F1FE30-78DC-4627-B9D7-EF9426E41892} = {6AD4BC4F-CA12-4EE0-A6D5-BBE4B9CC56EC}
+		{F6F1FE30-78DC-4627-B9D7-EF9426E41892} = {8453FD95-F0D0-4204-9D1D-BFD3DF328353}
 		{D40318AD-88ED-4A8F-80CC-C8C00787FFC9} = {214245A9-D0ED-479C-B514-B482510C5F73}
 		{C316A868-C367-4263-A1C2-5A9E91BCF770} = {214245A9-D0ED-479C-B514-B482510C5F73}
 		{66AEF586-99BC-42E9-BBA7-B06BD5E0C686} = {C316A868-C367-4263-A1C2-5A9E91BCF770}
@@ -116,5 +118,6 @@ Global
 		{500237D3-6999-4800-B4DF-07FF8ADA9054} = {4F6B131C-CBEE-44D2-891A-FD88998A3331}
 		{24B423F4-4E7F-4DBA-B998-3F5CB510CAFE} = {4F6B131C-CBEE-44D2-891A-FD88998A3331}
 		{C61DDFCD-D875-4C81-B3C2-D3F6943B4CE4} = {214245A9-D0ED-479C-B514-B482510C5F73}
+		{8453FD95-F0D0-4204-9D1D-BFD3DF328353} = {6AD4BC4F-CA12-4EE0-A6D5-BBE4B9CC56EC}
 	EndGlobalSection
 EndGlobal

NuGet.config

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
+    <add key="AspNetVNext" value="https://www.myget.org/F/aspnetcidev/api/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>

global.json

@@ -1,3 +1,7 @@
 {
-  "projects": [ "src", "test/websites" ]
-}
+  "projects": [
+    "src",
+    "test/websites",
+    "wrap"
+  ]
+}

sample/Glimpse.Agent.AspNet.Sample/project.json

@@ -15,9 +15,9 @@
     },
   "dependencies": {
     "Glimpse.Agent.AspNet": "",
-    "Microsoft.AspNet.Diagnostics": "1.0.0-rc1-final",
-    "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
-    "Microsoft.AspNet.Server.WebListener": "1.0.0-rc1-final"
+    "Microsoft.AspNet.Diagnostics": "1.0.0-*",
+    "Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
+    "Microsoft.AspNet.Server.WebListener": "1.0.0-*"
   },
   "frameworks": {
     "dnx451": { }

sample/Glimpse.AgentServer.AspNet.Sample/project.json

@@ -16,9 +16,9 @@
     "dependencies": {
       "Glimpse.Agent.AspNet": "",
       "Glimpse.Server": "",
-      "Microsoft.AspNet.Diagnostics": "1.0.0-rc1-final",
-      "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
-      "Microsoft.AspNet.Server.WebListener": "1.0.0-rc1-final"
+      "Microsoft.AspNet.Diagnostics": "1.0.0-*",
+      "Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
+      "Microsoft.AspNet.Server.WebListener": "1.0.0-*"
     },
     "frameworks" : {
         "dnx451": { },

sample/Glimpse.AgentServer.Mvc.Sample/Startup.cs

@@ -76,7 +76,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
         {
             app.UseGlimpse();
 
-            loggerFactory.MinimumLevel = LogLevel.Information;
             loggerFactory.AddConsole();
             loggerFactory.AddDebug();
 

sample/Glimpse.AgentServer.Mvc.Sample/Views/_ViewImports.cshtml

@@ -3,4 +3,4 @@
 @using Glimpse.AgentServer.AspNet.Mvc.Sample.ViewModels.Account
 @using Glimpse.AgentServer.AspNet.Mvc.Sample.ViewModels.Manage
 @using Microsoft.AspNet.Identity
-@addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers"
+@addTagHelper *, Microsoft.AspNet.Mvc.TagHelpers

sample/Glimpse.AgentServer.Mvc.Sample/project.json

@@ -3,31 +3,31 @@
   "userSecretsId": "aspnet5-Glimpse.AgentServer.AspNet.Mvc.Sample-13d51bc5-beea-48f5-a33d-0b583120c537",
   "version": "1.0.0-*",
   "dependencies": {
-    "EntityFramework.Commands": "7.0.0-rc1-final",
-    "EntityFramework.MicrosoftSqlServer": "7.0.0-rc1-final",
+    "EntityFramework.Commands": "7.0.0-*",
+    "EntityFramework.MicrosoftSqlServer": "7.0.0-*",
     "Glimpse.Agent.AspNet": "",
     "Glimpse.Agent.AspNet.Mvc": "",
     "Glimpse.Server": "",
-    "Microsoft.AspNet.Authentication.Cookies": "1.0.0-rc1-final",
-    "Microsoft.AspNet.Authentication.Facebook": "1.0.0-rc1-final",
-    "Microsoft.AspNet.Authentication.Google": "1.0.0-rc1-final",
-    "Microsoft.AspNet.Authentication.MicrosoftAccount": "1.0.0-rc1-final",
-    "Microsoft.AspNet.Authentication.Twitter": "1.0.0-rc1-final",
-    "Microsoft.AspNet.Diagnostics": "1.0.0-rc1-final",
-    "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-final",
-    "Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-final",
-    "Microsoft.AspNet.Mvc": "6.0.0-rc1-final",
-    "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-final",
-    "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
-    "Microsoft.AspNet.Server.WebListener": "1.0.0-rc1-final",
-    "Microsoft.AspNet.StaticFiles": "1.0.0-rc1-final",
-    "Microsoft.AspNet.Tooling.Razor": "1.0.0-rc1-final",
-    "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-rc1-final",
-    "Microsoft.Extensions.Configuration.Json": "1.0.0-rc1-final",
-    "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-rc1-final",
-    "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
-    "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final"
+    "Microsoft.AspNet.Authentication.Cookies": "1.0.0-*",
+    "Microsoft.AspNet.Authentication.Facebook": "1.0.0-*",
+    "Microsoft.AspNet.Authentication.Google": "1.0.0-*",
+    "Microsoft.AspNet.Authentication.MicrosoftAccount": "1.0.0-*",
+    "Microsoft.AspNet.Authentication.Twitter": "1.0.0-*",
+    "Microsoft.AspNet.Diagnostics": "1.0.0-*",
+    "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-*",
+    "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*",
+    "Microsoft.AspNet.Mvc": "6.0.0-*",
+    "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-*",
+    "Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
+    "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
+    "Microsoft.AspNet.StaticFiles": "1.0.0-*",
+    "Microsoft.AspNet.Tooling.Razor": "1.0.0-*",
+    "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-*",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0-*",
+    "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-*",
+    "Microsoft.Extensions.Logging": "1.0.0-*",
+    "Microsoft.Extensions.Logging.Console": "1.0.0-*",
+    "Microsoft.Extensions.Logging.Debug": "1.0.0-*"
   },
   "commands": {
     "web": "Microsoft.AspNet.Server.WebListener",

sample/Glimpse.AgentServer.Mvc.Simple.Sample/project.json

@@ -7,9 +7,9 @@
     "Glimpse.Agent.AspNet": "",
     "Glimpse.Agent.AspNet.Mvc": "",
     "Glimpse.Server": "",
-    "Microsoft.AspNet.Mvc": "6.0.0-rc1-final",
-    "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
-    "Microsoft.AspNet.Server.WebListener": "1.0.0-rc1-final"
+    "Microsoft.AspNet.Mvc": "6.0.0-*",
+    "Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
+    "Microsoft.AspNet.Server.WebListener": "1.0.0-*"
   },
   "exclude": [
     "wwwroot"

sample/Glimpse.AgentServer.SystemWeb.Mvc.Sample/App_Start/BundleConfig.cs

@@ -0,0 +1,31 @@
+using System.Web;
+using System.Web.Optimization;
+
+namespace Glimpse.AgentServer.SystemWeb.Mvc.Sample
+{
+    public class BundleConfig
+    {
+        // For more information on bundling, visit http://go.microsoft.com/fwlink/?LinkId=301862
+        public static void RegisterBundles(BundleCollection bundles)
+        {
+            bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
+                        "~/Scripts/jquery-{version}.js"));
+
+            bundles.Add(new ScriptBundle("~/bundles/jqueryval").Include(
+                        "~/Scripts/jquery.validate*"));
+
+            // Use the development version of Modernizr to develop with and learn from. Then, when you're
+            // ready for production, use the build tool at http://modernizr.com to pick only the tests you need.
+            bundles.Add(new ScriptBundle("~/bundles/modernizr").Include(
+                        "~/Scripts/modernizr-*"));
+
+            bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include(
+                      "~/Scripts/bootstrap.js",
+                      "~/Scripts/respond.js"));
+
+            bundles.Add(new StyleBundle("~/Content/css").Include(
+                      "~/Content/bootstrap.css",
+                      "~/Content/site.css"));
+        }
+    }
+}

sample/Glimpse.AgentServer.SystemWeb.Mvc.Sample/App_Start/FilterConfig.cs

@@ -0,0 +1,13 @@
+using System.Web;
+using System.Web.Mvc;
+
+namespace Glimpse.AgentServer.SystemWeb.Mvc.Sample
+{
+    public class FilterConfig
+    {
+        public static void RegisterGlobalFilters(GlobalFilterCollection filters)
+        {
+            filters.Add(new HandleErrorAttribute());
+        }
+    }
+}

sample/Glimpse.AgentServer.SystemWeb.Mvc.Sample/App_Start/RouteConfig.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+using System.Web.Routing;
+
+namespace Glimpse.AgentServer.SystemWeb.Mvc.Sample
+{
+    public class RouteConfig
+    {
+        public static void RegisterRoutes(RouteCollection routes)
+        {
+            routes.IgnoreRoute("{resource}.axd/{*pathInfo}");
+
+            routes.MapRoute(
+                name: "Default",
+                url: "{controller}/{action}/{id}",
+                defaults: new { controller = "Home", action = "Index", id = UrlParameter.Optional }
+            );
+        }
+    }
+}

sample/Glimpse.AgentServer.SystemWeb.Mvc.Sample/Content/Site.css

@@ -0,0 +1,24 @@
+body {
+    padding-top: 50px;
+    padding-bottom: 20px;
+}
+
+/* Set padding to keep content from hitting the edges */
+.body-content {
+    padding-left: 15px;
+    padding-right: 15px;
+}
+
+/* Override the default bootstrap behavior where horizontal description lists 
+   will truncate terms that are too long to fit in the left column 
+*/
+.dl-horizontal dt {
+    white-space: normal;
+}
+
+/* Set width on the form input elements since they're 100% wide by default */
+input,
+select,
+textarea {
+    max-width: 280px;
+}