Merge pull request #29 from bmermet/globaltracer

Move tracer factory to Tracer class and add global Tracer object

Author: Emanuele Palazzetti

src/Datadog.Trace.IntegrationTests.Net45/OpenTracingSendTracesToAgent.cs

@@ -14,7 +14,7 @@ public class OpenTracingSendTracesToAgent
         public OpenTracingSendTracesToAgent()
         {
             _httpRecorder = new RecordHttpHandler();
-            _tracer = OpenTracingTracerFactory.GetTracer(new Uri("http://localhost:8126"), null, null, _httpRecorder);
+            _tracer = OpenTracingTracerFactory.CreateTracer(new Uri("http://localhost:8126"), null, null, _httpRecorder);
         }
 
         [Fact]
@@ -42,7 +42,7 @@ public async void CustomServiceName()
             const string ServiceName = "MyService";
             var serviceList = new List<ServiceInfo> { new ServiceInfo { App = App, AppType = AppType, ServiceName = ServiceName } };
             _httpRecorder = new RecordHttpHandler();
-            _tracer = OpenTracingTracerFactory.GetTracer(new Uri("http://localhost:8126"), serviceList, null, _httpRecorder);
+            _tracer = OpenTracingTracerFactory.CreateTracer(new Uri("http://localhost:8126"), serviceList, null, _httpRecorder);
 
             var span = (OpenTracingSpan)_tracer.BuildSpan("Operation")
                 .WithTag(DDTags.ResourceName, "This is a resource")
@@ -89,7 +89,7 @@ public async void Utf8Everywhere()
         public void WithDefaultFactory()
         {
             // This test does not check anything it validates that this codepath runs without exceptions
-            var tracer = OpenTracingTracerFactory.GetTracer();
+            var tracer = OpenTracingTracerFactory.CreateTracer();
             tracer.BuildSpan("Operation")
                 .Start()
                 .Finish();

src/Datadog.Trace.IntegrationTests/OpenTracingSendTracesToAgent.cs

@@ -14,7 +14,7 @@ public class OpenTracingSendTracesToAgent
         public OpenTracingSendTracesToAgent()
         {
             _httpRecorder = new RecordHttpHandler();
-            _tracer = OpenTracingTracerFactory.GetTracer(new Uri("http://localhost:8126"), null, null, _httpRecorder);
+            _tracer = OpenTracingTracerFactory.CreateTracer(new Uri("http://localhost:8126"), null, null, _httpRecorder);
         }
 
         [Fact]
@@ -42,7 +42,7 @@ public async void CustomServiceName()
             const string ServiceName = "MyService";
             var serviceList = new List<ServiceInfo> { new ServiceInfo { App = App, AppType = AppType, ServiceName = ServiceName } };
             _httpRecorder = new RecordHttpHandler();
-            _tracer = OpenTracingTracerFactory.GetTracer(new Uri("http://localhost:8126"), serviceList, null, _httpRecorder);
+            _tracer = OpenTracingTracerFactory.CreateTracer(new Uri("http://localhost:8126"), serviceList, null, _httpRecorder);
 
             var span = (OpenTracingSpan)_tracer.BuildSpan("Operation")
                 .WithTag(DDTags.ResourceName, "This is a resource")
@@ -89,7 +89,7 @@ public async void Utf8Everywhere()
         public void WithDefaultFactory()
         {
             // This test does not check anything it validates that this codepath runs without exceptions
-            var tracer = OpenTracingTracerFactory.GetTracer();
+            var tracer = OpenTracingTracerFactory.CreateTracer();
             tracer.BuildSpan("Operation")
                 .Start()
                 .Finish();

src/Datadog.Trace.IntegrationTests/SendTracesToAgent.cs

@@ -14,7 +14,7 @@ public class SendTracesToAgent
         public SendTracesToAgent()
         {
             _httpRecorder = new RecordHttpHandler();
-            _tracer = TracerFactory.GetTracer(new Uri("http://localhost:8126"), null, null, _httpRecorder);
+            _tracer = Tracer.Create(new Uri("http://localhost:8126"), null, null, _httpRecorder);
         }
 
         [Fact]
@@ -41,7 +41,7 @@ public async void CustomServiceName()
             const string ServiceName = "MyService";
             var serviceList = new List<ServiceInfo> { new ServiceInfo { App = App, AppType = AppType, ServiceName = ServiceName } };
             _httpRecorder = new RecordHttpHandler();
-            _tracer = TracerFactory.GetTracer(new Uri("http://localhost:8126"), serviceList, null, _httpRecorder);
+            _tracer = Tracer.Create(new Uri("http://localhost:8126"), serviceList, null, _httpRecorder);
 
             var scope = _tracer.StartActive("Operation", serviceName: ServiceName);
             scope.Span.ResourceName = "This is a resource";
@@ -84,10 +84,17 @@ public async void Utf8Everywhere()
         public void WithDefaultFactory()
         {
             // This test does not check anything it validates that this codepath runs without exceptions
-            var tracer = OpenTracingTracerFactory.GetTracer();
-            tracer.BuildSpan("Operation")
-                .Start()
-                .Finish();
+            var tracer = Tracer.Create();
+            tracer.StartActive("Operation")
+                .Dispose();
+        }
+
+        [Fact]
+        public void WithGlobalTracer()
+        {
+            // This test does not check anything it validates that this codepath runs without exceptions
+            Tracer.Instance.StartActive("Operation")
+                .Dispose();
         }
     }
 }

