big refactoring (#82)

opentracing-contrib · Dec 12, 2020 · 2406193 · 2406193
1 parent 50a570c
commit 2406193
Show file tree

Hide file tree

Showing 35 changed files with 715 additions and 602 deletions.
diff --git a/benchmarks/OpenTracing.Contrib.NetCore.Benchmarks/CoreFx/HttpHandlerDiagnosticsBenchmark.cs b/benchmarks/OpenTracing.Contrib.NetCore.Benchmarks/CoreFx/HttpHandlerDiagnosticsBenchmark.cs
@@ -28,7 +28,7 @@ public void GlobalSetup()
                 .AddOpenTracingCoreServices(builder =>
                 {
                     builder.AddBenchmarkTracer(Mode);
-                    builder.AddCoreFx();
+                    builder.AddHttpHandler();
                 })
                 .BuildServiceProvider();
 

diff --git a/samples/net5.0/OrdersApi/Controllers/OrdersController.cs b/samples/net5.0/OrdersApi/Controllers/OrdersController.cs
@@ -1,12 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Shared;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
 using OpenTracing;
 using OrdersApi.DataStore;
+using Shared;
 
 namespace Samples.OrdersApi.Controllers
 {
@@ -24,6 +26,14 @@ public OrdersController(OrdersDbContext dbContext, HttpClient httpClient, ITrace
             _tracer = tracer ?? throw new ArgumentNullException(nameof(tracer));
         }
 
+        [HttpGet]
+        public async Task<IActionResult> Index()
+        {
+            var orders = await _dbContext.Orders.ToListAsync();
+
+            return Ok(orders.Select(x => new { x.OrderId }).ToList());
+        }
+
         [HttpPost]
         public async Task<IActionResult> Index([FromBody] PlaceOrderCommand cmd)
         {

diff --git a/samples/net5.0/OrdersApi/Program.cs b/samples/net5.0/OrdersApi/Program.cs
@@ -34,16 +34,6 @@ public static IHostBuilder CreateHostBuilder(string[] args)
                             // We don't need any tracing data for our health endpoint.
                             options.Hosting.IgnorePatterns.Add(ctx => ctx.Request.Path == "/health");
                         });
-
-                        builder.ConfigureEntityFrameworkCore(options =>
-                        {
-                            options.IgnorePatterns.Add(cmd => cmd.Command.CommandText == "SELECT 1");
-                        });
-
-                        builder.ConfigureMicrosoftSqlClient(options =>
-                        {
-                            options.IgnorePatterns.Add(cmd => cmd.CommandText == "SELECT 1");
-                        });
                     });
                 });
         }

diff --git a/samples/net5.0/Shared/JaegerServiceCollectionExtensions.cs b/samples/net5.0/Shared/JaegerServiceCollectionExtensions.cs
@@ -6,7 +6,7 @@
 using Jaeger.Senders.Thrift;
 using Microsoft.Extensions.Logging;
 using OpenTracing;
-using OpenTracing.Contrib.NetCore.CoreFx;
+using OpenTracing.Contrib.NetCore.Configuration;
 using OpenTracing.Util;
 
 namespace Microsoft.Extensions.DependencyInjection

diff --git a/samples/netcoreapp2.1/OrdersApi/Controllers/OrdersController.cs b/samples/netcoreapp2.1/OrdersApi/Controllers/OrdersController.cs
@@ -1,12 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Shared;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
 using OpenTracing;
 using OrdersApi.DataStore;
