Skip to content

Internalize the dependency on opentracing-csharp #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
palazzem merged 6 commits into from
Nov 29, 2017
Merged

Internalize the dependency on opentracing-csharp #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
25aac8b
Add opentracing-csharp as submodule
bmermet Nov 20, 2017
ec11d34
Replace nuget dependency with submodule in build
bmermet Nov 20, 2017
6890f8c
Add missing reference
bmermet Nov 20, 2017
2231b2b
Update opentracing to multitargeting
bmermet Nov 20, 2017
79ce4b4
Remove unnecessary references to netstandard
bmermet Nov 20, 2017
fa23a6a
Fix missing references for .net46 projects
bmermet Nov 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "lib/opentracing-csharp"]
path = lib/opentracing-csharp
url = https://github.com/bmermet/opentracing-csharp
Copy link
Copy Markdown
Contributor

@palazzem palazzem Nov 29, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bmermet forgot to tell you, can you add in a new PR a small section in the README about the development process? i.e.: "after cloning the repo you have to update your git submodules, then you should ....."

1 change: 1 addition & 0 deletions lib/opentracing-csharp
Open in desktop
Submodule opentracing-csharp added at 0e9fcc
12 changes: 5 additions & 7 deletions src/Datadog.Trace.IntegrationTests.Net45/Datadog.Trace.IntegrationTests.Net45.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,11 @@
<Reference Include="MsgPack, Version=0.9.0.0, Culture=neutral, PublicKeyToken=a2625990d5dc0167, processorArchitecture=MSIL">
<HintPath>..\packages\MsgPack.Cli.0.9.2\lib\net45\MsgPack.dll</HintPath>
</Reference>
<Reference Include="OpenTracing, Version=0.10.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\OpenTracing.0.10.0\lib\netstandard1.0\OpenTracing.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Numerics" />
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Expand Down Expand Up @@ -80,6 +74,10 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\lib\opentracing-csharp\src\OpenTracing\OpenTracing.csproj">
<Project>{6a48cb37-c924-4df3-8524-abd3bb9b04c4}</Project>
<Name>OpenTracing</Name>
</ProjectReference>
<ProjectReference Include="..\Datadog.Trace\Datadog.Trace.csproj">
<Project>{5dfdf781-f24c-45b1-82ef-9125875a80a4}</Project>
<Name>Datadog.Trace</Name>
Expand All @@ -89,4 +87,4 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
32 changes: 0 additions & 32 deletions src/Datadog.Trace.IntegrationTests.Net45/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net45" />
<package id="MsgPack.Cli" version="0.9.2" targetFramework="net45" />
<package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
<package id="OpenTracing" version="0.10.0" targetFramework="net45" />
<package id="System.Collections" version="4.3.0" targetFramework="net45" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net45" />
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net45" />
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net45" />
<package id="System.Globalization" version="4.3.0" targetFramework="net45" />
<package id="System.IO" version="4.3.0" targetFramework="net45" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net45" />
<package id="System.Linq" version="4.3.0" targetFramework="net45" />
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net45" />
<package id="System.Net.Http" version="4.3.0" targetFramework="net45" />
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net45" />
<package id="System.ObjectModel" version="4.3.0" targetFramework="net45" />
<package id="System.Reflection" version="4.3.0" targetFramework="net45" />
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net45" />
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net45" />
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net45" />
<package id="System.Runtime" version="4.3.0" targetFramework="net45" />
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net45" />
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net45" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net45" />
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net45" />
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net45" />
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net45" />
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net45" />
<package id="System.Threading" version="4.3.0" targetFramework="net45" />
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net45" />
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net45" />
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net45" />
<package id="xunit" version="2.1.0" targetFramework="net461" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net461" />
<package id="xunit.assert" version="2.1.0" targetFramework="net461" />
Expand Down
8 changes: 5 additions & 3 deletions src/Datadog.Trace.IntegrationTests/Datadog.Trace.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
</ItemGroup>

<!-- Workaround a bug: https://github.com/aspnet/JavaScriptServices/issues/487#issuecomment-287718014 -->
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
<PackageReference Include="System.Net.Http" Version="4.3.1" />
<ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp2.0;' ">
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Net.Http" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\lib\opentracing-csharp\src\OpenTracing\OpenTracing.csproj" />
<ProjectReference Include="..\Datadog.Trace\Datadog.Trace.csproj" />
</ItemGroup>

