From 25aac8b0906472a587bd099d957c60ae0bf0b6fc Mon Sep 17 00:00:00 2001 From: Bertrand Mermet Date: Mon, 20 Nov 2017 11:08:43 +0100 Subject: [PATCH 1/6] Add opentracing-csharp as submodule --- .gitmodules | 3 +++ lib/opentracing-csharp | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 lib/opentracing-csharp diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000000..c8fce57907b6 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "lib/opentracing-csharp"] + path = lib/opentracing-csharp + url = https://github.com/bmermet/opentracing-csharp diff --git a/lib/opentracing-csharp b/lib/opentracing-csharp new file mode 160000 index 000000000000..452ce4d5ee5d --- /dev/null +++ b/lib/opentracing-csharp @@ -0,0 +1 @@ +Subproject commit 452ce4d5ee5d152d665b15fbd8c09e3d96c8a447 From ec11d34324f6fd000823372b702643350ce2dc1b Mon Sep 17 00:00:00 2001 From: Bertrand Mermet Date: Mon, 20 Nov 2017 05:31:07 -0800 Subject: [PATCH 2/6] Replace nuget dependency with submodule in build --- .../Datadog.Trace.IntegrationTests.Net45.csproj | 9 +++++---- .../packages.config | 1 - .../Datadog.Trace.Tests.Net45.csproj | 13 ++++++++----- src/Datadog.Trace.Tests.Net45/packages.config | 1 - src/Datadog.Trace.Tests/Datadog.Trace.Tests.csproj | 2 +- src/Datadog.Trace.sln | 14 ++++++++++++++ src/Datadog.Trace/Datadog.Trace.csproj | 11 ++++++++++- 7 files changed, 38 insertions(+), 13 deletions(-) diff --git a/src/Datadog.Trace.IntegrationTests.Net45/Datadog.Trace.IntegrationTests.Net45.csproj b/src/Datadog.Trace.IntegrationTests.Net45/Datadog.Trace.IntegrationTests.Net45.csproj index afe3960c20ff..95d6d7c87896 100644 --- a/src/Datadog.Trace.IntegrationTests.Net45/Datadog.Trace.IntegrationTests.Net45.csproj +++ b/src/Datadog.Trace.IntegrationTests.Net45/Datadog.Trace.IntegrationTests.Net45.csproj @@ -34,9 +34,6 @@ ..\packages\MsgPack.Cli.0.9.2\lib\net45\MsgPack.dll - - ..\packages\OpenTracing.0.10.0\lib\netstandard1.0\OpenTracing.dll - @@ -80,6 +77,10 @@ + + {6a48cb37-c924-4df3-8524-abd3bb9b04c4} + OpenTracing + {5dfdf781-f24c-45b1-82ef-9125875a80a4} Datadog.Trace @@ -89,4 +90,4 @@ - + \ No newline at end of file diff --git a/src/Datadog.Trace.IntegrationTests.Net45/packages.config b/src/Datadog.Trace.IntegrationTests.Net45/packages.config index 61c7774e947c..218162265a44 100644 --- a/src/Datadog.Trace.IntegrationTests.Net45/packages.config +++ b/src/Datadog.Trace.IntegrationTests.Net45/packages.config @@ -3,7 +3,6 @@ - diff --git a/src/Datadog.Trace.Tests.Net45/Datadog.Trace.Tests.Net45.csproj b/src/Datadog.Trace.Tests.Net45/Datadog.Trace.Tests.Net45.csproj index 2a4351a8aa24..004391915cde 100644 --- a/src/Datadog.Trace.Tests.Net45/Datadog.Trace.Tests.Net45.csproj +++ b/src/Datadog.Trace.Tests.Net45/Datadog.Trace.Tests.Net45.csproj @@ -39,9 +39,6 @@ ..\packages\Moq.4.7.142\lib\net45\Moq.dll - - ..\packages\OpenTracing.0.10.0\lib\netstandard1.0\OpenTracing.dll - @@ -92,16 +89,22 @@ + + {6a48cb37-c924-4df3-8524-abd3bb9b04c4} + OpenTracing + {5dfdf781-f24c-45b1-82ef-9125875a80a4} Datadog.Trace - + + Designer + - + \ No newline at end of file diff --git a/src/Datadog.Trace.Tests.Net45/packages.config b/src/Datadog.Trace.Tests.Net45/packages.config index f3a1c7dcbb99..7c7d1a5f63c3 100644 --- a/src/Datadog.Trace.Tests.Net45/packages.config +++ b/src/Datadog.Trace.Tests.Net45/packages.config @@ -4,7 +4,6 @@ - diff --git a/src/Datadog.Trace.Tests/Datadog.Trace.Tests.csproj b/src/Datadog.Trace.Tests/Datadog.Trace.Tests.csproj index cc05ea681f9e..42ee80fe72e2 100644 --- a/src/Datadog.Trace.Tests/Datadog.Trace.Tests.csproj +++ b/src/Datadog.Trace.Tests/Datadog.Trace.Tests.csproj @@ -13,12 +13,12 @@ - + diff --git a/src/Datadog.Trace.sln b/src/Datadog.Trace.sln index 964d5dc39c1d..377a78a50b18 100644 --- a/src/Datadog.Trace.sln +++ b/src/Datadog.Trace.sln @@ -12,6 +12,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Datadog.Trace.Tests.Net45", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Datadog.Trace.IntegrationTests.Net45", "Datadog.Trace.IntegrationTests.Net45\Datadog.Trace.IntegrationTests.Net45.csproj", "{9DD2FA11-BCBA-4F8A-93CE-D1ED28282A6E}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTracing", "..\lib\opentracing-csharp\src\OpenTracing\OpenTracing.csproj", "{6A48CB37-C924-4DF3-8524-ABD3BB9B04C4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -82,6 +84,18 @@ Global {9DD2FA11-BCBA-4F8A-93CE-D1ED28282A6E}.Release|x64.Build.0 = Release|Any CPU {9DD2FA11-BCBA-4F8A-93CE-D1ED28282A6E}.Release|x86.ActiveCfg = Release|Any CPU {9DD2FA11-BCBA-4F8A-93CE-D1ED28282A6E}.Release|x86.Build.0 = Release|Any CPU + {6A48CB37-C924-4DF3-8524-ABD3BB9B04C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6A48CB37-C924-4DF3-8524-ABD3BB9B04C4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6A48CB37-C924-4DF3-8524-ABD3BB9B04C4}.Debug|x64.ActiveCfg = Debug|Any CPU + {6A48CB37-C924-4DF3-8524-ABD3BB9B04C4}.Debug|x64.Build.0 = Debug|Any CPU + {6A48CB37-C924-4DF3-8524-ABD3BB9B04C4}.Debug|x86.ActiveCfg = Debug|Any CPU + {6A48CB37-C924-4DF3-8524-ABD3BB9B04C4}.Debug|x86.Build.0 = Debug|Any CPU + {6A48CB37-C924-4DF3-8524-ABD3BB9B04C4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6A48CB37-C924-4DF3-8524-ABD3BB9B04C4}.Release|Any CPU.Build.0 = Release|Any CPU + {6A48CB37-C924-4DF3-8524-ABD3BB9B04C4}.Release|x64.ActiveCfg = Release|Any CPU + {6A48CB37-C924-4DF3-8524-ABD3BB9B04C4}.Release|x64.Build.0 = Release|Any CPU + {6A48CB37-C924-4DF3-8524-ABD3BB9B04C4}.Release|x86.ActiveCfg = Release|Any CPU + {6A48CB37-C924-4DF3-8524-ABD3BB9B04C4}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Datadog.Trace/Datadog.Trace.csproj b/src/Datadog.Trace/Datadog.Trace.csproj index 1345fad6f88f..41e0ea843154 100644 --- a/src/Datadog.Trace/Datadog.Trace.csproj +++ b/src/Datadog.Trace/Datadog.Trace.csproj @@ -10,11 +10,17 @@ Alpha release Datadog, Inc. 2017 + $(TargetsForTfmSpecificBuildOutput);IncludeOpentracingLib + + + + + + - @@ -30,5 +36,8 @@ + + + From 6890f8c198dcde4b601793e3f2bce419052f03ba Mon Sep 17 00:00:00 2001 From: Bertrand Mermet Date: Mon, 20 Nov 2017 06:06:20 -0800 Subject: [PATCH 3/6] Add missing reference --- .../Datadog.Trace.IntegrationTests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Datadog.Trace.IntegrationTests/Datadog.Trace.IntegrationTests.csproj b/src/Datadog.Trace.IntegrationTests/Datadog.Trace.IntegrationTests.csproj index 1d2d35c2ea84..2fef534b0eb8 100644 --- a/src/Datadog.Trace.IntegrationTests/Datadog.Trace.IntegrationTests.csproj +++ b/src/Datadog.Trace.IntegrationTests/Datadog.Trace.IntegrationTests.csproj @@ -21,6 +21,7 @@ + From 2231b2b072cc7ca787d4a44e94a00fd155a966ba Mon Sep 17 00:00:00 2001 From: Bertrand Mermet Date: Mon, 20 Nov 2017 06:10:34 -0800 Subject: [PATCH 4/6] Update opentracing to multitargeting --- lib/opentracing-csharp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/opentracing-csharp b/lib/opentracing-csharp index 452ce4d5ee5d..0e9fcc5aa03a 160000 --- a/lib/opentracing-csharp +++ b/lib/opentracing-csharp @@ -1 +1 @@ -Subproject commit 452ce4d5ee5d152d665b15fbd8c09e3d96c8a447 +Subproject commit 0e9fcc5aa03a7ac5bf84472e5e802e751867fc4f From 79ce4b4d9d24f402b07b07534cb423e4bb062d8a Mon Sep 17 00:00:00 2001 From: Bertrand Mermet Date: Mon, 20 Nov 2017 07:28:46 -0800 Subject: [PATCH 5/6] Remove unnecessary references to netstandard --- ...atadog.Trace.IntegrationTests.Net45.csproj | 3 -- .../packages.config | 31 ------------------- .../Datadog.Trace.Tests.Net45.csproj | 3 -- src/Datadog.Trace.Tests.Net45/packages.config | 31 ------------------- src/Datadog.Trace/Api.cs | 8 +++++ src/Datadog.Trace/Datadog.Trace.csproj | 6 ++-- 6 files changed, 10 insertions(+), 72 deletions(-) diff --git a/src/Datadog.Trace.IntegrationTests.Net45/Datadog.Trace.IntegrationTests.Net45.csproj b/src/Datadog.Trace.IntegrationTests.Net45/Datadog.Trace.IntegrationTests.Net45.csproj index 95d6d7c87896..d4c49be142d4 100644 --- a/src/Datadog.Trace.IntegrationTests.Net45/Datadog.Trace.IntegrationTests.Net45.csproj +++ b/src/Datadog.Trace.IntegrationTests.Net45/Datadog.Trace.IntegrationTests.Net45.csproj @@ -39,9 +39,6 @@ - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - diff --git a/src/Datadog.Trace.IntegrationTests.Net45/packages.config b/src/Datadog.Trace.IntegrationTests.Net45/packages.config index 218162265a44..f9ea5fa10763 100644 --- a/src/Datadog.Trace.IntegrationTests.Net45/packages.config +++ b/src/Datadog.Trace.IntegrationTests.Net45/packages.config @@ -1,37 +1,6 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Datadog.Trace.Tests.Net45/Datadog.Trace.Tests.Net45.csproj b/src/Datadog.Trace.Tests.Net45/Datadog.Trace.Tests.Net45.csproj index 004391915cde..f521944f30db 100644 --- a/src/Datadog.Trace.Tests.Net45/Datadog.Trace.Tests.Net45.csproj +++ b/src/Datadog.Trace.Tests.Net45/Datadog.Trace.Tests.Net45.csproj @@ -45,9 +45,6 @@ - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - diff --git a/src/Datadog.Trace.Tests.Net45/packages.config b/src/Datadog.Trace.Tests.Net45/packages.config index 7c7d1a5f63c3..b1740e169801 100644 --- a/src/Datadog.Trace.Tests.Net45/packages.config +++ b/src/Datadog.Trace.Tests.Net45/packages.config @@ -1,38 +1,7 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Datadog.Trace/Api.cs b/src/Datadog.Trace/Api.cs index 8592f30afd0c..5af71fdf1835 100644 --- a/src/Datadog.Trace/Api.cs +++ b/src/Datadog.Trace/Api.cs @@ -17,6 +17,10 @@ internal class Api : IApi private const string ServicesPath = "/v0.3/services"; private static SerializationContext _serializationContext; +#if !NETSTANDARD2_0 + private static readonly string _frameworkDescription = string.Format(".NET Framework {0}", typeof(object).GetTypeInfo().Assembly.GetName().Version); +#endif + static Api() { _serializationContext = new SerializationContext(); @@ -52,7 +56,11 @@ public Api(Uri baseEndpoint, DelegatingHandler delegatingHandler = null) _servicesEndpoint = new Uri(baseEndpoint, ServicesPath); // TODO:bertrand add header for os version _client.DefaultRequestHeaders.Add("Datadog-Meta-Lang", ".NET"); +#if NETSTANDARD2_0 _client.DefaultRequestHeaders.Add("Datadog-Meta-Lang-Interpreter", RuntimeInformation.FrameworkDescription); +#else + _client.DefaultRequestHeaders.Add("Datadog-Meta-Lang-Interpreter", _frameworkDescription); +#endif _client.DefaultRequestHeaders.Add("Datadog-Meta-Tracer-Version", Assembly.GetAssembly(typeof(Api)).GetName().Version.ToString()); } diff --git a/src/Datadog.Trace/Datadog.Trace.csproj b/src/Datadog.Trace/Datadog.Trace.csproj index 41e0ea843154..52dd5ccffa63 100644 --- a/src/Datadog.Trace/Datadog.Trace.csproj +++ b/src/Datadog.Trace/Datadog.Trace.csproj @@ -30,11 +30,9 @@ - - - - + + From fa23a6ac1a99b7dc7b9b5ca6ca682083c66e297b Mon Sep 17 00:00:00 2001 From: Bertrand Mermet Date: Mon, 20 Nov 2017 08:13:55 -0800 Subject: [PATCH 6/6] Fix missing references for .net46 projects --- .../Datadog.Trace.IntegrationTests.csproj | 7 ++++--- src/Datadog.Trace.Tests/Datadog.Trace.Tests.csproj | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Datadog.Trace.IntegrationTests/Datadog.Trace.IntegrationTests.csproj b/src/Datadog.Trace.IntegrationTests/Datadog.Trace.IntegrationTests.csproj index 2fef534b0eb8..d333059a9a97 100644 --- a/src/Datadog.Trace.IntegrationTests/Datadog.Trace.IntegrationTests.csproj +++ b/src/Datadog.Trace.IntegrationTests/Datadog.Trace.IntegrationTests.csproj @@ -16,10 +16,11 @@ - - - + + + + diff --git a/src/Datadog.Trace.Tests/Datadog.Trace.Tests.csproj b/src/Datadog.Trace.Tests/Datadog.Trace.Tests.csproj index 42ee80fe72e2..e4051c39b5a7 100644 --- a/src/Datadog.Trace.Tests/Datadog.Trace.Tests.csproj +++ b/src/Datadog.Trace.Tests/Datadog.Trace.Tests.csproj @@ -17,6 +17,11 @@ + + + + +