[TestApp.AspNetCore] enable analysis (#6240)

Co-authored-by: Rajkumar Rangaraj <[email protected]>

Author: Kielek

test/TestApp.AspNetCore/ActivityMiddleware.cs

@@ -3,42 +3,29 @@
 
 namespace TestApp.AspNetCore;
 
-public class ActivityMiddleware
+internal sealed class ActivityMiddleware
 {
-    private readonly ActivityMiddlewareImpl impl;
+    private readonly ActivityMiddlewareCore core;
     private readonly RequestDelegate next;
 
-    public ActivityMiddleware(RequestDelegate next, ActivityMiddlewareImpl impl)
+    public ActivityMiddleware(RequestDelegate next, ActivityMiddlewareCore core)
     {
         this.next = next;
-        this.impl = impl;
+        this.core = core;
     }
 
     public async Task InvokeAsync(HttpContext context)
     {
-        if (this.impl != null)
+        if (this.core != null)
         {
-            this.impl.PreProcess(context);
+            this.core.PreProcess(context);
         }
 
-        await this.next(context);
+        await this.next(context).ConfigureAwait(true);
 
-        if (this.impl != null)
+        if (this.core != null)
         {
-            this.impl.PostProcess(context);
-        }
-    }
-
-    public class ActivityMiddlewareImpl
-    {
-        public virtual void PreProcess(HttpContext context)
-        {
-            // Do nothing
-        }
-
-        public virtual void PostProcess(HttpContext context)
-        {
-            // Do nothing
+            this.core.PostProcess(context);
         }
     }
 }

test/TestApp.AspNetCore/ActivityMiddlewareCore.cs

@@ -0,0 +1,17 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+namespace TestApp.AspNetCore;
+
+internal sealed class ActivityMiddlewareCore
+{
+    public void PreProcess(HttpContext context)
+    {
+        // Do nothing
+    }
+
+    public void PostProcess(HttpContext context)
+    {
+        // Do nothing
+    }
+}

test/TestApp.AspNetCore/CallbackMiddleware.cs

@@ -3,30 +3,22 @@
 
 namespace TestApp.AspNetCore;
 
-public class CallbackMiddleware
+internal sealed class CallbackMiddleware
 {
-    private readonly CallbackMiddlewareImpl impl;
+    private readonly CallbackMiddlewareCore core;
     private readonly RequestDelegate next;
 
-    public CallbackMiddleware(RequestDelegate next, CallbackMiddlewareImpl impl)
+    public CallbackMiddleware(RequestDelegate next, CallbackMiddlewareCore core)
     {
         this.next = next;
-        this.impl = impl;
+        this.core = core;
     }
 
     public async Task InvokeAsync(HttpContext context)
     {
-        if (this.impl == null || await this.impl.ProcessAsync(context))
+        if (this.core == null || await this.core.ProcessAsync(context).ConfigureAwait(true))
         {
-            await this.next(context);
-        }
-    }
-
-    public class CallbackMiddlewareImpl
-    {
-        public virtual async Task<bool> ProcessAsync(HttpContext context)
-        {
-            return await Task.FromResult(true);
+            await this.next(context).ConfigureAwait(true);
         }
     }
 }

test/TestApp.AspNetCore/CallbackMiddlewareCore.cs

@@ -0,0 +1,12 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+namespace TestApp.AspNetCore;
+
+internal sealed class CallbackMiddlewareCore
+{
+    public Task<bool> ProcessAsync(HttpContext context)
+    {
+        return Task.FromResult(true);
+    }
+}

test/TestApp.AspNetCore/Controllers/ChildActivityController.cs

@@ -15,7 +15,7 @@ public class ChildActivityController : Controller
     public Dictionary<string, string> GetChildActivityTraceContext()
     {
         var result = new Dictionary<string, string>();
-        var activity = new Activity("ActivityInsideHttpRequest");
+        using var activity = new Activity("ActivityInsideHttpRequest");
         activity.Start();
         result["TraceId"] = activity.Context.TraceId.ToString();
         result["ParentSpanId"] = activity.ParentSpanId.ToString();

test/TestApp.AspNetCore/Controllers/ErrorController.cs

@@ -12,6 +12,6 @@ public class ErrorController : Controller
     [HttpGet]
     public string Get()
     {
-        throw new Exception("something's wrong!");
+        throw new InvalidOperationException("something's wrong!");
     }
 }

test/TestApp.AspNetCore/Program.cs

@@ -3,52 +3,44 @@
 
 using TestApp.AspNetCore;
 
-public class Program
-{
-    public static void Main(string[] args)
-    {
-        var builder = WebApplication.CreateBuilder(args);
+var builder = WebApplication.CreateBuilder(args);
 
-        // Add services to the container.
+// Add services to the container.
 
-        builder.Services.AddControllers();
+builder.Services.AddControllers();
 
-        // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-        builder.Services.AddEndpointsApiExplorer();
+// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
+builder.Services.AddEndpointsApiExplorer();
 
-        builder.Services.AddSwaggerGen();
+builder.Services.AddSwaggerGen();
 
-        builder.Services.AddMvc();
+builder.Services.AddMvc();
 
-        builder.Services.AddSingleton<HttpClient>();
+builder.Services.AddSingleton<HttpClient>();
 
-        builder.Services.AddSingleton(
-            new CallbackMiddleware.CallbackMiddlewareImpl());
+builder.Services.AddSingleton(new CallbackMiddlewareCore());
 
-        builder.Services.AddSingleton(
-            new ActivityMiddleware.ActivityMiddlewareImpl());
+builder.Services.AddSingleton(new ActivityMiddlewareCore());
 
-        var app = builder.Build();
+var app = builder.Build();
 
-        // Configure the HTTP request pipeline.
-        if (app.Environment.IsDevelopment())
-        {
-            app.UseSwagger();
-            app.UseSwaggerUI();
-        }
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseSwagger();
+    app.UseSwaggerUI();
+}
 
-        app.UseHttpsRedirection();
+app.UseHttpsRedirection();
 
-        app.UseAuthorization();
+app.UseAuthorization();
 
-        app.MapControllers();
+app.MapControllers();
 
-        app.UseMiddleware<CallbackMiddleware>();
+app.UseMiddleware<CallbackMiddleware>();
 
-        app.UseMiddleware<ActivityMiddleware>();
+app.UseMiddleware<ActivityMiddleware>();
 
-        app.AddTestMiddleware();
+app.AddTestMiddleware();
 
-        app.Run();
-    }
-}
+app.Run();

test/TestApp.AspNetCore/TestApp.AspNetCore.csproj

@@ -2,6 +2,8 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(TargetFrameworksForAspNetCoreTests)</TargetFrameworks>
+    <AnalysisLevel>latest-all</AnalysisLevel>
+    <NoWarn>$(NoWarn);CA1515;CA1822;CA1812</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

test/TestApp.AspNetCore/TestMiddleware.cs

@@ -3,7 +3,7 @@
 
 namespace TestApp.AspNetCore;
 
-public static class TestMiddleware
+internal static class TestMiddleware
 {
     private static readonly AsyncLocal<Action<IApplicationBuilder>?> Current = new();