src/Datadog.Trace/Implementations/Tracer.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Net.Http;
 using Datadog.Trace.Logging;
 
 namespace Datadog.Trace
@@ -10,13 +11,19 @@ namespace Datadog.Trace
     public class Tracer : IDatadogTracer
     {
         private static readonly ILog _log = LogProvider.For<Tracer>();
+        private static Uri _defaultUri = new Uri("http://localhost:8126");
 
         private AsyncLocalScopeManager _scopeManager;
         private string _defaultServiceName;
         private Dictionary<string, ServiceInfo> _services = new Dictionary<string, ServiceInfo>();
         private IAgentWriter _agentWriter;
         private bool _isDebugEnabled;
 
+        static Tracer()
+        {
+            Instance = Create();
+        }
+
         internal Tracer(IAgentWriter agentWriter, List<ServiceInfo> serviceInfo = null, string defaultServiceName = null, bool isDebugEnabled = false)
         {
             _isDebugEnabled = isDebugEnabled;
@@ -42,6 +49,11 @@ internal Tracer(IAgentWriter agentWriter, List<ServiceInfo> serviceInfo = null,
             _scopeManager = new AsyncLocalScopeManager();
         }
 
+        /// <summary>
+        /// Gets or sets the global tracer object
+        /// </summary>
+        public static Tracer Instance { get; set; }
+
         /// <summary>
         /// Gets the active scope
         /// </summary>
@@ -53,6 +65,20 @@ internal Tracer(IAgentWriter agentWriter, List<ServiceInfo> serviceInfo = null,
 
         AsyncLocalScopeManager IDatadogTracer.ScopeManager => _scopeManager;
 
+        /// <summary>
+        /// Create a new Tracer with the given parameters
+        /// </summary>
+        /// <param name="agentEndpoint">The agent endpoint where the traces will be sent (default is http://localhost:8126).</param>
+        /// <param name="serviceInfoList">The service information list.</param>
+        /// <param name="defaultServiceName">Default name of the service (default is the name of the executing assembly).</param>
+        /// <param name="isDebugEnabled">Turns on all debug logging (this may have an impact on application performance).</param>
+        /// <returns>The newly created tracer</returns>
+        public static Tracer Create(Uri agentEndpoint = null, List<ServiceInfo> serviceInfoList = null, string defaultServiceName = null, bool isDebugEnabled = false)
+        {
+            agentEndpoint = agentEndpoint ?? _defaultUri;
+            return Create(agentEndpoint, serviceInfoList, defaultServiceName, null, isDebugEnabled);
+        }
+
         /// <summary>
         /// Make a span active and return a scope that can be disposed to desactivate the span
         /// </summary>
@@ -106,6 +132,14 @@ void IDatadogTracer.Write(List<Span> trace)
             _agentWriter.WriteTrace(trace);
         }
 
+        internal static Tracer Create(Uri agentEndpoint, List<ServiceInfo> serviceInfoList = null, string defaultServiceName = null, DelegatingHandler delegatingHandler = null, bool isDebugEnabled = false)
+        {
+            var api = new Api(agentEndpoint, delegatingHandler);
+            var agentWriter = new AgentWriter(api);
+            var tracer = new Tracer(agentWriter, serviceInfoList, defaultServiceName, isDebugEnabled);
+            return tracer;
+        }
+
         private void CurrentDomain_ProcessExit(object sender, EventArgs e)
         {
             _agentWriter.FlushAndCloseAsync().Wait();

src/Datadog.Trace/Implementations/TracerFactory.cs

@@ -20,13 +20,13 @@ public static class OpenTracingTracerFactory
         /// <param name="defaultServiceName">Default name of the service (default is the name of the executing assembly).</param>
         /// <param name="isDebugEnabled">Turns on all debug logging (this may have an impact on application performance).</param>
         /// <returns>A Datadog compatible ITracer implementation</returns>
-        public static ITracer GetTracer(Uri agentEndpoint = null, List<ServiceInfo> serviceInfoList = null, string defaultServiceName = null, bool isDebugEnabled = false)
+        public static ITracer CreateTracer(Uri agentEndpoint = null, List<ServiceInfo> serviceInfoList = null, string defaultServiceName = null, bool isDebugEnabled = false)
         {
             agentEndpoint = agentEndpoint ?? _defaultUri;
-            return GetTracer(agentEndpoint, serviceInfoList, defaultServiceName, null, isDebugEnabled);
+            return CreateTracer(agentEndpoint, serviceInfoList, defaultServiceName, null, isDebugEnabled);
         }
 
-        internal static OpenTracingTracer GetTracer(Uri agentEndpoint, List<ServiceInfo> serviceInfoList = null, string defaultServiceName = null, DelegatingHandler delegatingHandler = null, bool isDebugEnabled = false)
+        internal static OpenTracingTracer CreateTracer(Uri agentEndpoint, List<ServiceInfo> serviceInfoList = null, string defaultServiceName = null, DelegatingHandler delegatingHandler = null, bool isDebugEnabled = false)
         {
             var api = new Api(agentEndpoint, delegatingHandler);
             var agentWriter = new AgentWriter(api);