Merge pull request #88 from ren8179/master

兼容配置项被修改(重命名/嵌套)的情况

Author: SpringLeee

example/HttpReports.Collector.Demo/Startup.cs

@@ -1,6 +1,8 @@
+using HttpReports.Transport.Http;
 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 System;
@@ -12,10 +14,21 @@ namespace HttpReports.Collector.Demo
 {
     public class Startup
     {
-        
+        public Startup(IConfiguration configuration)
+        {
+            Configuration = configuration;
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public IConfiguration Configuration { get; }
+
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddHttpReports().AddHttpTransport();
+            //services.AddHttpReports().AddHttpTransport();
+            services.Configure<HttpReportsOptions>(Configuration.GetSection("HttpReports"));
+            services.Configure<HttpTransportOptions>(Configuration.GetSection("HttpReports").GetSection("Transport"));
+            services.AddHttpReports(Configuration).AddHttpTransport(Configuration);
         }
 
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)

src/HttpReports.Transport.Http/DependencyInjectionExtensions.cs

@@ -1,58 +1,57 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Http.Headers;
-using System.Text;
-using HttpReports;
+using HttpReports;
 using HttpReports.Core;
 using HttpReports.Transport.Http;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection.Extensions; 
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using System;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
     public static class DependencyInjectionExtensions
-    { 
+    {
         [Obsolete("Use AddHttpTransport instead")]
         public static IHttpReportsBuilder UseHttpTransport(this IHttpReportsBuilder builder)
         {
             builder.Services.AddOptions().Configure<HttpTransportOptions>(builder.Configuration.GetSection("Transport"));
             return builder.AddHttpTransportService();
         }
 
-
         [Obsolete("Use AddHttpTransport instead")]
         public static IHttpReportsBuilder UseHttpTransport(this IHttpReportsBuilder builder, Action<HttpTransportOptions> options)
         {
             builder.Services.AddOptions().Configure(options);
             return builder.AddHttpTransportService();
-        } 
-
+        }
 
         public static IHttpReportsBuilder AddHttpTransport(this IHttpReportsBuilder builder)
-        { 
+        {
             builder.Services.AddOptions().Configure<HttpTransportOptions>(builder.Configuration.GetSection("Transport"));
             return builder.AddHttpTransportService();
         }
 
+        public static IHttpReportsBuilder AddHttpTransport(this IHttpReportsBuilder builder, IConfiguration configuration)
+        {
+            return builder.AddHttpTransportService();
+        }
+
         public static IHttpReportsBuilder AddHttpTransport(this IHttpReportsBuilder builder, Action<HttpTransportOptions> options)
-        { 
+        {
             builder.Services.AddOptions().Configure(options);
             return builder.AddHttpTransportService();
         }
 
         private static IHttpReportsBuilder AddHttpTransportService(this IHttpReportsBuilder builder)
         {
-            builder.Services.AddHttpClient(BasicConfig.HttpReportsHttpClient,client => {
-
-                client.DefaultRequestHeaders.Clear(); 
+            builder.Services.AddHttpClient(BasicConfig.HttpReportsHttpClient, client =>
+            {
+                client.DefaultRequestHeaders.Clear();
                 client.Timeout = TimeSpan.FromSeconds(5);
 
             });
 
             builder.Services.RemoveAll<IReportsTransport>();
-            builder.Services.AddSingleton<IReportsTransport, HttpTransport>(); 
+            builder.Services.AddSingleton<IReportsTransport, HttpTransport>();
             return builder;
         }
     }
-
 }

src/HttpReports.Transport.Http/HttpTransport.cs

@@ -1,11 +1,11 @@
-using HttpReports.Core; 
+using HttpReports.Core;
 using HttpReports.Core.Models;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options; 
+using Microsoft.Extensions.Options;
 using System;
 using System.Collections.Generic;
 using System.Net;
-using System.Net.Http; 
+using System.Net.Http;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
@@ -15,14 +15,13 @@ namespace HttpReports.Transport.Http
 {
     public class HttpTransport : IReportsTransport
     {
-        public HttpTransportOptions _options { get; } 
+        public HttpTransportOptions _options { get; }
 
-        private readonly AsyncCallbackDeferFlushCollection<RequestBag> _RequestBagCollection; 
+        private readonly AsyncCallbackDeferFlushCollection<RequestBag> _RequestBagCollection;
 
         private readonly ILogger<HttpTransport> _logger;
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly JsonSerializerOptions _jsonSetting;
-        private readonly JsonSerializerOptions jsonSerializer;
 
 
         public HttpTransport(IOptions<HttpTransportOptions> options, JsonSerializerOptions jsonSetting, ILogger<HttpTransport> logger, IHttpClientFactory httpClientFactory)
@@ -31,31 +30,35 @@ public HttpTransport(IOptions<HttpTransportOptions> options, JsonSerializerOptio
             _logger = logger;
             _httpClientFactory = httpClientFactory;
             _jsonSetting = jsonSetting;
-            _RequestBagCollection = new AsyncCallbackDeferFlushCollection<RequestBag>(Push, _options.DeferThreshold,_options.DeferSecond); 
-        }   
+            if (_options.CollectorAddress != null)
+                _RequestBagCollection = new AsyncCallbackDeferFlushCollection<RequestBag>(Push, _options.DeferThreshold, _options.DeferSecond);
+        }
 
         public Task SendDataAsync(RequestBag bag)
-        { 
-            _RequestBagCollection.Flush(bag);
+        {
+            if (_RequestBagCollection != null)
+                _RequestBagCollection.Flush(bag);
 
             return Task.CompletedTask;
-        } 
+        }
 
         public async Task SendDataAsync(Performance performance)
         {
-            await Retry(async () => {
+            if (_options.CollectorAddress == null) return;
+            await Retry(async () =>
+            {
 
                 try
                 {
-                    HttpContent content = new StringContent(HttpUtility.HtmlEncode(System.Text.Json.JsonSerializer.Serialize(performance,_jsonSetting)), System.Text.Encoding.UTF8, "application/json");
+                    HttpContent content = new StringContent(HttpUtility.HtmlEncode(System.Text.Json.JsonSerializer.Serialize(performance, _jsonSetting)), System.Text.Encoding.UTF8, "application/json");
 
                     content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
                     content.Headers.Add(BasicConfig.TransportType, typeof(Performance).Name);
 
                     var response = await _httpClientFactory.CreateClient(BasicConfig.HttpReportsHttpClient).PostAsync(_options.CollectorAddress + BasicConfig.TransportPath.Substring(1), content);
 
                     return response.StatusCode == HttpStatusCode.OK;
-                } 
+                }
                 catch (Exception ex) when (ex is HttpRequestException || ex is TaskCanceledException)
                 {
                     _logger.LogWarning("HttpReports transport failed...");
@@ -65,57 +68,59 @@ await Retry(async () => {
                 {
                     //_logger.LogError(ex, "performance push failed:" + ex.ToString());
                     return false;
-                }   
+                }
 
             });
 
-        } 
+        }
 
         private async Task Push(List<RequestBag> list, CancellationToken token)
-        { 
-           await Retry(async () => {
+        {
+            if (_options.CollectorAddress == null) return;
+            await Retry(async () =>
+            {
 
-               try
-               {
-                   HttpContent content = new StringContent(HttpUtility.HtmlEncode( System.Text.Json.JsonSerializer.Serialize(list,_jsonSetting)), System.Text.Encoding.UTF8);
+                try
+                {
+                    HttpContent content = new StringContent(HttpUtility.HtmlEncode(System.Text.Json.JsonSerializer.Serialize(list, _jsonSetting)), System.Text.Encoding.UTF8);
 
-                   content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
-                   content.Headers.Add(BasicConfig.TransportType, typeof(RequestBag).Name);
-                   var response = await _httpClientFactory.CreateClient(BasicConfig.HttpReportsHttpClient).PostAsync(_options.CollectorAddress + BasicConfig.TransportPath.Substring(1), content);
+                    content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
+                    content.Headers.Add(BasicConfig.TransportType, typeof(RequestBag).Name);
+                    var response = await _httpClientFactory.CreateClient(BasicConfig.HttpReportsHttpClient).PostAsync(_options.CollectorAddress + BasicConfig.TransportPath.Substring(1), content);
 
-                   var result = await response.Content.ReadAsStringAsync();
+                    var result = await response.Content.ReadAsStringAsync();
 
-                   return response.StatusCode == HttpStatusCode.OK;
+                    return response.StatusCode == HttpStatusCode.OK;
 
-               } 
-               catch (Exception ex) when (ex is HttpRequestException || ex is TaskCanceledException) 
-               {
-                   _logger.LogWarning("HttpReports transport failed...");
-                   return false;
-               }
-               catch (Exception ex)
-               { 
-                   _logger.LogWarning("HttpReports transport failed:" + ex.ToString());
-                   return false;
-               } 
+                }
+                catch (Exception ex) when (ex is HttpRequestException || ex is TaskCanceledException)
+                {
+                    _logger.LogWarning("HttpReports transport failed...");
+                    return false;
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogWarning("HttpReports transport failed:" + ex.ToString());
+                    return false;
+                }
 
-            });   
-        }   
+            });
+        }
 
         private async Task<bool> Retry(Func<Task<bool>> func, int retry = 3)
-        {    
+        {
             for (int i = 0; i < 3; i++)
             {
                 await Task.Delay(200);
 
                 if (await func.Invoke())
                 {
                     return true;
-                }  
+                }
             }
 
             return false;
-        }   
+        }
 
     }
 }