autogenerate integrations.json

.gitignore

@@ -259,8 +259,6 @@ paket-files/
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
 *.pyc
-# Cake binaries
-tools/
 # vscode
 .vscode/
 # Benchmark results

Datadog.Trace.sln

@@ -125,6 +125,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Elasticsearch", "sa
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.AspNetMvc4", "samples\Samples.AspNetMvc4\Samples.AspNetMvc4.csproj", "{6D86109F-B7C9-477D-86D7-45735A3A0818}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{5D8E1F81-B820-4736-B797-271B0FE787EE}"
+	ProjectSection(SolutionItems) = preProject
+		tools\Directory.Build.props = tools\Directory.Build.props
+		tools\GlobalSuppressions.cs = tools\GlobalSuppressions.cs
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenerateIntegrationDefinitions", "tools\GenerateIntegrationDefinitions\GenerateIntegrationDefinitions.csproj", "{5B844A49-CA3C-42CB-AD31-E44CD73FD1A3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -399,6 +407,18 @@ Global
 		{6D86109F-B7C9-477D-86D7-45735A3A0818}.Release|x64.Build.0 = Release|Any CPU
 		{6D86109F-B7C9-477D-86D7-45735A3A0818}.Release|x86.ActiveCfg = Release|Any CPU
 		{6D86109F-B7C9-477D-86D7-45735A3A0818}.Release|x86.Build.0 = Release|Any CPU
+		{5B844A49-CA3C-42CB-AD31-E44CD73FD1A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B844A49-CA3C-42CB-AD31-E44CD73FD1A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B844A49-CA3C-42CB-AD31-E44CD73FD1A3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5B844A49-CA3C-42CB-AD31-E44CD73FD1A3}.Debug|x64.Build.0 = Debug|Any CPU
+		{5B844A49-CA3C-42CB-AD31-E44CD73FD1A3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5B844A49-CA3C-42CB-AD31-E44CD73FD1A3}.Debug|x86.Build.0 = Debug|Any CPU
+		{5B844A49-CA3C-42CB-AD31-E44CD73FD1A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B844A49-CA3C-42CB-AD31-E44CD73FD1A3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B844A49-CA3C-42CB-AD31-E44CD73FD1A3}.Release|x64.ActiveCfg = Release|Any CPU
+		{5B844A49-CA3C-42CB-AD31-E44CD73FD1A3}.Release|x64.Build.0 = Release|Any CPU
+		{5B844A49-CA3C-42CB-AD31-E44CD73FD1A3}.Release|x86.ActiveCfg = Release|Any CPU
+		{5B844A49-CA3C-42CB-AD31-E44CD73FD1A3}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -427,6 +447,7 @@ Global
 		{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A} = {AA6F5582-3B71-49AC-AA39-8F7815AC46BE}
 		{C98950B1-DC4B-43DA-974F-EF2CF325EC2B} = {AA6F5582-3B71-49AC-AA39-8F7815AC46BE}
 		{6D86109F-B7C9-477D-86D7-45735A3A0818} = {AA6F5582-3B71-49AC-AA39-8F7815AC46BE}
+		{5B844A49-CA3C-42CB-AD31-E44CD73FD1A3} = {5D8E1F81-B820-4736-B797-271B0FE787EE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {160A1D00-1F5B-40F8-A155-621B4459D78F}

integrations.json

@@ -1,6 +1,6 @@
 [
   {
-    "name": "aspNetCoreMvc2",
+    "name": "AspNetCoreMvc2",
     "method_replacements": [
       {
         "caller": {
@@ -15,7 +15,7 @@
           "assembly": "Datadog.Trace.ClrProfiler.Managed, Version=0.5.2.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb",
           "type": "Datadog.Trace.ClrProfiler.Integrations.AspNetCoreMvc2Integration",
           "method": "BeforeAction",
-          "signature": [ 0, 4, 1, 28, 28, 28, 28 ]
+          "signature": "00 04 01 1C 1C 1C 1C"
         }
       },
       {
@@ -31,13 +31,13 @@
           "assembly": "Datadog.Trace.ClrProfiler.Managed, Version=0.5.2.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb",
           "type": "Datadog.Trace.ClrProfiler.Integrations.AspNetCoreMvc2Integration",
           "method": "AfterAction",
-          "signature": [ 0, 4, 1, 28, 28, 28, 28 ]
+          "signature": "00 04 01 1C 1C 1C 1C"
         }
       }
     ]
   },
   {
-    "name": "aspNetMvc",
+    "name": "AspNetMvc",
     "method_replacements": [
       {
         "caller": {
@@ -52,7 +52,7 @@
           "assembly": "Datadog.Trace.ClrProfiler.Managed, Version=0.5.2.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb",
           "type": "Datadog.Trace.ClrProfiler.Integrations.AspNetMvcIntegration",
           "method": "BeginInvokeAction",
-          "signature": [ 0, 5, 28, 28, 28, 28, 28, 28 ]
+          "signature": "00 05 1C 1C 1C 1C 1C 1C"
         }
       },
       {
@@ -68,13 +68,13 @@
           "assembly": "Datadog.Trace.ClrProfiler.Managed, Version=0.5.2.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb",
           "type": "Datadog.Trace.ClrProfiler.Integrations.AspNetMvcIntegration",
           "method": "EndInvokeAction",
-          "signature": [ 0, 2, 2, 28, 28 ]
+          "signature": "00 02 02 1C 1C"
         }
       }
     ]
   },
   {
-    "name": "aspNetWebApi2",
+    "name": "AspNetWebApi2",
     "method_replacements": [
       {
         "caller": {},
@@ -87,7 +87,65 @@
           "assembly": "Datadog.Trace.ClrProfiler.Managed, Version=0.5.2.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb",
           "type": "Datadog.Trace.ClrProfiler.Integrations.AspNetWebApi2Integration",
           "method": "ExecuteAsync",
-          "signature": [ 0, 3, 28, 28, 28, 28 ]
+          "signature": "00 03 1C 1C 1C 1C"
+        }
+      }
+    ]
+  },
+  {
+    "name": "ElasticsearchNet",
+    "method_replacements": [
+      {
+        "caller": {
+          "assembly": "Elasticsearch.Net"
+        },
+        "target": {
+          "assembly": "Elasticsearch.Net",
+          "type": "Elasticsearch.Net.IRequestPipeline",
+          "method": "CallElasticsearch"
+        },
+        "wrapper": {
+          "assembly": "Datadog.Trace.ClrProfiler.Managed, Version=0.5.2.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb",
+          "type": "Datadog.Trace.ClrProfiler.Integrations.ElasticsearchNetIntegration",
+          "method": "CallElasticsearch",
+          "signature": "10 01 02 1C 1C 1C"
+        }
+      },
+      {
+        "caller": {
+          "assembly": "Elasticsearch.Net"
+        },
+        "target": {
+          "assembly": "Elasticsearch.Net",
+          "type": "Elasticsearch.Net.IRequestPipeline",
+          "method": "CallElasticsearchAsync"
+        },
+        "wrapper": {
+          "assembly": "Datadog.Trace.ClrProfiler.Managed, Version=0.5.2.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb",
+          "type": "Datadog.Trace.ClrProfiler.Integrations.ElasticsearchNetIntegration",
+          "method": "CallElasticsearchAsync",
+          "signature": "10 01 03 1C 1C 1C 1C"
+        }
+      }
+    ]
+  },
+  {
+    "name": "ServiceStackRedis",
+    "method_replacements": [
+      {
+        "caller": {
+          "assembly": "ServiceStack.Redis"
+        },
+        "target": {
+          "assembly": "ServiceStack.Redis",
+          "type": "ServiceStack.Redis.RedisNativeClient",
+          "method": "SendReceive"
+        },
+        "wrapper": {
+          "assembly": "Datadog.Trace.ClrProfiler.Managed, Version=0.5.2.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb",
+          "type": "Datadog.Trace.ClrProfiler.Integrations.ServiceStackRedisIntegration",
+          "method": "SendReceive",
+          "signature": "10 01 05 1E 00 1C 1D 1D 05 1C 1C 02"
         }
       }
     ]
@@ -104,13 +162,13 @@
           "assembly": "System.Data",
           "type": "System.Data.SqlClient.SqlCommand",
           "method": "ExecuteReader",
-          "signature": [ 32, 2, 12, 82, 8, 11, 82, 91, 14 ]
+          "signature": "20 02 0C 52 08 0B 52 5B 0E"
         },
         "wrapper": {
           "assembly": "Datadog.Trace.ClrProfiler.Managed, Version=0.5.2.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb",
           "type": "Datadog.Trace.ClrProfiler.Integrations.SqlServer",
           "method": "ExecuteReaderWithMethod",
-          "signature": [ 0, 3, 28, 28, 8, 14 ]
+          "signature": "00 03 1C 1C 08 0E"
         }
       },
       {
@@ -119,13 +177,13 @@
           "assembly": "System.Data.SqlClient",
           "type": "System.Data.SqlClient.SqlCommand",
           "method": "ExecuteReader",
-          "signature": [ 32, 1, 12, 87, 12, 11, 92 ]
+          "signature": "20 01 0C 57 0C 0B 5C"
         },
         "wrapper": {
           "assembly": "Datadog.Trace.ClrProfiler.Managed, Version=0.5.2.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb",
           "type": "Datadog.Trace.ClrProfiler.Integrations.SqlServer",
           "method": "ExecuteReader",
-          "signature": [ 0, 2, 28, 28, 8 ]
+          "signature": "00 02 1C 1C 08"
         }
       }
     ]
