From 03815ea07ea7e4737f70ba85152a00ff6853824b Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Tue, 15 Oct 2019 14:27:47 +0300
Subject: [PATCH] CorrelationIdOptions to AbpCorrelationIdOptions

---
 .../Abp/AspNetCore/Tracing/AbpCorrelationIdMiddleware.cs  | 6 +++---
 .../AspNetCore/Tracing/AspNetCoreCorrelationIdProvider.cs | 4 ++--
 ...CorrelationIdOptions.cs => AbpCorrelationIdOptions.cs} | 2 +-
 .../Client/DynamicProxying/DynamicHttpProxyInterceptor.cs | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename framework/src/Volo.Abp.Core/Volo/Abp/Tracing/{CorrelationIdOptions.cs => AbpCorrelationIdOptions.cs} (81%)

diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AbpCorrelationIdMiddleware.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AbpCorrelationIdMiddleware.cs
index e9a7def252..b3ee565100 100644
--- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AbpCorrelationIdMiddleware.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AbpCorrelationIdMiddleware.cs
@@ -8,10 +8,10 @@ namespace Volo.Abp.AspNetCore.Tracing
 {
     public class AbpCorrelationIdMiddleware : IMiddleware, ITransientDependency
     {
-        private readonly CorrelationIdOptions _options;
+        private readonly AbpCorrelationIdOptions _options;
         private readonly ICorrelationIdProvider _correlationIdProvider;
 
-        public AbpCorrelationIdMiddleware(IOptions<CorrelationIdOptions> options,
+        public AbpCorrelationIdMiddleware(IOptions<AbpCorrelationIdOptions> options,
             ICorrelationIdProvider correlationIdProvider)
         {
             _options = options.Value;
@@ -34,7 +34,7 @@ namespace Volo.Abp.AspNetCore.Tracing
 
         protected virtual void CheckAndSetCorrelationIdOnResponse(
             HttpContext httpContext,
-            CorrelationIdOptions options,
+            AbpCorrelationIdOptions options,
             string correlationId)
         {
             if (httpContext.Response.HasStarted)
diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AspNetCoreCorrelationIdProvider.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AspNetCoreCorrelationIdProvider.cs
index e62f1ed2a4..7b9915cbd9 100644
--- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AspNetCoreCorrelationIdProvider.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AspNetCoreCorrelationIdProvider.cs
@@ -10,11 +10,11 @@ namespace Volo.Abp.AspNetCore.Tracing
     public class AspNetCoreCorrelationIdProvider : ICorrelationIdProvider, ITransientDependency
     {
         protected IHttpContextAccessor HttpContextAccessor { get; }
-        protected CorrelationIdOptions Options { get; }
+        protected AbpCorrelationIdOptions Options { get; }
 
         public AspNetCoreCorrelationIdProvider(
             IHttpContextAccessor httpContextAccessor,
-            IOptions<CorrelationIdOptions> options)
+            IOptions<AbpCorrelationIdOptions> options)
         {
             HttpContextAccessor = httpContextAccessor;
             Options = options.Value;
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Tracing/CorrelationIdOptions.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Tracing/AbpCorrelationIdOptions.cs
similarity index 81%
rename from framework/src/Volo.Abp.Core/Volo/Abp/Tracing/CorrelationIdOptions.cs
rename to framework/src/Volo.Abp.Core/Volo/Abp/Tracing/AbpCorrelationIdOptions.cs
index 0b794674ad..38cd6ca87f 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Tracing/CorrelationIdOptions.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Tracing/AbpCorrelationIdOptions.cs
@@ -1,6 +1,6 @@
 namespace Volo.Abp.Tracing
 {
-    public class CorrelationIdOptions
+    public class AbpCorrelationIdOptions
     {
         public string HttpHeaderName { get; set; } = "X-Correlation-Id";
 
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
index 8e8e2a6492..4e976a25cd 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
@@ -31,7 +31,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying
         protected ICancellationTokenProvider CancellationTokenProvider { get; }
         protected ICorrelationIdProvider CorrelationIdProvider { get; }
         protected ICurrentTenant CurrentTenant { get; }
-        protected CorrelationIdOptions CorrelationIdOptions { get; }
+        protected AbpCorrelationIdOptions AbpCorrelationIdOptions { get; }
         protected IDynamicProxyHttpClientFactory HttpClientFactory { get; }
         protected IApiDescriptionFinder ApiDescriptionFinder { get; }
         protected RemoteServiceOptions RemoteServiceOptions { get; }
@@ -57,13 +57,13 @@ namespace Volo.Abp.Http.Client.DynamicProxying
             IRemoteServiceHttpClientAuthenticator clientAuthenticator,
             ICancellationTokenProvider cancellationTokenProvider,
             ICorrelationIdProvider correlationIdProvider, 
-            IOptions<CorrelationIdOptions> correlationIdOptions,
+            IOptions<AbpCorrelationIdOptions> correlationIdOptions,
             ICurrentTenant currentTenant)
         {
             CancellationTokenProvider = cancellationTokenProvider;
             CorrelationIdProvider = correlationIdProvider;
             CurrentTenant = currentTenant;
-            CorrelationIdOptions = correlationIdOptions.Value;
+            AbpCorrelationIdOptions = correlationIdOptions.Value;
             HttpClientFactory = httpClientFactory;
             ApiDescriptionFinder = apiDescriptionFinder;
             JsonSerializer = jsonSerializer;
@@ -215,7 +215,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying
             }
 
             //CorrelationId
-            requestMessage.Headers.Add(CorrelationIdOptions.HttpHeaderName, CorrelationIdProvider.Get());
+            requestMessage.Headers.Add(AbpCorrelationIdOptions.HttpHeaderName, CorrelationIdProvider.Get());
 
             //TenantId
             if (CurrentTenant.Id.HasValue)