+using Shared;
 
 namespace Samples.OrdersApi.Controllers
 {
@@ -24,6 +26,14 @@ public OrdersController(OrdersDbContext dbContext, HttpClient httpClient, ITrace
             _tracer = tracer ?? throw new ArgumentNullException(nameof(tracer));
         }
 
+        [HttpGet]
+        public async Task<IActionResult> Index()
+        {
+            var orders = await _dbContext.Orders.ToListAsync();
+
+            return Ok(orders.Select(x => new { x.OrderId }).ToList());
+        }
+
         [HttpPost]
         public async Task<IActionResult> Index([FromBody] PlaceOrderCommand cmd)
         {

diff --git a/samples/netcoreapp2.1/Shared/JaegerServiceCollectionExtensions.cs b/samples/netcoreapp2.1/Shared/JaegerServiceCollectionExtensions.cs
@@ -4,7 +4,7 @@
 using Jaeger.Samplers;
 using Microsoft.Extensions.Logging;
 using OpenTracing;
-using OpenTracing.Contrib.NetCore.CoreFx;
+using OpenTracing.Contrib.NetCore.Configuration;
 using OpenTracing.Util;
 
 namespace Microsoft.Extensions.DependencyInjection

diff --git a/samples/netcoreapp3.1/OrdersApi/Controllers/OrdersController.cs b/samples/netcoreapp3.1/OrdersApi/Controllers/OrdersController.cs
@@ -1,12 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Shared;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
 using OpenTracing;
 using OrdersApi.DataStore;
+using Shared;
 
 namespace Samples.OrdersApi.Controllers
 {
@@ -24,6 +26,14 @@ public OrdersController(OrdersDbContext dbContext, HttpClient httpClient, ITrace
             _tracer = tracer ?? throw new ArgumentNullException(nameof(tracer));
         }
 
+        [HttpGet]
+        public async Task<IActionResult> Index()
+        {
+            var orders = await _dbContext.Orders.ToListAsync();
+
+            return Ok(orders.Select(x => new { x.OrderId }).ToList());
+        }
+
         [HttpPost]
         public async Task<IActionResult> Index([FromBody] PlaceOrderCommand cmd)
         {

diff --git a/samples/netcoreapp3.1/OrdersApi/Program.cs b/samples/netcoreapp3.1/OrdersApi/Program.cs
@@ -34,16 +34,6 @@ public static IHostBuilder CreateHostBuilder(string[] args)
                             // We don't need any tracing data for our health endpoint.
                             options.Hosting.IgnorePatterns.Add(ctx => ctx.Request.Path == "/health");
                         });
-
-                        builder.ConfigureEntityFrameworkCore(options =>
-                        {
-                            options.IgnorePatterns.Add(cmd => cmd.Command.CommandText == "SELECT 1");
-                        });
-
-                        builder.ConfigureMicrosoftSqlClient(options =>
-                        {
-                            options.IgnorePatterns.Add(cmd => cmd.CommandText == "SELECT 1");
-                        });
                     });
                 });
         }

diff --git a/samples/netcoreapp3.1/Shared/JaegerServiceCollectionExtensions.cs b/samples/netcoreapp3.1/Shared/JaegerServiceCollectionExtensions.cs
@@ -6,7 +6,7 @@
 using Jaeger.Senders.Thrift;
 using Microsoft.Extensions.Logging;
 using OpenTracing;
-using OpenTracing.Contrib.NetCore.CoreFx;
+using OpenTracing.Contrib.NetCore.Configuration;
 using OpenTracing.Util;
 
 namespace Microsoft.Extensions.DependencyInjection

diff --git a/src/OpenTracing.Contrib.NetCore/AspNetCore/AspNetCoreDiagnosticOptions.cs b/src/OpenTracing.Contrib.NetCore/AspNetCore/AspNetCoreDiagnosticOptions.cs
@@ -2,8 +2,37 @@
 
 namespace OpenTracing.Contrib.NetCore.Configuration
 {
-    public class AspNetCoreDiagnosticOptions
+    public class AspNetCoreDiagnosticOptions : DiagnosticOptions
     {
         public HostingOptions Hosting { get; } = new HostingOptions();
+
+        public AspNetCoreDiagnosticOptions()
+        {
+            // We create separate spans for MVC actions & results so we don't need these additional events by default.
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.BeforeOnResourceExecuting");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.BeforeOnActionExecution");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.BeforeOnActionExecuting");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.AfterOnActionExecuting");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.BeforeActionMethod");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.BeforeControllerActionMethod");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.AfterControllerActionMethod");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.AfterActionMethod");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.BeforeOnActionExecuted");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.AfterOnActionExecuted");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.AfterOnActionExecution");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.BeforeOnActionExecuted");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.AfterOnActionExecuted");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.AfterOnActionExecution");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.BeforeOnResultExecuting");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.AfterOnResultExecuting");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.BeforeOnResultExecuted");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.AfterOnResultExecuted");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.BeforeOnResourceExecuted");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.AfterOnResourceExecuted");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.AfterOnResourceExecuting");
+
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.Razor.BeginInstrumentationContext");
+            IgnoredEvents.Add("Microsoft.AspNetCore.Mvc.Razor.EndInstrumentationContext");
+        }
     }
 }