diff --git a/LambdaExtension/LambdaExtension.csproj b/LambdaExtension/LambdaExtension.csproj deleted file mode 100644 index b9de063..0000000 --- a/LambdaExtension/LambdaExtension.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - Exe - net6.0 - enable - enable - - - diff --git a/MoesifMiddlewareExample.sln b/MoesifMiddlewareExample.sln index d75673b..f8fdec7 100644 --- a/MoesifMiddlewareExample.sln +++ b/MoesifMiddlewareExample.sln @@ -2,12 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.8.34330.188 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoesifNetCore2Example", "MoesifNetCore2Example\MoesifNetCore2Example.csproj", "{836C1D42-EC53-4E93-94BC-CA0234B81FA0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoesifNetCore3Example", "MoesifNetCore3Example\MoesifNetCore3Example.csproj", "{E7F50E4B-8270-43CC-8470-633542583B17}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoesifNet5Example", "MoesifNet5Example\MoesifNet5Example.csproj", "{C3A7293C-E822-42A5-ACE4-061242842066}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoesifNet8Example", "MoesifNet8Example\MoesifNet8Example.csproj", "{8778A078-D55C-40E4-9AA5-80B002A8FE0A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoesifNet6Example", "MoesifNet6Example\MoesifNet6Example.csproj", "{F248B0AC-68C5-46F8-BA5D-9E275ADC4F08}" @@ -22,18 +16,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {836C1D42-EC53-4E93-94BC-CA0234B81FA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {836C1D42-EC53-4E93-94BC-CA0234B81FA0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {836C1D42-EC53-4E93-94BC-CA0234B81FA0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {836C1D42-EC53-4E93-94BC-CA0234B81FA0}.Release|Any CPU.Build.0 = Release|Any CPU - {E7F50E4B-8270-43CC-8470-633542583B17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7F50E4B-8270-43CC-8470-633542583B17}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7F50E4B-8270-43CC-8470-633542583B17}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7F50E4B-8270-43CC-8470-633542583B17}.Release|Any CPU.Build.0 = Release|Any CPU - {C3A7293C-E822-42A5-ACE4-061242842066}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C3A7293C-E822-42A5-ACE4-061242842066}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C3A7293C-E822-42A5-ACE4-061242842066}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C3A7293C-E822-42A5-ACE4-061242842066}.Release|Any CPU.Build.0 = Release|Any CPU {8778A078-D55C-40E4-9AA5-80B002A8FE0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8778A078-D55C-40E4-9AA5-80B002A8FE0A}.Debug|Any CPU.Build.0 = Debug|Any CPU {8778A078-D55C-40E4-9AA5-80B002A8FE0A}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/MoesifNet6Example/Controllers/EmployeeController.cs b/MoesifNet6Example/Controllers/EmployeeController.cs index 1a20fe0..95347e2 100644 --- a/MoesifNet6Example/Controllers/EmployeeController.cs +++ b/MoesifNet6Example/Controllers/EmployeeController.cs @@ -47,15 +47,58 @@ public IActionResult GetByID(int id) [HttpGet("delay_random/{id}")] public IActionResult GetEventId(int id) { + Random random = new Random(); + int sleepTime = 300; // random.Next(1, 101); + string lastName = $"Delayed-By-{sleepTime}-MS"; var employee = new Employee() { ID = id, FirstName = $"Get-Event-{id}", - LastName = $"Delayed-By-{id}-MS", + LastName = lastName, DateOfBirth = DateTime.Now.AddYears(-30) }; - - Thread.Sleep(id); // Sleeps for id milliseconds + + Thread.Sleep(sleepTime); // Sleeps for id milliseconds + + return Ok(employee); + } + + [HttpPost("event/{id}")] + public IActionResult PostEventId(int id) + { + Random random = new Random(); + int sleepTime = 1600; // random.Next(1, 101); // 500 - 1000 (Min - Median) + string firstName = $"Post-Event-{id}"; + string lastName = $"Delayed-By-{sleepTime}-MS"; + var employee = new Employee() + { + ID = id, + FirstName = firstName, + LastName = lastName, + DateOfBirth = DateTime.Now.AddYears(-30) + }; + + Thread.Sleep(sleepTime); // Sleeps for id milliseconds + + return Ok(employee); + } + + [HttpPost("readunread/{id}")] + public IActionResult PostReadUnreadId(int id) + { + Random random = new Random(); + int sleepTime = 1300; // random.Next(1, 101); // 200 - 1000 + string firstName = $"Post-ReadUnRead-{id}"; + string lastName = $"Delayed-By-{sleepTime}-MS"; + var employee = new Employee() + { + ID = id, + FirstName = firstName, + LastName = lastName, + DateOfBirth = DateTime.Now.AddYears(-30) + }; + + Thread.Sleep(sleepTime); // Sleeps for id milliseconds return Ok(employee); } @@ -63,13 +106,16 @@ public IActionResult GetEventId(int id) [HttpGet("payload75/{id}")] public IActionResult GetNotificationId(int id) { - int sleepTime = 100; - string firstName = $"Get-{id}-{MAX_SIZE_75_KB}-KB-{sleepTime}-MS"; + int sleepTime = 8000; // random.Next(1, 101); // 300 - 9000 + var size = 1; string lastName = $"Delayed-By-{sleepTime}-MS"; if (id > 10) { + size = MAX_SIZE_75_KB; lastName = GenerateLargeResponseBody(MAX_SIZE_75_KB); } + string firstName = $"Get-{id}-{size}-KB-{sleepTime}-MS"; + var employee = new Employee() { ID = id, @@ -86,13 +132,15 @@ public IActionResult GetNotificationId(int id) [HttpGet("payload150/{id}")] public IActionResult GetSubsId(int id) { - int sleepTime = 100; // in ms - string firstName = $"Get-{id}-{MAX_SIZE_150_KB}-KB-{sleepTime}-MS"; + int sleepTime = 3500; // random.Next(1, 101); // 300 - 4000 + var size = 1; string lastName = $"Delayed-By-{sleepTime}-MS"; if (id > 10) { + size = MAX_SIZE_150_KB; lastName = GenerateLargeResponseBody(MAX_SIZE_150_KB); } + string firstName = $"Get-{id}-{MAX_SIZE_150_KB}-KB-{sleepTime}-MS"; var employee = new Employee() { diff --git a/MoesifNet6Example/Settings/MoesifOptions.cs b/MoesifNet6Example/Settings/MoesifOptions.cs index e69ece7..44b8ff0 100644 --- a/MoesifNet6Example/Settings/MoesifOptions.cs +++ b/MoesifNet6Example/Settings/MoesifOptions.cs @@ -59,6 +59,7 @@ public Dictionary getMoesifOptions() { Dictionary moesifOptions = new Dictionary { + {MoesifOptionsParamNames.IsMoesifEnabled, getConfigBool(MoesifOptionsParamNames.IsMoesifEnabled)}, {MoesifOptionsParamNames.ApplicationId, getConfigString(MoesifOptionsParamNames.ApplicationId)}, {MoesifOptionsParamNames.LocalDebug, getConfigBool(MoesifOptionsParamNames.LocalDebug)}, {MoesifOptionsParamNames.LogBody, getConfigBool(MoesifOptionsParamNames.LogBody)}, @@ -115,6 +116,18 @@ public bool IsLambda() } return isLambda; } + + public bool IsMoesifEnabled() + { + var moesifEnabled = true; + try { + moesifEnabled = (bool) getMoesifOptions().GetValueOrDefault(MoesifOptionsParamNames.IsMoesifEnabled); + } + catch (Exception ex){ + Console.WriteLine("Error Reading Moesif Application Id in appsettings(.env).json: " + ex.Message ); + } + return moesifEnabled; + } } public class MoesifOptionsParamNames @@ -132,6 +145,7 @@ public class MoesifOptionsParamNames // Read from appsettings.json public static string IsLambda = "IsLambda"; + public static string IsMoesifEnabled = "IsMoesifEnabled"; // Read from appsettings.json public static string LogBodyOutgoing = "LogBodyOutgoing"; diff --git a/MoesifNet6Example/Startup.cs b/MoesifNet6Example/Startup.cs index 1bfe027..17c2e11 100644 --- a/MoesifNet6Example/Startup.cs +++ b/MoesifNet6Example/Startup.cs @@ -38,11 +38,24 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) Console.WriteLine($"Begin: Configure"); #endif var isLambda = false; + var isMoesifEnabled = true; + var msg = ""; MoesifOptions mo = new MoesifOptions(Configuration); ensureValidConfig(mo); - app.UseMiddleware(mo.getMoesifOptions()); - isLambda = mo.IsLambda(); + isLambda = mo.IsLambda(); + isMoesifEnabled = mo.IsMoesifEnabled(); + if (isMoesifEnabled) + { + app.UseMiddleware(mo.getMoesifOptions()); + msg = $"++++++ Moesif is Enabled because [IsMoesifEnabled = {isMoesifEnabled}] and [IsLambda = {isLambda}]"; + } + else + { + msg = $"++++++ Moesif is Disabled because [IsMoesifEnabled = {isMoesifEnabled}] and [IsLambda = {isLambda}]"; + } + Console.WriteLine($"{msg}"); + if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); @@ -56,7 +69,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { endpoints.MapGet("/", async context => { - var msg = $"Hello World! isLambd = {isLambda}"; + var msg = $"Hello World! isLambda = {isLambda}"; Console.WriteLine($"Hit the home page: {msg}"); // if (isLambda) // { diff --git a/MoesifNet6Example/appsettings.json b/MoesifNet6Example/appsettings.json index 193e7e4..948d3c2 100644 --- a/MoesifNet6Example/appsettings.json +++ b/MoesifNet6Example/appsettings.json @@ -1,7 +1,8 @@ { "MoesifOptions": { + "IsMoesifEnabled": true, "MyTag": "ILT_Org_PK_App", - "ApplicationId": "", + "ApplicationId": "", "LocalDebug": false, "LogBody": true, "RequestMaxBodySize": 100000, @@ -22,4 +23,4 @@ }, "AllowedHosts": "*" } - \ No newline at end of file + diff --git a/MoesifNet4Example/.devcontainer/Dockerfile b/deprecated/MoesifNet4Example/.devcontainer/Dockerfile similarity index 100% rename from MoesifNet4Example/.devcontainer/Dockerfile rename to deprecated/MoesifNet4Example/.devcontainer/Dockerfile diff --git a/MoesifNet4Example/.devcontainer/devcontainer.json b/deprecated/MoesifNet4Example/.devcontainer/devcontainer.json similarity index 100% rename from MoesifNet4Example/.devcontainer/devcontainer.json rename to deprecated/MoesifNet4Example/.devcontainer/devcontainer.json diff --git a/MoesifNet4Example/.devcontainer/library-scripts/azcli-debian.sh b/deprecated/MoesifNet4Example/.devcontainer/library-scripts/azcli-debian.sh similarity index 100% rename from MoesifNet4Example/.devcontainer/library-scripts/azcli-debian.sh rename to deprecated/MoesifNet4Example/.devcontainer/library-scripts/azcli-debian.sh diff --git a/MoesifNet4Example/Controllers/EmployeeController.cs b/deprecated/MoesifNet4Example/Controllers/EmployeeController.cs similarity index 100% rename from MoesifNet4Example/Controllers/EmployeeController.cs rename to deprecated/MoesifNet4Example/Controllers/EmployeeController.cs diff --git a/MoesifNet4Example/Models/Employee.cs b/deprecated/MoesifNet4Example/Models/Employee.cs similarity index 100% rename from MoesifNet4Example/Models/Employee.cs rename to deprecated/MoesifNet4Example/Models/Employee.cs diff --git a/MoesifNet4Example/MoesifNet4Example.csproj b/deprecated/MoesifNet4Example/MoesifNet4Example.csproj similarity index 100% rename from MoesifNet4Example/MoesifNet4Example.csproj rename to deprecated/MoesifNet4Example/MoesifNet4Example.csproj diff --git a/MoesifNet4Example/Program.cs b/deprecated/MoesifNet4Example/Program.cs similarity index 100% rename from MoesifNet4Example/Program.cs rename to deprecated/MoesifNet4Example/Program.cs diff --git a/MoesifNet4Example/Properties/launchSettings.json b/deprecated/MoesifNet4Example/Properties/launchSettings.json similarity index 100% rename from MoesifNet4Example/Properties/launchSettings.json rename to deprecated/MoesifNet4Example/Properties/launchSettings.json diff --git a/MoesifNet4Example/README.md b/deprecated/MoesifNet4Example/README.md similarity index 100% rename from MoesifNet4Example/README.md rename to deprecated/MoesifNet4Example/README.md diff --git a/MoesifNet4Example/Settings/MoesifOptions.cs b/deprecated/MoesifNet4Example/Settings/MoesifOptions.cs similarity index 100% rename from MoesifNet4Example/Settings/MoesifOptions.cs rename to deprecated/MoesifNet4Example/Settings/MoesifOptions.cs diff --git a/MoesifNet4Example/Startup.cs b/deprecated/MoesifNet4Example/Startup.cs similarity index 100% rename from MoesifNet4Example/Startup.cs rename to deprecated/MoesifNet4Example/Startup.cs diff --git a/MoesifNet4Example/appsettings.json b/deprecated/MoesifNet4Example/appsettings.json similarity index 100% rename from MoesifNet4Example/appsettings.json rename to deprecated/MoesifNet4Example/appsettings.json diff --git a/MoesifNet5Example/.devcontainer/Dockerfile b/deprecated/MoesifNet5Example/.devcontainer/Dockerfile similarity index 100% rename from MoesifNet5Example/.devcontainer/Dockerfile rename to deprecated/MoesifNet5Example/.devcontainer/Dockerfile diff --git a/MoesifNet5Example/.devcontainer/devcontainer.json b/deprecated/MoesifNet5Example/.devcontainer/devcontainer.json similarity index 100% rename from MoesifNet5Example/.devcontainer/devcontainer.json rename to deprecated/MoesifNet5Example/.devcontainer/devcontainer.json diff --git a/MoesifNet5Example/.devcontainer/library-scripts/azcli-debian.sh b/deprecated/MoesifNet5Example/.devcontainer/library-scripts/azcli-debian.sh similarity index 100% rename from MoesifNet5Example/.devcontainer/library-scripts/azcli-debian.sh rename to deprecated/MoesifNet5Example/.devcontainer/library-scripts/azcli-debian.sh diff --git a/MoesifNet5Example/Controllers/EmployeeController.cs b/deprecated/MoesifNet5Example/Controllers/EmployeeController.cs similarity index 100% rename from MoesifNet5Example/Controllers/EmployeeController.cs rename to deprecated/MoesifNet5Example/Controllers/EmployeeController.cs diff --git a/MoesifNet5Example/Models/Employee.cs b/deprecated/MoesifNet5Example/Models/Employee.cs similarity index 100% rename from MoesifNet5Example/Models/Employee.cs rename to deprecated/MoesifNet5Example/Models/Employee.cs diff --git a/MoesifNet5Example/MoesifNet5Example.csproj b/deprecated/MoesifNet5Example/MoesifNet5Example.csproj similarity index 96% rename from MoesifNet5Example/MoesifNet5Example.csproj rename to deprecated/MoesifNet5Example/MoesifNet5Example.csproj index 1cd8118..a75554c 100644 --- a/MoesifNet5Example/MoesifNet5Example.csproj +++ b/deprecated/MoesifNet5Example/MoesifNet5Example.csproj @@ -1,16 +1,16 @@ - - - - net5.0 - - - - - - - - - - - - + + + + net5.0 + + + + + + + + + + + + diff --git a/MoesifNet5Example/Program.cs b/deprecated/MoesifNet5Example/Program.cs similarity index 96% rename from MoesifNet5Example/Program.cs rename to deprecated/MoesifNet5Example/Program.cs index 72db26a..453a384 100644 --- a/MoesifNet5Example/Program.cs +++ b/deprecated/MoesifNet5Example/Program.cs @@ -1,29 +1,29 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; - -namespace MoesifNet5Example -{ - public class Program - { - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } - - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup() - .ConfigureKestrel((context, options) => { - options.AllowSynchronousIO = true; - }); - }); - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; + +namespace MoesifNet5Example +{ + public class Program + { + public static void Main(string[] args) + { + CreateHostBuilder(args).Build().Run(); + } + + public static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup() + .ConfigureKestrel((context, options) => { + options.AllowSynchronousIO = true; + }); + }); + } +} diff --git a/MoesifNet5Example/Properties/launchSettings.json b/deprecated/MoesifNet5Example/Properties/launchSettings.json similarity index 100% rename from MoesifNet5Example/Properties/launchSettings.json rename to deprecated/MoesifNet5Example/Properties/launchSettings.json diff --git a/MoesifNet5Example/README.md b/deprecated/MoesifNet5Example/README.md similarity index 100% rename from MoesifNet5Example/README.md rename to deprecated/MoesifNet5Example/README.md diff --git a/MoesifNet5Example/Settings/MoesifOptions.cs b/deprecated/MoesifNet5Example/Settings/MoesifOptions.cs similarity index 100% rename from MoesifNet5Example/Settings/MoesifOptions.cs rename to deprecated/MoesifNet5Example/Settings/MoesifOptions.cs diff --git a/MoesifNet5Example/Startup.cs b/deprecated/MoesifNet5Example/Startup.cs similarity index 97% rename from MoesifNet5Example/Startup.cs rename to deprecated/MoesifNet5Example/Startup.cs index 15e41c1..1156c46 100644 --- a/MoesifNet5Example/Startup.cs +++ b/deprecated/MoesifNet5Example/Startup.cs @@ -1,65 +1,65 @@ -using System; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using Moesif.Middleware; -using MoesifNet5Example.Settings; -using Microsoft.AspNetCore.Routing; - -namespace MoesifNet5Example -{ - public class Startup - { - // This method gets called by the runtime. Use this method to add services to the container. - // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 - public IConfiguration Configuration { get; private set; } - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - public void ConfigureServices(IServiceCollection services) - { - services.AddSingleton(Configuration); - services.AddMvc(); - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - - app.UseRouting(); - MoesifOptions mo = new MoesifOptions(Configuration); - ensureValidConfig(mo); - app.UseMiddleware(mo.getMoesifOptions()); - - app.UseEndpoints(endpoints => - { - endpoints.MapGet("/", async context => - { - await context.Response.WriteAsync("Hello World!"); - }); - - endpoints.MapControllerRoute( - name: "api", - pattern: "{controller}/{id}"); - }); - } - - public static void ensureValidConfig(MoesifOptions mo) - { - if (!mo.isConfiguredMoesifApplicationId()) - { - string msg = "Error: Moesif: " + MoesifOptionsParamNames.ApplicationId + " not valid - usually in appsettings(.env).json"; - Console.WriteLine(msg); - throw new ArgumentException(msg); - } - } - } -} +using System; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using Moesif.Middleware; +using MoesifNet5Example.Settings; +using Microsoft.AspNetCore.Routing; + +namespace MoesifNet5Example +{ + public class Startup + { + // This method gets called by the runtime. Use this method to add services to the container. + // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 + public IConfiguration Configuration { get; private set; } + public Startup(IConfiguration configuration) + { + Configuration = configuration; + } + public void ConfigureServices(IServiceCollection services) + { + services.AddSingleton(Configuration); + services.AddMvc(); + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) + { + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + + app.UseRouting(); + MoesifOptions mo = new MoesifOptions(Configuration); + ensureValidConfig(mo); + app.UseMiddleware(mo.getMoesifOptions()); + + app.UseEndpoints(endpoints => + { + endpoints.MapGet("/", async context => + { + await context.Response.WriteAsync("Hello World!"); + }); + + endpoints.MapControllerRoute( + name: "api", + pattern: "{controller}/{id}"); + }); + } + + public static void ensureValidConfig(MoesifOptions mo) + { + if (!mo.isConfiguredMoesifApplicationId()) + { + string msg = "Error: Moesif: " + MoesifOptionsParamNames.ApplicationId + " not valid - usually in appsettings(.env).json"; + Console.WriteLine(msg); + throw new ArgumentException(msg); + } + } + } +} diff --git a/MoesifNet5Example/appsettings.json b/deprecated/MoesifNet5Example/appsettings.json similarity index 100% rename from MoesifNet5Example/appsettings.json rename to deprecated/MoesifNet5Example/appsettings.json diff --git a/MoesifNetCore2Example/.devcontainer/Dockerfile b/deprecated/MoesifNetCore2Example/.devcontainer/Dockerfile similarity index 100% rename from MoesifNetCore2Example/.devcontainer/Dockerfile rename to deprecated/MoesifNetCore2Example/.devcontainer/Dockerfile diff --git a/MoesifNetCore2Example/.devcontainer/devcontainer.json b/deprecated/MoesifNetCore2Example/.devcontainer/devcontainer.json similarity index 100% rename from MoesifNetCore2Example/.devcontainer/devcontainer.json rename to deprecated/MoesifNetCore2Example/.devcontainer/devcontainer.json diff --git a/MoesifNetCore2Example/.devcontainer/library-scripts/azcli-debian.sh b/deprecated/MoesifNetCore2Example/.devcontainer/library-scripts/azcli-debian.sh similarity index 100% rename from MoesifNetCore2Example/.devcontainer/library-scripts/azcli-debian.sh rename to deprecated/MoesifNetCore2Example/.devcontainer/library-scripts/azcli-debian.sh diff --git a/MoesifNetCore2Example/Controllers/EmployeeController.cs b/deprecated/MoesifNetCore2Example/Controllers/EmployeeController.cs similarity index 100% rename from MoesifNetCore2Example/Controllers/EmployeeController.cs rename to deprecated/MoesifNetCore2Example/Controllers/EmployeeController.cs diff --git a/MoesifNetCore2Example/Models/Employee.cs b/deprecated/MoesifNetCore2Example/Models/Employee.cs similarity index 100% rename from MoesifNetCore2Example/Models/Employee.cs rename to deprecated/MoesifNetCore2Example/Models/Employee.cs diff --git a/MoesifNetCore2Example/MoesifNetCore2Example.csproj b/deprecated/MoesifNetCore2Example/MoesifNetCore2Example.csproj similarity index 97% rename from MoesifNetCore2Example/MoesifNetCore2Example.csproj rename to deprecated/MoesifNetCore2Example/MoesifNetCore2Example.csproj index f8908aa..e344c91 100644 --- a/MoesifNetCore2Example/MoesifNetCore2Example.csproj +++ b/deprecated/MoesifNetCore2Example/MoesifNetCore2Example.csproj @@ -1,31 +1,31 @@ - - - - netcoreapp2.1 - - - - - - - - - - true -all -true - - - - - - - - - - - ..\..\moesif-dotnet\Moesif.Middleware\bin\Debug\netstandard2.1\Moesif.Middleware.dll - - - - + + + + netcoreapp2.1 + + + + + + + + + + true +all +true + + + + + + + + + + + ..\..\moesif-dotnet\Moesif.Middleware\bin\Debug\netstandard2.1\Moesif.Middleware.dll + + + + diff --git a/MoesifNetCore2Example/Program.cs b/deprecated/MoesifNetCore2Example/Program.cs similarity index 96% rename from MoesifNetCore2Example/Program.cs rename to deprecated/MoesifNetCore2Example/Program.cs index 3d68768..8bad210 100644 --- a/MoesifNetCore2Example/Program.cs +++ b/deprecated/MoesifNetCore2Example/Program.cs @@ -1,25 +1,25 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; - -namespace MoesifNetCore2Example -{ - public class Program - { - public static void Main(string[] args) - { - BuildWebHost(args).Run(); - } - - public static IWebHost BuildWebHost(string[] args) => - WebHost.CreateDefaultBuilder(args) - .UseStartup() - .Build(); - } -} +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; + +namespace MoesifNetCore2Example +{ + public class Program + { + public static void Main(string[] args) + { + BuildWebHost(args).Run(); + } + + public static IWebHost BuildWebHost(string[] args) => + WebHost.CreateDefaultBuilder(args) + .UseStartup() + .Build(); + } +} diff --git a/MoesifNetCore2Example/Properties/launchSettings.json b/deprecated/MoesifNetCore2Example/Properties/launchSettings.json similarity index 100% rename from MoesifNetCore2Example/Properties/launchSettings.json rename to deprecated/MoesifNetCore2Example/Properties/launchSettings.json diff --git a/MoesifNetCore2Example/README.md b/deprecated/MoesifNetCore2Example/README.md similarity index 100% rename from MoesifNetCore2Example/README.md rename to deprecated/MoesifNetCore2Example/README.md diff --git a/MoesifNetCore2Example/Settings/MoesifOptions.cs b/deprecated/MoesifNetCore2Example/Settings/MoesifOptions.cs similarity index 100% rename from MoesifNetCore2Example/Settings/MoesifOptions.cs rename to deprecated/MoesifNetCore2Example/Settings/MoesifOptions.cs diff --git a/MoesifNetCore2Example/Startup.cs b/deprecated/MoesifNetCore2Example/Startup.cs similarity index 97% rename from MoesifNetCore2Example/Startup.cs rename to deprecated/MoesifNetCore2Example/Startup.cs index ba6b054..b64b578 100644 --- a/MoesifNetCore2Example/Startup.cs +++ b/deprecated/MoesifNetCore2Example/Startup.cs @@ -1,56 +1,56 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.Configuration; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.DependencyInjection; -using Moesif.Middleware; -using MoesifNetCore2Example.Settings; - -namespace MoesifNetCore2Example -{ - public class Startup - { - // This method gets called by the runtime. Use this method to add services to the container. - // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 - public IConfiguration Configuration { get; private set; } - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - public void ConfigureServices(IServiceCollection services) - { - services.AddSingleton(Configuration); - services.AddMvc(); - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - - //Add our new middleware to the pipeline - MoesifOptions mo = new MoesifOptions(Configuration); - ensureValidConfig(mo); - app.UseMiddleware(mo.getMoesifOptions()); - - app.UseMvc(); - - } - public static void ensureValidConfig(MoesifOptions mo) - { - if (!mo.isConfiguredMoesifApplicationId()) - { - string msg = "Error: Moesif: " + MoesifOptionsParamNames.ApplicationId + " not valid - usually in appsettings(.env).json"; - Console.WriteLine(msg); - throw new ArgumentException(msg); - } - } - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.Configuration; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.DependencyInjection; +using Moesif.Middleware; +using MoesifNetCore2Example.Settings; + +namespace MoesifNetCore2Example +{ + public class Startup + { + // This method gets called by the runtime. Use this method to add services to the container. + // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 + public IConfiguration Configuration { get; private set; } + public Startup(IConfiguration configuration) + { + Configuration = configuration; + } + public void ConfigureServices(IServiceCollection services) + { + services.AddSingleton(Configuration); + services.AddMvc(); + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IHostingEnvironment env) + { + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + + //Add our new middleware to the pipeline + MoesifOptions mo = new MoesifOptions(Configuration); + ensureValidConfig(mo); + app.UseMiddleware(mo.getMoesifOptions()); + + app.UseMvc(); + + } + public static void ensureValidConfig(MoesifOptions mo) + { + if (!mo.isConfiguredMoesifApplicationId()) + { + string msg = "Error: Moesif: " + MoesifOptionsParamNames.ApplicationId + " not valid - usually in appsettings(.env).json"; + Console.WriteLine(msg); + throw new ArgumentException(msg); + } + } + } +} diff --git a/MoesifNetCore2Example/appsettings.json b/deprecated/MoesifNetCore2Example/appsettings.json similarity index 100% rename from MoesifNetCore2Example/appsettings.json rename to deprecated/MoesifNetCore2Example/appsettings.json diff --git a/MoesifNetCore3Example/.devcontainer/Dockerfile b/deprecated/MoesifNetCore3Example/.devcontainer/Dockerfile similarity index 100% rename from MoesifNetCore3Example/.devcontainer/Dockerfile rename to deprecated/MoesifNetCore3Example/.devcontainer/Dockerfile diff --git a/MoesifNetCore3Example/.devcontainer/devcontainer.json b/deprecated/MoesifNetCore3Example/.devcontainer/devcontainer.json similarity index 100% rename from MoesifNetCore3Example/.devcontainer/devcontainer.json rename to deprecated/MoesifNetCore3Example/.devcontainer/devcontainer.json diff --git a/MoesifNetCore3Example/.devcontainer/library-scripts/azcli-debian.sh b/deprecated/MoesifNetCore3Example/.devcontainer/library-scripts/azcli-debian.sh similarity index 100% rename from MoesifNetCore3Example/.devcontainer/library-scripts/azcli-debian.sh rename to deprecated/MoesifNetCore3Example/.devcontainer/library-scripts/azcli-debian.sh diff --git a/MoesifNetCore3Example/Controllers/AsyncStudentController.cs b/deprecated/MoesifNetCore3Example/Controllers/AsyncStudentController.cs similarity index 100% rename from MoesifNetCore3Example/Controllers/AsyncStudentController.cs rename to deprecated/MoesifNetCore3Example/Controllers/AsyncStudentController.cs diff --git a/MoesifNetCore3Example/Controllers/EmployeeController.cs b/deprecated/MoesifNetCore3Example/Controllers/EmployeeController.cs similarity index 100% rename from MoesifNetCore3Example/Controllers/EmployeeController.cs rename to deprecated/MoesifNetCore3Example/Controllers/EmployeeController.cs diff --git a/MoesifNetCore3Example/ExceptionInfo.cs b/deprecated/MoesifNetCore3Example/ExceptionInfo.cs similarity index 100% rename from MoesifNetCore3Example/ExceptionInfo.cs rename to deprecated/MoesifNetCore3Example/ExceptionInfo.cs diff --git a/MoesifNetCore3Example/Models/Employee.cs b/deprecated/MoesifNetCore3Example/Models/Employee.cs similarity index 100% rename from MoesifNetCore3Example/Models/Employee.cs rename to deprecated/MoesifNetCore3Example/Models/Employee.cs diff --git a/MoesifNetCore3Example/Models/Student.cs b/deprecated/MoesifNetCore3Example/Models/Student.cs similarity index 100% rename from MoesifNetCore3Example/Models/Student.cs rename to deprecated/MoesifNetCore3Example/Models/Student.cs diff --git a/MoesifNetCore3Example/MoesifNetCore3Example.csproj b/deprecated/MoesifNetCore3Example/MoesifNetCore3Example.csproj similarity index 96% rename from MoesifNetCore3Example/MoesifNetCore3Example.csproj rename to deprecated/MoesifNetCore3Example/MoesifNetCore3Example.csproj index 709b02f..0a2b76a 100644 --- a/MoesifNetCore3Example/MoesifNetCore3Example.csproj +++ b/deprecated/MoesifNetCore3Example/MoesifNetCore3Example.csproj @@ -1,16 +1,16 @@ - - - - netcoreapp3.1 - - - - - - - - - - - - + + + + netcoreapp3.1 + + + + + + + + + + + + diff --git a/MoesifNetCore3Example/Program.cs b/deprecated/MoesifNetCore3Example/Program.cs similarity index 97% rename from MoesifNetCore3Example/Program.cs rename to deprecated/MoesifNetCore3Example/Program.cs index 4778b52..f7c93f5 100644 --- a/MoesifNetCore3Example/Program.cs +++ b/deprecated/MoesifNetCore3Example/Program.cs @@ -1,30 +1,30 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; - -namespace MoesifNetCore3Example -{ - public class Program - { - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } - - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup() - .ConfigureKestrel((context, options) => { - // Incase if want to use options.AllowSynchronousIO = false; please refer to Student controller endpoints - options.AllowSynchronousIO = true; - }); - }); - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; + +namespace MoesifNetCore3Example +{ + public class Program + { + public static void Main(string[] args) + { + CreateHostBuilder(args).Build().Run(); + } + + public static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup() + .ConfigureKestrel((context, options) => { + // Incase if want to use options.AllowSynchronousIO = false; please refer to Student controller endpoints + options.AllowSynchronousIO = true; + }); + }); + } +} diff --git a/MoesifNetCore3Example/Properties/launchSettings.json b/deprecated/MoesifNetCore3Example/Properties/launchSettings.json similarity index 100% rename from MoesifNetCore3Example/Properties/launchSettings.json rename to deprecated/MoesifNetCore3Example/Properties/launchSettings.json diff --git a/MoesifNetCore3Example/README.md b/deprecated/MoesifNetCore3Example/README.md similarity index 100% rename from MoesifNetCore3Example/README.md rename to deprecated/MoesifNetCore3Example/README.md diff --git a/MoesifNetCore3Example/Settings/MoesifOptions.cs b/deprecated/MoesifNetCore3Example/Settings/MoesifOptions.cs similarity index 100% rename from MoesifNetCore3Example/Settings/MoesifOptions.cs rename to deprecated/MoesifNetCore3Example/Settings/MoesifOptions.cs diff --git a/MoesifNetCore3Example/Startup.cs b/deprecated/MoesifNetCore3Example/Startup.cs similarity index 97% rename from MoesifNetCore3Example/Startup.cs rename to deprecated/MoesifNetCore3Example/Startup.cs index c03d99d..ff8546a 100644 --- a/MoesifNetCore3Example/Startup.cs +++ b/deprecated/MoesifNetCore3Example/Startup.cs @@ -1,50 +1,50 @@ -using System; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using Moesif.Middleware; -using MoesifNetCore3Example.Settings; +using System; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using Moesif.Middleware; +using MoesifNetCore3Example.Settings; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Diagnostics; using System.Net; -namespace MoesifNetCore3Example -{ - public class Startup - { - // This method gets called by the runtime. Use this method to add services to the container. - // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 - public IConfiguration Configuration { get; private set; } - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - public void ConfigureServices(IServiceCollection services) - { - services.AddSingleton(Configuration); - services.AddMvc(); - services.Configure(options => +namespace MoesifNetCore3Example +{ + public class Startup + { + // This method gets called by the runtime. Use this method to add services to the container. + // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 + public IConfiguration Configuration { get; private set; } + public Startup(IConfiguration configuration) + { + Configuration = configuration; + } + public void ConfigureServices(IServiceCollection services) + { + services.AddSingleton(Configuration); + services.AddMvc(); + services.Configure(options => { - options.AllowSynchronousIO = true; - }); - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - - MoesifOptions mo = new MoesifOptions(Configuration); - ensureValidConfig(mo); - app.UseMiddleware(mo.getMoesifOptions()); - - + options.AllowSynchronousIO = true; + }); + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) + { + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + + MoesifOptions mo = new MoesifOptions(Configuration); + ensureValidConfig(mo); + app.UseMiddleware(mo.getMoesifOptions()); + + app.UseExceptionHandler(errorApp => { errorApp.Run(async context => @@ -62,29 +62,29 @@ await context.Response.WriteAsync(new ExceptionInfo() }.ToString()); } }); - }); - - app.UseRouting(); - app.UseEndpoints(endpoints => - { - endpoints.MapGet("/", async context => - { - await context.Response.WriteAsync("Hello World!"); - }); - - endpoints.MapControllerRoute( - name: "api", - pattern: "{controller}/{id}"); - }); - } - - public static void ensureValidConfig(MoesifOptions mo) - { - if (!mo.isConfiguredMoesifApplicationId()){ - string msg = "Error: Moesif: " + MoesifOptionsParamNames.ApplicationId + " not valid - usually in appsettings(.env).json"; - Console.WriteLine(msg); - throw new ArgumentException(msg); - } - } - } -} + }); + + app.UseRouting(); + app.UseEndpoints(endpoints => + { + endpoints.MapGet("/", async context => + { + await context.Response.WriteAsync("Hello World!"); + }); + + endpoints.MapControllerRoute( + name: "api", + pattern: "{controller}/{id}"); + }); + } + + public static void ensureValidConfig(MoesifOptions mo) + { + if (!mo.isConfiguredMoesifApplicationId()){ + string msg = "Error: Moesif: " + MoesifOptionsParamNames.ApplicationId + " not valid - usually in appsettings(.env).json"; + Console.WriteLine(msg); + throw new ArgumentException(msg); + } + } + } +} diff --git a/MoesifNetCore3Example/appsettings.json b/deprecated/MoesifNetCore3Example/appsettings.json similarity index 100% rename from MoesifNetCore3Example/appsettings.json rename to deprecated/MoesifNetCore3Example/appsettings.json