@@ -182,63 +240,5 @@
         }
       }
     ]
-  },
-  {
-    "name": "ServiceStackRedis",
-    "method_replacements": [
-      {
-        "caller": {
-          "assembly": "ServiceStack.Redis"
-        },
-        "target": {
-          "assembly": "ServiceStack.Redis",
-          "type": "ServiceStack.Redis.RedisNativeClient",
-          "method": "SendReceive"
-        },
-        "wrapper": {
-          "assembly": "Datadog.Trace.ClrProfiler.Managed, Version=0.5.2.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb",
-          "type": "Datadog.Trace.ClrProfiler.Integrations.ServiceStack.Redis.RedisNativeClient",
-          "method": "SendReceive",
-          "signature": "10 01 05 1E 00 1C 1D 1D 05 1C 1C 02"
-        }
-      }
-    ]
-  },
-  {
-    "name": "Elasticsearch",
-    "method_replacements": [
-      {
-        "caller": {
-          "assembly": "Elasticsearch.Net"
-        },
-        "target": {
-          "assembly": "Elasticsearch.Net",
-          "type": "Elasticsearch.Net.IRequestPipeline",
-          "method": "CallElasticsearch"
-        },
-        "wrapper": {
-          "assembly": "Datadog.Trace.ClrProfiler.Managed, Version=0.5.2.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb",
-          "type": "Datadog.Trace.ClrProfiler.Integrations.Elasticsearch.Net.Pipeline",
-          "method": "CallElasticsearch",
-          "signature": "10 01 02 1C 1C 1C"
-        }
-      },
-      {
-        "caller": {
-          "assembly": "Elasticsearch.Net"
-        },
-        "target": {
-          "assembly": "Elasticsearch.Net",
-          "type": "Elasticsearch.Net.IRequestPipeline",
-          "method": "CallElasticsearchAsync"
-        },
-        "wrapper": {
-          "assembly": "Datadog.Trace.ClrProfiler.Managed, Version=0.5.2.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb",
-          "type": "Datadog.Trace.ClrProfiler.Integrations.Elasticsearch.Net.Pipeline",
-          "method": "CallElasticsearchAsync",
-          "signature": "10 01 03 1C 1C 1C 1C"
-        }
-      }
-    ]
   }