Expand Down
16 changes: 8 additions & 8 deletions src/Datadog.Trace.Tests.Net45/Datadog.Trace.Tests.Net45.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,12 @@
<Reference Include="Moq, Version=4.7.142.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\packages\Moq.4.7.142\lib\net45\Moq.dll</HintPath>
</Reference>
<Reference Include="OpenTracing, Version=0.10.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\OpenTracing.0.10.0\lib\netstandard1.0\OpenTracing.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Numerics" />
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Expand Down Expand Up @@ -92,16 +86,22 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\lib\opentracing-csharp\src\OpenTracing\OpenTracing.csproj">
<Project>{6a48cb37-c924-4df3-8524-abd3bb9b04c4}</Project>
<Name>OpenTracing</Name>
</ProjectReference>
<ProjectReference Include="..\Datadog.Trace\Datadog.Trace.csproj">
<Project>{5dfdf781-f24c-45b1-82ef-9125875a80a4}</Project>
<Name>Datadog.Trace</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
32 changes: 0 additions & 32 deletions src/Datadog.Trace.Tests.Net45/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="4.2.1" targetFramework="net45" />
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net45" />
<package id="Moq" version="4.7.142" targetFramework="net45" />
<package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
<package id="OpenTracing" version="0.10.0" targetFramework="net45" />
<package id="System.Collections" version="4.3.0" targetFramework="net45" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net45" />
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net45" />
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net45" />
<package id="System.Globalization" version="4.3.0" targetFramework="net45" />
<package id="System.IO" version="4.3.0" targetFramework="net45" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net45" />
<package id="System.Linq" version="4.3.0" targetFramework="net45" />
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net45" />
<package id="System.Net.Http" version="4.3.0" targetFramework="net45" />
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net45" />
<package id="System.ObjectModel" version="4.3.0" targetFramework="net45" />
<package id="System.Reflection" version="4.3.0" targetFramework="net45" />
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net45" />
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net45" />
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net45" />
<package id="System.Runtime" version="4.3.0" targetFramework="net45" />
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net45" />
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net45" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net45" />
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net45" />
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net45" />
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net45" />
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net45" />
<package id="System.Threading" version="4.3.0" targetFramework="net45" />
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net45" />
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net45" />
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net45" />
<package id="xunit" version="2.1.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />
Expand Down
7 changes: 6 additions & 1 deletion src/Datadog.Trace.Tests/Datadog.Trace.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,17 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
<PackageReference Include="Moq" Version="4.7.127" />
<PackageReference Include="Opentracing" Version="0.10.0" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp2.0;' ">
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Net.Http" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\lib\opentracing-csharp\src\OpenTracing\OpenTracing.csproj" />
<ProjectReference Include="..\Datadog.Trace\Datadog.Trace.csproj" />
</ItemGroup>

Expand Down
14 changes: 14 additions & 0 deletions src/Datadog.Trace.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions src/Datadog.Trace/Api.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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());
}

Expand Down
15 changes: 11 additions & 4 deletions src/Datadog.Trace/Datadog.Trace.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,17 @@
<PackageReleaseNotes>Alpha release</PackageReleaseNotes>
<Copyright>Datadog, Inc. 2017</Copyright>
<PackageTags></PackageTags>
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeOpentracingLib</TargetsForTfmSpecificBuildOutput>
</PropertyGroup>

<Target Name="IncludeOpentracingLib">
<ItemGroup>
<BuildOutputInPackage Include="$(OutputPath)opentracing.dll" />
</ItemGroup>
</Target>

<ItemGroup>
<PackageReference Include="MsgPack.Cli" Version="0.9.2" />
<PackageReference Include="Opentracing" Version="0.10.0" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
Expand All @@ -24,11 +30,12 @@
<PackageReference Include="Microsoft.CSharp" Version="4.0.1" />
<PackageReference Include="System.Dynamic.Runtime" Version="4.0.11" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net46' ">
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Net.Http" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
<Reference Include="Microsoft.CSharp" />
<ItemGroup>
<ProjectReference Include="..\..\lib\opentracing-csharp\src\OpenTracing\OpenTracing.csproj" PrivateAssets="All" />
</ItemGroup>

</Project>