升级3.1

samples/SimpleApi/SimpleApi.csproj

 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -9,8 +9,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.2" PrivateAssets="All" />
     <PackageReference Include="WebApiClient.JIT" Version="1.1.3" />
   </ItemGroup>
 

samples/SimpleApi/Startup.cs

@@ -34,14 +34,18 @@ namespace SimpleApi
                 opt.HttpHost = new Uri("http://localhost:5001/");
             });
 
-            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+            services.AddControllers();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        public void Configure(IApplicationBuilder app)
         {
             app.UseBailunRequestLogging();
-            app.UseMvc();
+            app.UseRouting();
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapControllers();
+            });
 
         }
     }

src/Bailun.ServiceFabric.Trace/Bailun.ServiceFabric.Trace.csproj

 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Exceptionless" Version="4.3.2027" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="2.1.1" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Exceptionless" Version="4.4.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Serilog" Version="2.9.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
     <PackageReference Include="SkyAPM.Agent.AspNetCore" Version="0.9.0" />

src/Bailun.ServiceFabric.Trace/Diagnostics/AspNetCore/HostingDiagnosticProcessor.cs

 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Extensions;
-using Microsoft.AspNetCore.Http.Internal;
-using Microsoft.AspNetCore.Mvc.Abstractions;
 using Newtonsoft.Json;
+using Microsoft.AspNetCore.Http.Extensions;
 using SkyApm;
 using SkyApm.Common;
 using SkyApm.Diagnostics;
@@ -90,14 +88,14 @@ namespace Bailun.Diagnostics.AspNetCore
         }
 
         //[DiagnosticName("Microsoft.AspNetCore.Mvc.BeforeAction")]
-        public void BeforeAction([Property] ActionDescriptor actionDescriptor, [Property] HttpContext httpContext)
-        {
-        }
-
-        //[DiagnosticName("Microsoft.AspNetCore.Mvc.AfterAction")]
-        public void AfterAction([Property] ActionDescriptor actionDescriptor, [Property] HttpContext httpContext)
-        {
-        }
+        //public void BeforeAction([Property] ActionDescriptor actionDescriptor, [Property] HttpContext httpContext)
+        //{
+        //}
+
+        ////[DiagnosticName("Microsoft.AspNetCore.Mvc.AfterAction")]
+        //public void AfterAction([Property] ActionDescriptor actionDescriptor, [Property] HttpContext httpContext)
+        //{
+        //}
     }
 
     internal static class StringExtension
@@ -108,7 +106,7 @@ namespace Bailun.Diagnostics.AspNetCore
             if (request.ContentLength == null || !(request.ContentLength > 0))
                 return body;
 
-            request.EnableRewind();
+            request.EnableBuffering();
             request.Body.Seek(0, SeekOrigin.Begin);
 
             var buffer = new byte[Convert.ToInt32(request.ContentLength)];

src/Bailun.ServiceFabric.Trace/Extensions/Host/WebHostBuilderExtensions.cs

@@ -6,6 +6,7 @@ using Microsoft.Extensions.DependencyInjection;
 using SkyApm;
 using Bailun.Diagnostics.AspNetCore;
 using Bailun.Diagnostics.HttpClient;
+using Microsoft.Extensions.Hosting;
 
 namespace Microsoft.AspNetCore.Hosting
 {

src/Bailun.ServiceFabric.Trace/Middlewares/ApplicationBuilderExtensions.cs

@@ -6,7 +6,6 @@ using Serilog.AspNetCore;
 using System;
 using System.IO;
 using System.Text;
-using Microsoft.AspNetCore.Http.Internal;
 
 namespace Microsoft.AspNetCore.Builder
 {

test/Bailun.ServiceFabric.Trace.Test/Bailun.ServiceFabric.Trace.Test.csproj

 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>