Merge pull request #580 from WideSpectrumComputing/master

Rollbar.NetCore.AspNet module: fixed incorrect assignment of captured HTTP response body
rollbar · Mar 9, 2021 · fc917de · fc917de
2 parents 2196edd + d6771a2
commit fc917de
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 14 deletions.
diff --git a/Rollbar.NetCore.AspNet/HttpRequestPackageDecorator.cs b/Rollbar.NetCore.AspNet/HttpRequestPackageDecorator.cs
@@ -2,12 +2,8 @@
 
 namespace Rollbar.NetCore.AspNet
 {
-    using System;
     using System.Collections.Generic;
-    using System.IO;
-    using System.Text;
     using Microsoft.AspNetCore.Http;
-    using Newtonsoft.Json;
     using Rollbar.Common;
     using Rollbar.DTOs;
     using Rollbar.Serialization.Json;

diff --git a/Rollbar.NetCore.AspNet/HttpResponsePackageDecorator.cs b/Rollbar.NetCore.AspNet/HttpResponsePackageDecorator.cs
@@ -1,11 +1,7 @@
 namespace Rollbar.NetCore.AspNet
 {
-    using System;
     using System.Collections.Generic;
-    using System.IO;
-    using System.Text;
     using Microsoft.AspNetCore.Http;
-    using Newtonsoft.Json;
     using Rollbar.Common;
     using Rollbar.DTOs;
     using Rollbar.Serialization.Json;
@@ -92,12 +88,12 @@ private void AssignResponseBody(Data rollbarData)
             {
                 return;
             }
-            rollbarData.Request.PostBody = jsonString;
+            rollbarData.Response.Body = jsonString;
 
             object requesBodyObject = JsonUtil.InterpretAsJsonObject(jsonString);
             if (requesBodyObject != null)
             {
-                rollbarData.Request.PostBody = requesBodyObject;
+                rollbarData.Response.Body = requesBodyObject;
             }
         }
 

diff --git a/Samples/Sample.AspNetCore2.WebApi/Controllers/ValuesController.cs b/Samples/Sample.AspNetCore2.WebApi/Controllers/ValuesController.cs
@@ -9,6 +9,8 @@
     using Microsoft.Extensions.Logging;
     using dto = Rollbar.DTOs;
     using Rollbar.Telemetry;
+    using System.IO;
+    using System.Text;
 
     [Route("api/[controller]")]
     public class ValuesController 
@@ -38,10 +40,21 @@ public ValuesController(ILogger<ValuesController> logger, IHttpContextAccessor h
 
         // GET api/values
         [HttpGet]
+        //public Task<IEnumerable<string>> GetAsync()
         public IEnumerable<string> Get()
         {
             this._logger.LogCritical(nameof(ValuesController) + ".Get() is called...");
 
+            //StreamWriter streamWriter = new StreamWriter(this._httpContextAccessor.HttpContext.Response.Body);
+            //streamWriter.WriteLine($"{DateTime.Now} Adding response body");
+            //streamWriter.Flush();
+
+            //await streamWriter.WriteLineAsync($"{DateTime.Now} Adding response body");
+            //await streamWriter.FlushAsync();
+
+            //await this._httpContextAccessor.HttpContext.Response.BodyWriter.WriteAsync(Encoding.UTF8.GetBytes("Adding response body"));
+            //await this._httpContextAccessor.HttpContext.Response.BodyWriter.FlushAsync();
+
             try
             {
                 int level = 0;

diff --git a/Samples/Sample.AspNetCore2.WebApi/Startup.cs b/Samples/Sample.AspNetCore2.WebApi/Startup.cs
@@ -29,6 +29,10 @@ public void ConfigureServices(IServiceCollection services)
             //{"Endpoint Routing does not support 'IApplicationBuilder.UseMvc(...)'. To use 'IApplicationBuilder.UseMvc' set 'MvcOptions.EnableEndpointRouting = false' inside 'ConfigureServices(...)."}
             services.AddMvc(options => options.EnableEndpointRouting = false);
             services.AddOptions();
+            //services.Configure<IISServerOptions>(options =>
+            //{
+            //    options.AllowSynchronousIO = true;
+            //});
 
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 

diff --git a/SdkCommon.csproj b/SdkCommon.csproj
@@ -21,13 +21,11 @@
   </ItemGroup>
 
   <PropertyGroup Label="SDK Release Essential Info">
-    <SdkVersion>4.0.0</SdkVersion>           <!-- Required: major.minor.patch -->
+    <SdkVersion>4.0.1</SdkVersion>           <!-- Required: major.minor.patch -->
     <SdkVersionSuffix></SdkVersionSuffix>     <!-- Optional. Examples: alpha, beta, preview, RC etc. -->
     <SdkLtsRelease>false</SdkLtsRelease>      <!-- Optional. Examples: false (default) or true. -->
     <SdkReleaseNotes>                         <!-- Required -->
-      - refactor: resolve GH#577 - Remove unnecessary explicit dependencies from the core Rollbar module
-      - refactor: resolve GH#576 - Move appsettings.json support into its own new module Rollbar.AppSettings.Json
-      - refactor: resolve GH#575 - Move app.config support into its own new module Rollbar.App.Config
+      - fix: Rollbar.NetCore.AspNet module: fixed incorrect assignment of captured HTTP response body 
     </SdkReleaseNotes>                        
 
     <!--