removed fake service tracer (ThreeMammals#511)

* removed fake service tracer * removed comments
js8080 · Jul 30, 2018 · 049731b · 049731b
1 parent a5bb74a
commit 049731b
Show file tree

Hide file tree

Showing 8 changed files with 318 additions and 321 deletions.
diff --git a/src/Ocelot/Configuration/Creator/HttpHandlerOptionsCreator.cs b/src/Ocelot/Configuration/Creator/HttpHandlerOptionsCreator.cs
@@ -1,24 +1,26 @@
-using Butterfly.Client.Tracing;
-using Ocelot.Configuration.File;
-using Ocelot.Requester;
-
-namespace Ocelot.Configuration.Creator
-{
-    public class HttpHandlerOptionsCreator : IHttpHandlerOptionsCreator
-    {
-        private readonly IServiceTracer _tracer;
-
-        public HttpHandlerOptionsCreator(IServiceTracer tracer)
-        {
-            _tracer = tracer;
-        }
-
-        public HttpHandlerOptions Create(FileHttpHandlerOptions options)
-        {
-            var useTracing = _tracer.GetType() != typeof(FakeServiceTracer) && options.UseTracing;
-
-            return new HttpHandlerOptions(options.AllowAutoRedirect,
-                options.UseCookieContainer, useTracing, options.UseProxy);
-        }
-    }
-}
+namespace Ocelot.Configuration.Creator
+{
+    using System;
+    using Butterfly.Client.Tracing;
+    using Microsoft.Extensions.DependencyInjection;
+    using Ocelot.Configuration.File;
+    using Ocelot.Requester;
+
+    public class HttpHandlerOptionsCreator : IHttpHandlerOptionsCreator
+    {
+        private readonly IServiceTracer _tracer;
+
+        public HttpHandlerOptionsCreator(IServiceProvider services)
+        {
+            _tracer = services.GetService<IServiceTracer>();
+        }
+
+        public HttpHandlerOptions Create(FileHttpHandlerOptions options)
+        {
+            var useTracing = _tracer!= null && options.UseTracing;
+
+            return new HttpHandlerOptions(options.AllowAutoRedirect,
+                options.UseCookieContainer, useTracing, options.UseProxy);
+        }
+    }
+}
diff --git a/src/Ocelot/DependencyInjection/OcelotBuilder.cs b/src/Ocelot/DependencyInjection/OcelotBuilder.cs
@@ -158,8 +158,6 @@ public OcelotBuilder(IServiceCollection services, IConfiguration configurationRo
             _services.TryAddSingleton<IResponseAggregator, SimpleJsonResponseAggregator>();
             _services.AddSingleton<ITracingHandlerFactory, TracingHandlerFactory>();
 
-            // We add this here so that we can always inject something into the factory for IoC..
-            _services.AddSingleton<IServiceTracer, FakeServiceTracer>();
             _services.TryAddSingleton<IFileConfigurationPollerOptions, InMemoryFileConfigurationPollerOptions>();
             _services.TryAddSingleton<IAddHeadersToResponse, AddHeadersToResponse>();
             _services.TryAddSingleton<IPlaceholders, Placeholders>();
@@ -237,8 +235,6 @@ public IOcelotBuilder AddDelegatingHandler<THandler>(bool global = false)
 
         public IOcelotBuilder AddOpenTracing(Action<ButterflyOptions> settings)
         {
-            // Earlier we add FakeServiceTracer and need to remove it here before we add butterfly
-            _services.RemoveAll<IServiceTracer>();
             _services.AddButterfly(settings);   
             return this;
         }

diff --git a/src/Ocelot/Logging/OcelotDiagnosticListener.cs b/src/Ocelot/Logging/OcelotDiagnosticListener.cs
@@ -1,96 +1,95 @@
-using System;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DiagnosticAdapter;
-using Butterfly.Client.AspNetCore;
-using Butterfly.OpenTracing;
-using Ocelot.Middleware;
-using Butterfly.Client.Tracing;
-using System.Linq;
-using System.Collections.Generic;
-using Ocelot.Infrastructure.Extensions;
-using Ocelot.Requester;
-
-namespace Ocelot.Logging
-{
-    public class OcelotDiagnosticListener
-    {
-        private readonly IServiceTracer _tracer;
-        private readonly IOcelotLogger _logger;
-
-        public OcelotDiagnosticListener(IOcelotLoggerFactory factory, IServiceTracer tracer)
-        {
-            _tracer = tracer;
-            _logger = factory.CreateLogger<OcelotDiagnosticListener>();
-        }
-
-        [DiagnosticName("Ocelot.MiddlewareException")]
-        public virtual void OcelotMiddlewareException(Exception exception, DownstreamContext context, string name)
-        {
-            _logger.LogTrace($"Ocelot.MiddlewareException: {name}; {exception.Message};");
-            Event(context.HttpContext, $"Ocelot.MiddlewareStarted: {name}; {context.HttpContext.Request.Path}");
-        }
-
-        [DiagnosticName("Ocelot.MiddlewareStarted")]
-        public virtual void OcelotMiddlewareStarted(DownstreamContext context, string name)
-        {
-            _logger.LogTrace($"Ocelot.MiddlewareStarted: {name}; {context.HttpContext.Request.Path}");
-            Event(context.HttpContext, $"Ocelot.MiddlewareStarted: {name}; {context.HttpContext.Request.Path}");
-        }
-
-        [DiagnosticName("Ocelot.MiddlewareFinished")]
-        public virtual void OcelotMiddlewareFinished(DownstreamContext context, string name)
-        {
-            _logger.LogTrace($"Ocelot.MiddlewareFinished: {name}; {context.HttpContext.Request.Path}");
-            Event(context.HttpContext, $"OcelotMiddlewareFinished: {name}; {context.HttpContext.Request.Path}");
-        }
-
-        [DiagnosticName("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareStarting")]
-        public virtual void OnMiddlewareStarting(HttpContext httpContext, string name)
-        {
-            _logger.LogTrace($"MiddlewareStarting: {name}; {httpContext.Request.Path}");
-            Event(httpContext, $"MiddlewareStarting: {name}; {httpContext.Request.Path}");
-        }
-
-        [DiagnosticName("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareException")]
-        public virtual void OnMiddlewareException(Exception exception, string name)
-        {
-            _logger.LogTrace($"MiddlewareException: {name}; {exception.Message};");
-        }
-
-        [DiagnosticName("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareFinished")]
-        public virtual void OnMiddlewareFinished(HttpContext httpContext, string name)
-        {
-            _logger.LogTrace($"MiddlewareFinished: {name}; {httpContext.Response.StatusCode}");
-            Event(httpContext, $"MiddlewareFinished: {name}; {httpContext.Response.StatusCode}");
-        }
-
-        private void Event(HttpContext httpContext, string @event)
-        {  
-            // todo - if the user isnt using tracing the code gets here and will blow up on 
-            // _tracer.Tracer.TryExtract. We already use the fake tracer for another scenario
-            // so sticking it here as well..I guess we need a factory for this but cba to do it at
-            // the moment
-            if(_tracer.GetType() == typeof(FakeServiceTracer))
-            {
-                return;
-            }
-
-            var span = httpContext.GetSpan();
-
-            if(span == null)
-            {
-                var spanBuilder = new SpanBuilder($"server {httpContext.Request.Method} {httpContext.Request.Path}");
-                if (_tracer.Tracer.TryExtract(out var spanContext, httpContext.Request.Headers, (c, k) => c[k].GetValue(),
-                    c => c.Select(x => new KeyValuePair<string, string>(x.Key, x.Value.GetValue())).GetEnumerator()))
-                {
-                    spanBuilder.AsChildOf(spanContext);
-                }
-
-                span = _tracer.Start(spanBuilder);        
-                httpContext.SetSpan(span);   
-            }
-
-            span?.Log(LogField.CreateNew().Event(@event));
-        }
-    }
-}
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DiagnosticAdapter;
+using Microsoft.Extensions.DependencyInjection;
+using Butterfly.Client.AspNetCore;
+using Butterfly.OpenTracing;
+using Ocelot.Middleware;
+using Butterfly.Client.Tracing;
+using System.Linq;
+using System.Collections.Generic;
+using Ocelot.Infrastructure.Extensions;
+using Ocelot.Requester;
+
+namespace Ocelot.Logging
+{
+    public class OcelotDiagnosticListener
+    {
+        private readonly IServiceTracer _tracer;
+        private readonly IOcelotLogger _logger;
+
+        public OcelotDiagnosticListener(IOcelotLoggerFactory factory, IServiceProvider services)
+        {
+            _tracer = services.GetService<IServiceTracer>();
+            _logger = factory.CreateLogger<OcelotDiagnosticListener>();
+        }
+
+        [DiagnosticName("Ocelot.MiddlewareException")]
+        public virtual void OcelotMiddlewareException(Exception exception, DownstreamContext context, string name)
+        {
+            _logger.LogTrace($"Ocelot.MiddlewareException: {name}; {exception.Message};");
+            Event(context.HttpContext, $"Ocelot.MiddlewareStarted: {name}; {context.HttpContext.Request.Path}");
+        }
+
+        [DiagnosticName("Ocelot.MiddlewareStarted")]
+        public virtual void OcelotMiddlewareStarted(DownstreamContext context, string name)
+        {
+            _logger.LogTrace($"Ocelot.MiddlewareStarted: {name}; {context.HttpContext.Request.Path}");
+            Event(context.HttpContext, $"Ocelot.MiddlewareStarted: {name}; {context.HttpContext.Request.Path}");
+        }
+
+        [DiagnosticName("Ocelot.MiddlewareFinished")]
+        public virtual void OcelotMiddlewareFinished(DownstreamContext context, string name)
+        {
+            _logger.LogTrace($"Ocelot.MiddlewareFinished: {name}; {context.HttpContext.Request.Path}");
+            Event(context.HttpContext, $"OcelotMiddlewareFinished: {name}; {context.HttpContext.Request.Path}");
+        }
+
+        [DiagnosticName("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareStarting")]
+        public virtual void OnMiddlewareStarting(HttpContext httpContext, string name)
+        {
+            _logger.LogTrace($"MiddlewareStarting: {name}; {httpContext.Request.Path}");
+            Event(httpContext, $"MiddlewareStarting: {name}; {httpContext.Request.Path}");
+        }
+
+        [DiagnosticName("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareException")]
+        public virtual void OnMiddlewareException(Exception exception, string name)
+        {
+            _logger.LogTrace($"MiddlewareException: {name}; {exception.Message};");
+        }
+
+        [DiagnosticName("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareFinished")]
+        public virtual void OnMiddlewareFinished(HttpContext httpContext, string name)
+        {
+            _logger.LogTrace($"MiddlewareFinished: {name}; {httpContext.Response.StatusCode}");
+            Event(httpContext, $"MiddlewareFinished: {name}; {httpContext.Response.StatusCode}");
+        }
+
+        private void Event(HttpContext httpContext, string @event)
+        {  
+            // todo - if the user isnt using tracing the code gets here and will blow up on 
+            // _tracer.Tracer.TryExtract..
+            if(_tracer == null)
+            {
+                return;
+            }
+
+            var span = httpContext.GetSpan();
+
+            if(span == null)
+            {
+                var spanBuilder = new SpanBuilder($"server {httpContext.Request.Method} {httpContext.Request.Path}");
+                if (_tracer.Tracer.TryExtract(out var spanContext, httpContext.Request.Headers, (c, k) => c[k].GetValue(),
+                    c => c.Select(x => new KeyValuePair<string, string>(x.Key, x.Value.GetValue())).GetEnumerator()))
+                {
+                    spanBuilder.AsChildOf(spanContext);
+                }
+
+                span = _tracer.Start(spanBuilder);        
+                httpContext.SetSpan(span);   
+            }
+
+            span?.Log(LogField.CreateNew().Event(@event));
+        }
+    }
+}
diff --git a/src/Ocelot/Requester/FakeServiceTracer.cs b/src/Ocelot/Requester/FakeServiceTracer.cs
diff --git a/src/Ocelot/Requester/TracingHandlerFactory.cs b/src/Ocelot/Requester/TracingHandlerFactory.cs
@@ -1,19 +1,21 @@
-using Butterfly.Client.Tracing;
-using Ocelot.Infrastructure.RequestData;
-
 namespace Ocelot.Requester
 {
+    using System;
+    using Butterfly.Client.Tracing;
+    using Ocelot.Infrastructure.RequestData;
+    using Microsoft.Extensions.DependencyInjection;
+
     public class TracingHandlerFactory : ITracingHandlerFactory
     {
         private readonly IServiceTracer _tracer;
         private readonly IRequestScopedDataRepository _repo;
 
         public TracingHandlerFactory(
-            IServiceTracer tracer,
+            IServiceProvider services,
             IRequestScopedDataRepository repo)
         {
             _repo = repo;
-            _tracer = tracer;
+            _tracer = services.GetService<IServiceTracer>();
         }
 
         public ITracingHandler Get()