Remove httpclient customization

Make websocket handler scoped
forik · Apr 22, 2020 · 2382b6c · 2382b6c
1 parent df971bb
commit 2382b6c
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 23 deletions.
diff --git a/App2/App3Client.cs b/App2/App3Client.cs
@@ -1,21 +1,27 @@
-using System.Net.Http;
+using System;
+using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Configuration;
 
 namespace App2
 {
     public class App3Client
     {
         private readonly HttpClient _client;
+        private readonly IConfiguration _config;
 
-        public App3Client(HttpClient client)
+        public App3Client(HttpClient client, IConfiguration config)
         {
             _client = client;
+            _config = config;
         }
 
         public async Task SendAsync(string message)
         {
-            await _client.PostAsync("/ping", new StringContent(message, Encoding.UTF8, "application/json"));
+            var uri = new Uri(_config["Dependency"] + "/ping");
+
+            await _client.PostAsync(uri, new StringContent(message, Encoding.UTF8, "application/json"));
         }
     }
 }
diff --git a/App2/Startup.cs b/App2/Startup.cs
@@ -28,10 +28,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddApplicationInsightsTelemetry();
 
             services.AddControllers();
-            services.AddHttpClient<App3Client>(client =>
-            {
-                client.BaseAddress = new Uri(Configuration["Dependency"]);
-            });
+            services.AddHttpClient<App3Client>();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

diff --git a/App2/appsettings.json b/App2/appsettings.json
@@ -8,5 +8,5 @@
     }
   },
   "AllowedHosts": "*",
-  "Dependency": "http://localhost:5002/app3"
+  "Dependency": "http://localhost:5002"
 }
diff --git a/Origin1/App2Client.cs b/Origin1/App2Client.cs
@@ -2,21 +2,26 @@
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Configuration;
 
 namespace Origin1
 {
     public class App2Client
     {
         private readonly HttpClient _client;
+        private readonly IConfiguration _config;
 
-        public App2Client(HttpClient client)
+        public App2Client(HttpClient client, IConfiguration config)
         {
             _client = client;
+            _config = config;
         }
 
         public async Task SendAsync(string message)
         {
-            var resp = await _client.PostAsync("/ping", new StringContent(message, Encoding.UTF8, "application/json"));
+            var uri = new Uri(_config["Dependency"] + "/ping");
+
+            var resp = await _client.PostAsync(uri, new StringContent(message, Encoding.UTF8, "application/json"));
             Console.WriteLine(await resp.Content.ReadAsStringAsync());
         }
     }

diff --git a/Origin1/Startup.cs b/Origin1/Startup.cs
@@ -29,11 +29,8 @@ public void ConfigureServices(IServiceCollection services)
             services.AddApplicationInsightsTelemetry();
 
             services.AddControllers();
-            services.AddHttpClient<App2Client>(client =>
-            {
-                client.BaseAddress = new Uri(Configuration["Dependency"]);
-            });
-            services.AddSingleton<ReproWebSocketHandler>();
+            services.AddHttpClient<App2Client>();
+            services.AddScoped<ReproWebSocketHandler>();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

diff --git a/Origin1/WebSockets/ReproWebSocketMiddleware.cs b/Origin1/WebSockets/ReproWebSocketMiddleware.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Buffers;
+using System.Diagnostics;
 using System.IO;
 using System.Net.WebSockets;
 using System.Text;
@@ -13,20 +14,17 @@ namespace Origin1.WebSockets
     public class ReproWebSocketMiddleware
     {
         private readonly ILogger<ReproWebSocketHandler> _logger;
-        private readonly ReproWebSocketHandler _handler;
         private readonly RequestDelegate _next;
 
         public ReproWebSocketMiddleware(
             ILogger<ReproWebSocketHandler> logger,
-            ReproWebSocketHandler handler,
             RequestDelegate next)
         {
             _logger = logger;
-            _handler = handler;
             _next = next;
         }
 
-        public async Task Invoke(HttpContext context)
+        public async Task Invoke(HttpContext context, ReproWebSocketHandler handler)
         {
             try
             {
@@ -37,7 +35,7 @@ public async Task Invoke(HttpContext context)
                 }
 
                 WebSocket socket = await context.WebSockets.AcceptWebSocketAsync().ConfigureAwait(false);
-                await Receive(socket, context.RequestAborted);
+                await Receive(socket, handler, context.RequestAborted);
             }
             catch (Exception ex)
             {
@@ -46,7 +44,8 @@ public async Task Invoke(HttpContext context)
         }
 
 
-        private async Task Receive(WebSocket socket, CancellationToken contextRequestAborted)    //, Action<WebSocketReceiveResult, string> handleMessage)
+        private async Task Receive(WebSocket socket, ReproWebSocketHandler handler,
+            CancellationToken contextRequestAborted)    //, Action<WebSocketReceiveResult, string> handleMessage)
         {
             while (socket.State == WebSocketState.Open)
             {
@@ -82,8 +81,15 @@ private async Task Receive(WebSocket socket, CancellationToken contextRequestAbo
                 {
                     ArrayPool<byte>.Shared.Return(bytes);
                 }
+
+                var acitvity = new Activity("Test");
+                acitvity.Start();
+
+                Console.WriteLine("Activity: {0}", acitvity.Id);
 
-                await _handler.HandleAsync(serializedMessage);
+                await handler.HandleAsync(serializedMessage);
+
+                acitvity.Stop();
             }
         }
     }

diff --git a/Origin1/appsettings.json b/Origin1/appsettings.json
@@ -8,5 +8,5 @@
     }
   },
   "AllowedHosts": "*",
-  "Dependency": "http://localhost:5001/app2"
+  "Dependency": "http://localhost:5001"
 }