-]
+]

src/Datadog.Trace.ClrProfiler.Managed/Integrations/AspNetCoreMvc2Integration.cs

@@ -58,6 +58,10 @@ public AspNetCoreMvc2Integration(object actionDescriptorObj, object httpContextO
         /// <param name="actionDescriptor">An ActionDescriptor with information about the current action.</param>
         /// <param name="httpContext">The HttpContext for the current request.</param>
         /// <param name="routeData">A RouteData with information about the current route.</param>
+        [InterceptMethod(
+            CallerAssembly = "Microsoft.AspNetCore.Mvc.Core",
+            TargetAssembly = "Microsoft.AspNetCore.Mvc.Core",
+            TargetType = "Microsoft.AspNetCore.Mvc.Internal.MvcCoreDiagnosticSourceExtensions")]
         public static void BeforeAction(
             object diagnosticSource,
             object actionDescriptor,
@@ -114,6 +118,10 @@ public static void BeforeAction(
         /// <param name="actionDescriptor">An ActionDescriptor with information about the current action.</param>
         /// <param name="httpContext">The HttpContext for the current request.</param>
         /// <param name="routeData">A RouteData with information about the current route.</param>
+        [InterceptMethod(
+            CallerAssembly = "Microsoft.AspNetCore.Mvc.Core",
+            TargetAssembly = "Microsoft.AspNetCore.Mvc.Core",
+            TargetType = "Microsoft.AspNetCore.Mvc.Internal.MvcCoreDiagnosticSourceExtensions")]
         public static void AfterAction(
             object diagnosticSource,
             object actionDescriptor,

src/Datadog.Trace.ClrProfiler.Managed/Integrations/AspNetMvcIntegration.cs

@@ -102,6 +102,10 @@ public AspNetMvcIntegration(object controllerContextObj)
         /// <param name="callback">An <see cref="AsyncCallback"/> delegate.</param>
         /// <param name="state">An object that holds the state of the async operation.</param>
         /// <returns>Returns the <see cref="IAsyncResult "/> returned by the original BeginInvokeAction() that is later passed to <see cref="EndInvokeAction"/>.</returns>
+        [InterceptMethod(
+            CallerAssembly = "System.Web.Mvc",
+            TargetAssembly = "System.Web.Mvc",
+            TargetType = "System.Web.Mvc.Async.IAsyncActionInvoker")]
         public static object BeginInvokeAction(
             dynamic asyncControllerActionInvoker,
             dynamic controllerContext,
@@ -142,6 +146,10 @@ public static object BeginInvokeAction(
         /// <param name="asyncControllerActionInvoker">The AsyncControllerActionInvoker instance.</param>
         /// <param name="asyncResult">The <see cref="IAsyncResult"/> returned by <see cref="BeginInvokeAction"/>.</param>
         /// <returns>Returns the <see cref="bool"/> returned by the original EndInvokeAction().</returns>
+        [InterceptMethod(
+            CallerAssembly = "System.Web.Mvc",
+            TargetAssembly = "System.Web.Mvc",
+            TargetType = "System.Web.Mvc.Async.IAsyncActionInvoker")]
         public static bool EndInvokeAction(dynamic asyncControllerActionInvoker, dynamic asyncResult)
         {
             AspNetMvcIntegration integration = null;

src/Datadog.Trace.ClrProfiler.Managed/Integrations/AspNetWebApi2Integration.cs

@@ -23,6 +23,9 @@ public static class AspNetWebApi2Integration
         /// <param name="controllerContext">The controller context for the call</param>
         /// <param name="cancellationTokenSource">The cancellation token source</param>
         /// <returns>A task with the result</returns>
+        [InterceptMethod(
+            TargetAssembly = "System.Web.Http",
+            TargetType = "System.Web.Http.Controllers.IHttpController")]
         public static object ExecuteAsync(object apiController, object controllerContext, object cancellationTokenSource)
         {
             var cancellationToken = ((CancellationTokenSource)cancellationTokenSource).Token;

src/Datadog.Trace.ClrProfiler.Managed/Integrations/Elasticsearch.Net/Pipeline.cs → src/Datadog.Trace.ClrProfiler.Managed/Integrations/ElasticsearchNetIntegration.cs

@@ -2,12 +2,12 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Datadog.Trace.ClrProfiler.Integrations.Elasticsearch.Net
+namespace Datadog.Trace.ClrProfiler.Integrations
 {
     /// <summary>
     /// Traces an Elasticsearch pipeline
     /// </summary>
-    public static class Pipeline
+    public static class ElasticsearchNetIntegration
     {
         private const string OperationName = "elasticsearch.query";
         private const string ServiceName = "elasticsearch";
@@ -32,13 +32,17 @@ public static class Pipeline
         /// <param name="pipeline">The pipeline for the original method</param>
         /// <param name="requestData">The request data</param>
         /// <returns>The original result</returns>
+        [InterceptMethod(
+            CallerAssembly = "Elasticsearch.Net",
+            TargetAssembly = "Elasticsearch.Net",
+            TargetType = "Elasticsearch.Net.IRequestPipeline")]
         public static object CallElasticsearch<TResponse>(object pipeline, object requestData)
         {
             var originalMethod = DynamicMethodBuilder<Func<object, object, TResponse>>
                .GetOrCreateMethodCallDelegate(
                     pipeline.GetType(),
                     "CallElasticsearch",
-                    methodGenericArguments: new Type[] { typeof(TResponse) });
+                    methodGenericArguments: new[] { typeof(TResponse) });
 
             using (var scope = CreateScope(pipeline, requestData))
             {
@@ -62,6 +66,10 @@ public static object CallElasticsearch<TResponse>(object pipeline, object reques
         /// <param name="requestData">The request data</param>
         /// <param name="cancellationTokenSource">A cancellation token</param>
         /// <returns>The original result</returns>
+        [InterceptMethod(
+            CallerAssembly = "Elasticsearch.Net",
+            TargetAssembly = "Elasticsearch.Net",
+            TargetType = "Elasticsearch.Net.IRequestPipeline")]
         public static object CallElasticsearchAsync<TResponse>(object pipeline, object requestData, object cancellationTokenSource)
         {
             var cancellationToken = ((CancellationTokenSource)cancellationTokenSource)?.Token ?? CancellationToken.None;

src/Datadog.Trace.ClrProfiler.Managed/Integrations/Redis.cs → src/Datadog.Trace.ClrProfiler.Managed/Integrations/RedisHelper.cs

@@ -1,6 +1,6 @@
 namespace Datadog.Trace.ClrProfiler.Integrations
 {
-    internal static class Redis
+    internal static class RedisHelper
     {
         internal const string OperationName = "redis.command";
         internal const string ServiceName = "redis";