diff --git a/Datadog.Trace.sln b/Datadog.Trace.sln index 3af855376f89..677c69009966 100644 --- a/Datadog.Trace.sln +++ b/Datadog.Trace.sln @@ -25,6 +25,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Datadog.Trace.proj = Datadog.Trace.proj Datadog.Trace.snk = Datadog.Trace.snk Directory.Build.props = Directory.Build.props + docker-compose.yml = docker-compose.yml GlobalSuppressions.cs = GlobalSuppressions.cs ci\install-sqlserver.ps1 = ci\install-sqlserver.ps1 integrations.json = integrations.json @@ -47,14 +48,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8CEC2042-F test\GlobalSuppressions.cs = test\GlobalSuppressions.cs EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{F1EFDD86-0213-4C73-9B38-AEBBDABE984F}" - ProjectSection(SolutionItems) = preProject - benchmarks\Directory.Build.props = benchmarks\Directory.Build.props - benchmarks\GlobalSuppressions.cs = benchmarks\GlobalSuppressions.cs - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Trace.Performance", "benchmarks\Datadog.Trace.Performance\Datadog.Trace.Performance.csproj", "{733120FD-2423-491A-8FB1-427867101D8D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Trace.ClrProfiler.Managed", "src\Datadog.Trace.ClrProfiler.Managed\Datadog.Trace.ClrProfiler.Managed.csproj", "{85F35AAF-D102-4960-8B41-3BD9CBD0E77F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{AA6F5582-3B71-49AC-AA39-8F7815AC46BE}" @@ -226,18 +219,6 @@ Global {237A1C92-DE9E-4649-961B-BBB7CF0DFE01}.Release|x64.Build.0 = Release|Any CPU {237A1C92-DE9E-4649-961B-BBB7CF0DFE01}.Release|x86.ActiveCfg = Release|Any CPU {237A1C92-DE9E-4649-961B-BBB7CF0DFE01}.Release|x86.Build.0 = Release|Any CPU - {733120FD-2423-491A-8FB1-427867101D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {733120FD-2423-491A-8FB1-427867101D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {733120FD-2423-491A-8FB1-427867101D8D}.Debug|x64.ActiveCfg = Debug|Any CPU - {733120FD-2423-491A-8FB1-427867101D8D}.Debug|x64.Build.0 = Debug|Any CPU - {733120FD-2423-491A-8FB1-427867101D8D}.Debug|x86.ActiveCfg = Debug|Any CPU - {733120FD-2423-491A-8FB1-427867101D8D}.Debug|x86.Build.0 = Debug|Any CPU - {733120FD-2423-491A-8FB1-427867101D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {733120FD-2423-491A-8FB1-427867101D8D}.Release|Any CPU.Build.0 = Release|Any CPU - {733120FD-2423-491A-8FB1-427867101D8D}.Release|x64.ActiveCfg = Release|Any CPU - {733120FD-2423-491A-8FB1-427867101D8D}.Release|x64.Build.0 = Release|Any CPU - {733120FD-2423-491A-8FB1-427867101D8D}.Release|x86.ActiveCfg = Release|Any CPU - {733120FD-2423-491A-8FB1-427867101D8D}.Release|x86.Build.0 = Release|Any CPU {85F35AAF-D102-4960-8B41-3BD9CBD0E77F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {85F35AAF-D102-4960-8B41-3BD9CBD0E77F}.Debug|Any CPU.Build.0 = Debug|Any CPU {85F35AAF-D102-4960-8B41-3BD9CBD0E77F}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -430,7 +411,6 @@ Global {3BCE5D99-147B-4305-9970-AB0F683A6E8D} = {8CEC2042-F11C-49F5-A674-2355793B600A} {EFBFC324-B459-4D39-8E19-CE4AD0DBF15F} = {8CEC2042-F11C-49F5-A674-2355793B600A} {237A1C92-DE9E-4649-961B-BBB7CF0DFE01} = {8CEC2042-F11C-49F5-A674-2355793B600A} - {733120FD-2423-491A-8FB1-427867101D8D} = {F1EFDD86-0213-4C73-9B38-AEBBDABE984F} {85F35AAF-D102-4960-8B41-3BD9CBD0E77F} = {9E5F0022-0A50-40BF-AC6A-C3078585ECAB} {3C6DD42E-9214-4747-92BA-78DE29AACE59} = {AA6F5582-3B71-49AC-AA39-8F7815AC46BE} {9951A03A-AD1B-48D8-A96D-B85532BEDADD} = {AA6F5582-3B71-49AC-AA39-8F7815AC46BE} diff --git a/benchmarks/Datadog.Trace.Performance/Datadog.Trace.Performance.csproj b/benchmarks/Datadog.Trace.Performance/Datadog.Trace.Performance.csproj deleted file mode 100644 index 65d8e1d00c88..000000000000 --- a/benchmarks/Datadog.Trace.Performance/Datadog.Trace.Performance.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - Exe - netcoreapp2.0 - - - - - - - - - - - diff --git a/benchmarks/Datadog.Trace.Performance/Program.cs b/benchmarks/Datadog.Trace.Performance/Program.cs deleted file mode 100644 index 3593f221fa2e..000000000000 --- a/benchmarks/Datadog.Trace.Performance/Program.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using BenchmarkDotNet.Running; - -namespace MyBenchmarks -{ - public static class Program - { - public static void Main(string[] args) - { - var summary = BenchmarkRunner.Run(); - } - } -} \ No newline at end of file diff --git a/benchmarks/Datadog.Trace.Performance/TracerBenchmarks.cs b/benchmarks/Datadog.Trace.Performance/TracerBenchmarks.cs deleted file mode 100644 index 831cd64b95f3..000000000000 --- a/benchmarks/Datadog.Trace.Performance/TracerBenchmarks.cs +++ /dev/null @@ -1,25 +0,0 @@ -using BenchmarkDotNet.Attributes; -using BenchmarkDotNet.Running; -using Datadog.Trace; - -namespace MyBenchmarks -{ - public class TracerBenchmarks - { - [Benchmark] - public void StartSpan() - { - using (var span = Tracer.Instance.StartSpan("Operation")) - { - } - } - - [Benchmark] - public void StartScope() - { - using (var scope = Tracer.Instance.StartActive("Operation")) - { - } - } - } -} \ No newline at end of file diff --git a/benchmarks/Directory.Build.props b/benchmarks/Directory.Build.props deleted file mode 100644 index 049d042ae812..000000000000 --- a/benchmarks/Directory.Build.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/benchmarks/GlobalSuppressions.cs b/benchmarks/GlobalSuppressions.cs deleted file mode 100644 index 9d939042c7f2..000000000000 --- a/benchmarks/GlobalSuppressions.cs +++ /dev/null @@ -1,8 +0,0 @@ -// This file is used by Code Analysis to maintain SuppressMessage -// attributes that are applied to this project. -// Project-level suppressions either have no target or are given -// a specific target and scoped to a namespace, type, member, etc. - -using System.Diagnostics.CodeAnalysis; - -[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1652:SA1652EnableXmlDocumentationOutput", Justification = "Reviewed.")] diff --git a/docker/build.sh b/docker/build.sh index e0e55dfd8232..a648ca5e97cf 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -6,14 +6,10 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" cd "$DIR/.." for config in Debug Release ; do - for proj in Datadog.Trace Datadog.Trace.OpenTracing ; do + for proj in Datadog.Trace Datadog.Trace.ClrProfiler.Managed Datadog.Trace Datadog.Trace.OpenTracing ; do dotnet publish -f netstandard2.0 -c $config src/$proj/$proj.csproj done - for proj in Datadog.Trace.ClrProfiler.Managed ; do - dotnet publish -f netcoreapp2.0 -c $config src/$proj/$proj.csproj - done - for sample in Samples.AspNetCoreMvc2 Samples.ConsoleCore Samples.Elasticsearch Samples.RedisCore Samples.SqlServer ; do dotnet publish -f netcoreapp2.0 -c $config samples/$sample/$sample.csproj done diff --git a/samples/Samples.ConsoleCore/Samples.ConsoleCore.csproj b/samples/Samples.ConsoleCore/Samples.ConsoleCore.csproj index 4e592bbd7af2..5361dbaf1b14 100644 --- a/samples/Samples.ConsoleCore/Samples.ConsoleCore.csproj +++ b/samples/Samples.ConsoleCore/Samples.ConsoleCore.csproj @@ -2,7 +2,7 @@ Exe - net452;net461;net47;netcoreapp2.0 + net461;netcoreapp2.0 AnyCPU;x64;x86 win-x64;win-x86;linux-x64 diff --git a/samples/Samples.Elasticsearch/Samples.Elasticsearch.csproj b/samples/Samples.Elasticsearch/Samples.Elasticsearch.csproj index 003bbd849e56..9beb230fd504 100644 --- a/samples/Samples.Elasticsearch/Samples.Elasticsearch.csproj +++ b/samples/Samples.Elasticsearch/Samples.Elasticsearch.csproj @@ -1,8 +1,8 @@ - + Exe - net452;net461;net47;netcoreapp2.0 + net461;netcoreapp2.0 AnyCPU;x64;x86 win-x64;win-x86;linux-x64 diff --git a/samples/Samples.ExampleLibrary/Samples.ExampleLibrary.csproj b/samples/Samples.ExampleLibrary/Samples.ExampleLibrary.csproj index ce171ad55cc2..6a3e57d20062 100644 --- a/samples/Samples.ExampleLibrary/Samples.ExampleLibrary.csproj +++ b/samples/Samples.ExampleLibrary/Samples.ExampleLibrary.csproj @@ -1,15 +1,7 @@ - + netstandard1.0 - false - - - - 0 - false - - 1701;1702;NU1701 diff --git a/samples/Samples.ExampleLibraryTracer/Samples.ExampleLibraryTracer.csproj b/samples/Samples.ExampleLibraryTracer/Samples.ExampleLibraryTracer.csproj index ba9eb38fe440..6a3e57d20062 100644 --- a/samples/Samples.ExampleLibraryTracer/Samples.ExampleLibraryTracer.csproj +++ b/samples/Samples.ExampleLibraryTracer/Samples.ExampleLibraryTracer.csproj @@ -1,19 +1,7 @@ - + netstandard1.0 - - false - - 0 - - - - 0 - false - - - diff --git a/samples/Samples.RedisCore/Samples.RedisCore.csproj b/samples/Samples.RedisCore/Samples.RedisCore.csproj index 9c4a98bb27fe..cd801335183a 100644 --- a/samples/Samples.RedisCore/Samples.RedisCore.csproj +++ b/samples/Samples.RedisCore/Samples.RedisCore.csproj @@ -1,8 +1,8 @@ - + Exe - net452;net461;net47;netcoreapp2.0 + net461;netcoreapp2.0 AnyCPU;x64;x86 win-x64;win-x86;linux-x64 diff --git a/samples/Samples.SqlServer/Samples.SqlServer.csproj b/samples/Samples.SqlServer/Samples.SqlServer.csproj index 72d8f1b9154b..20eb7daf69f6 100644 --- a/samples/Samples.SqlServer/Samples.SqlServer.csproj +++ b/samples/Samples.SqlServer/Samples.SqlServer.csproj @@ -2,7 +2,7 @@ Exe - net461;net47;netcoreapp2.0 + net461;netcoreapp2.0 AnyCPU;x64;x86 win-x64;win-x86;linux-x64 @@ -20,10 +20,6 @@ - - - - diff --git a/src/Datadog.Trace.ClrProfiler.Managed/Datadog.Trace.ClrProfiler.Managed.csproj b/src/Datadog.Trace.ClrProfiler.Managed/Datadog.Trace.ClrProfiler.Managed.csproj index 85e9d1f2cf1a..aa2ec8a4cc42 100644 --- a/src/Datadog.Trace.ClrProfiler.Managed/Datadog.Trace.ClrProfiler.Managed.csproj +++ b/src/Datadog.Trace.ClrProfiler.Managed/Datadog.Trace.ClrProfiler.Managed.csproj @@ -1,7 +1,7 @@  - net45;netcoreapp2.0 + netstandard2.0;net45;net461 0.5.1-beta Datadog.Trace.ClrProfiler 7.3 @@ -13,7 +13,7 @@ - netcoreapp2.0 + netstandard2.0 @@ -24,7 +24,7 @@ - + diff --git a/src/Datadog.Trace.ClrProfiler.Managed/Integrations/AspNetMvcIntegration.cs b/src/Datadog.Trace.ClrProfiler.Managed/Integrations/AspNetMvcIntegration.cs index 74e8c719bf0f..0098e6c43550 100644 --- a/src/Datadog.Trace.ClrProfiler.Managed/Integrations/AspNetMvcIntegration.cs +++ b/src/Datadog.Trace.ClrProfiler.Managed/Integrations/AspNetMvcIntegration.cs @@ -1,4 +1,4 @@ -#if NET45 +#if !NETSTANDARD2_0 using System; using System.Collections.Generic; diff --git a/src/Datadog.Trace.ClrProfiler.Managed/Integrations/AspNetWebApi2Integration.cs b/src/Datadog.Trace.ClrProfiler.Managed/Integrations/AspNetWebApi2Integration.cs index 985871581aeb..7480e7b79f3a 100644 --- a/src/Datadog.Trace.ClrProfiler.Managed/Integrations/AspNetWebApi2Integration.cs +++ b/src/Datadog.Trace.ClrProfiler.Managed/Integrations/AspNetWebApi2Integration.cs @@ -1,4 +1,4 @@ -#if NET45 +#if !NETSTANDARD2_0 using System; using System.Collections.Generic; diff --git a/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj b/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj index b6934583d323..849c0ae6bb80 100644 --- a/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj +++ b/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net45;net46 + netstandard2.0;net45;net461 0.5.1-beta diff --git a/src/Datadog.Trace/Datadog.Trace.csproj b/src/Datadog.Trace/Datadog.Trace.csproj index 6e08cfd9a25a..1b6519a8f47f 100644 --- a/src/Datadog.Trace/Datadog.Trace.csproj +++ b/src/Datadog.Trace/Datadog.Trace.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net45;net46 + netstandard2.0;net45;net461 0.5.1-beta