Skip to content

Packaging for alpha release #12

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
merged 3 commits into from
Nov 2, 2017
Merged

Packaging for alpha release #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6df951e
Massive renaming
bmermet Oct 31, 2017
67ab57e
Add package metadata
bmermet Oct 31, 2017
fe19dfe
Add Copyright to the package
bmermet Nov 2, 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
16 changes: 8 additions & 8 deletions ...adog.Tracer.IntegrationTests.Net45.csproj → ...tadog.Trace.IntegrationTests.Net45.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ProjectGuid>{9DD2FA11-BCBA-4F8A-93CE-D1ED28282A6E}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Datadog.Tracer.IntegrationTests.Net45</RootNamespace>
<AssemblyName>Datadog.Tracer.IntegrationTests.Net45</AssemblyName>
<RootNamespace>Datadog.Trace.IntegrationTests.Net45</RootNamespace>
<AssemblyName>Datadog.Trace.IntegrationTests.Net45</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
Expand Down Expand Up @@ -65,13 +65,13 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Datadog.Tracer.IntegrationTests\MsgPackHelpers.cs">
<Compile Include="..\Datadog.Trace.IntegrationTests\MsgPackHelpers.cs">
<Link>MsgPackHelpers.cs</Link>
</Compile>
<Compile Include="..\Datadog.Tracer.IntegrationTests\RecordHttpHandler.cs">
<Compile Include="..\Datadog.Trace.IntegrationTests\RecordHttpHandler.cs">
<Link>RecordHttpHandler.cs</Link>
</Compile>
<Compile Include="..\Datadog.Tracer.IntegrationTests\SendTracesToAgent.cs">
<Compile Include="..\Datadog.Trace.IntegrationTests\SendTracesToAgent.cs">
<Link>SendTracesToAgent.cs</Link>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
Expand All @@ -80,13 +80,13 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Datadog.Tracer\Datadog.Tracer.csproj">
<ProjectReference Include="..\Datadog.Trace\Datadog.Trace.csproj">
<Project>{5dfdf781-f24c-45b1-82ef-9125875a80a4}</Project>
<Name>Datadog.Tracer</Name>
<Name>Datadog.Trace</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
4 changes: 2 additions & 2 deletions ...ionTests.Net45/Properties/AssemblyInfo.cs → ...ionTests.Net45/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Datadog.Tracer.IntegrationsTests.Net45")]
[assembly: AssemblyTitle("Datadog.Trace.IntegrationsTests.Net45")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Datadog.Tracer.IntegrationsTests.Net45")]
[assembly: AssemblyProduct("Datadog.Trace.IntegrationsTests.Net45")]
[assembly: AssemblyCopyright("Copyright © 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Expand Down
0 ...er.IntegrationTests.Net45/packages.config → ...ce.IntegrationTests.Net45/packages.config
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions ...ts/Datadog.Tracer.IntegrationTests.csproj → ...sts/Datadog.Trace.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
<PackageReference Include="System.Net.Http" Version="4.3.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Datadog.Tracer\Datadog.Tracer.csproj" />
<ProjectReference Include="..\Datadog.Trace\Datadog.Trace.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ...Tracer.IntegrationTests/MsgPackHelpers.cs → ....Trace.IntegrationTests/MsgPackHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;

namespace Datadog.Tracer.IntegrationTests
namespace Datadog.Trace.IntegrationTests
{
/// <summary>
/// This class provides a bunch of helpers to read Span and ServiceInfo data
Expand Down
2 changes: 1 addition & 1 deletion ...cer.IntegrationTests/RecordHttpHandler.cs → ...ace.IntegrationTests/RecordHttpHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Threading;
using System.Threading.Tasks;

namespace Datadog.Tracer.IntegrationTests
namespace Datadog.Trace.IntegrationTests
{
/// <summary>
/// This class implements a handler that can be passed as parameter of a new HttpClient
Expand Down
2 changes: 1 addition & 1 deletion ...cer.IntegrationTests/SendTracesToAgent.cs → ...ace.IntegrationTests/SendTracesToAgent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Net;
using Xunit;

namespace Datadog.Tracer.IntegrationTests
namespace Datadog.Trace.IntegrationTests
{
public class SendTracesToAgent
{
Expand Down
22 changes: 11 additions & 11 deletions ...s.Net45/Datadog.Tracer.Tests.Net45.csproj → ...ts.Net45/Datadog.Trace.Tests.Net45.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ProjectGuid>{E03FF1CD-8DC2-42C3-B85E-921893710CF0}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Datadog.Tracer.Tests.Net45</RootNamespace>
<AssemblyName>Datadog.Tracer.Tests.Net45</AssemblyName>
<RootNamespace>Datadog.Trace.Tests.Net45</RootNamespace>
<AssemblyName>Datadog.Trace.Tests.Net45</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
Expand Down Expand Up @@ -71,30 +71,30 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Datadog.Tracer.Tests\AgentWriterBufferTests.cs">
<Compile Include="..\Datadog.Trace.Tests\AgentWriterBufferTests.cs">
<Link>AgentWriterBufferTests.cs</Link>
</Compile>
<Compile Include="..\Datadog.Tracer.Tests\AgentWriterTests.cs">
<Compile Include="..\Datadog.Trace.Tests\AgentWriterTests.cs">
<Link>AgentWriterTests.cs</Link>
</Compile>
<Compile Include="..\Datadog.Tracer.Tests\ApiTests.cs">
<Compile Include="..\Datadog.Trace.Tests\ApiTests.cs">
<Link>ApiTests.cs</Link>
</Compile>
<Compile Include="..\Datadog.Tracer.Tests\SpanBuilderTests.cs">
<Compile Include="..\Datadog.Trace.Tests\SpanBuilderTests.cs">
<Link>SpanBuilderTests.cs</Link>
</Compile>
<Compile Include="..\Datadog.Tracer.Tests\SpanTests.cs">
<Compile Include="..\Datadog.Trace.Tests\SpanTests.cs">
<Link>SpanTests.cs</Link>
</Compile>
<Compile Include="..\Datadog.Tracer.Tests\TracerTests.cs">
<Compile Include="..\Datadog.Trace.Tests\TracerTests.cs">
<Link>TracerTests.cs</Link>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Datadog.Tracer\Datadog.Tracer.csproj">
<ProjectReference Include="..\Datadog.Trace\Datadog.Trace.csproj">
<Project>{5dfdf781-f24c-45b1-82ef-9125875a80a4}</Project>
<Name>Datadog.Tracer</Name>
<Name>Datadog.Trace</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Expand All @@ -104,4 +104,4 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
4 changes: 2 additions & 2 deletions ...er.Tests.Net45/Properties/AssemblyInfo.cs → ...ce.Tests.Net45/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Datadog.Tracer.Tests.Net45")]
[assembly: AssemblyTitle("Datadog.Trace.Tests.Net45")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Datadog.Tracer.Tests.Net45")]
[assembly: AssemblyProduct("Datadog.Trace.Tests.Net45")]
[assembly: AssemblyCopyright("Copyright © 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Expand Down
0 ...atadog.Tracer.Tests.Net45/packages.config → ...Datadog.Trace.Tests.Net45/packages.config
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...og.Tracer.Tests/AgentWriterBufferTests.cs → ...dog.Trace.Tests/AgentWriterBufferTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Linq;
using Xunit;

namespace Datadog.Tracer.Tests
namespace Datadog.Trace.Tests
{
public class AgentWriterBufferTests
{
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Tracer.Tests/AgentWriterTests.cs → src/Datadog.Trace.Tests/AgentWriterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Threading.Tasks;
using Xunit;

namespace Datadog.Tracer.Tests
namespace Datadog.Trace.Tests
{
public class AgentWriterTests
{
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Tracer.Tests/ApiTests.cs → src/Datadog.Trace.Tests/ApiTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Threading.Tasks;
using Xunit;

namespace Datadog.Tracer.Tests
namespace Datadog.Trace.Tests
{
public class SetResponseHandler : DelegatingHandler
{
Expand Down
2 changes: 1 addition & 1 deletion ....Tracer.Tests/Datadog.Tracer.Tests.csproj → ...og.Trace.Tests/Datadog.Trace.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Datadog.Tracer\Datadog.Tracer.csproj" />
<ProjectReference Include="..\Datadog.Trace\Datadog.Trace.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Datadog.Tracer.Tests/SpanBuilderTests.cs → src/Datadog.Trace.Tests/SpanBuilderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System;
using Xunit;

namespace Datadog.Tracer.Tests
namespace Datadog.Trace.Tests
{
public class SpanBuilderTests
{
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Tracer.Tests/SpanTests.cs → src/Datadog.Trace.Tests/SpanTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Threading.Tasks;
using Xunit;

namespace Datadog.Tracer.Tests
namespace Datadog.Trace.Tests
{
public class SpanTests
{
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Tracer.Tests/TimeUtilsTests.cs → src/Datadog.Trace.Tests/TimeUtilsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System;
using Xunit;

namespace Datadog.Tracer.Tests
namespace Datadog.Trace.Tests
{
public class TimeUtilsTests
{
Expand Down
4 changes: 2 additions & 2 deletions src/Datadog.Tracer.Tests/TracerTests.cs → src/Datadog.Trace.Tests/TracerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Threading.Tasks;
using Xunit;

namespace Datadog.Tracer.Tests
namespace Datadog.Trace.Tests
{
public class TracerTests
{
Expand All @@ -18,7 +18,7 @@ public void BuildSpan_NoParameter_DefaultParameters()
var builder = tracer.BuildSpan("Op1");
var span = (Span)builder.Start();

Assert.Equal("Datadog.Tracer", span.ServiceName);
Assert.Equal("Datadog.Trace", span.ServiceName);
Assert.Equal("Op1", span.OperationName);
}

Expand Down
10 changes: 5 additions & 5 deletions src/Datadog.APM.sln → src/Datadog.Trace.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.3
MinimumVisualStudioVersion = 15.0.26124.0
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Tracer", "Datadog.Tracer\Datadog.Tracer.csproj", "{5DFDF781-F24C-45B1-82EF-9125875A80A4}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Trace", "Datadog.Trace\Datadog.Trace.csproj", "{5DFDF781-F24C-45B1-82EF-9125875A80A4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Tracer.Tests", "Datadog.Tracer.Tests\Datadog.Tracer.Tests.csproj", "{73A1BE1C-9C8A-43FA-86A8-BF2744B4C1BB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Trace.Tests", "Datadog.Trace.Tests\Datadog.Trace.Tests.csproj", "{73A1BE1C-9C8A-43FA-86A8-BF2744B4C1BB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Tracer.IntegrationTests", "Datadog.Tracer.IntegrationTests\Datadog.Tracer.IntegrationTests.csproj", "{0434F813-5F94-4195-8A2C-E2E755513822}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Trace.IntegrationTests", "Datadog.Trace.IntegrationTests\Datadog.Trace.IntegrationTests.csproj", "{0434F813-5F94-4195-8A2C-E2E755513822}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Datadog.Tracer.Tests.Net45", "Datadog.Tracer.Tests.Net45\Datadog.Tracer.Tests.Net45.csproj", "{E03FF1CD-8DC2-42C3-B85E-921893710CF0}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Datadog.Trace.Tests.Net45", "Datadog.Trace.Tests.Net45\Datadog.Trace.Tests.Net45.csproj", "{E03FF1CD-8DC2-42C3-B85E-921893710CF0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Datadog.Tracer.IntegrationTests.Net45", "Datadog.Tracer.IntegrationTests.Net45\Datadog.Tracer.IntegrationTests.Net45.csproj", "{9DD2FA11-BCBA-4F8A-93CE-D1ED28282A6E}"
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
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
4 changes: 2 additions & 2 deletions src/Datadog.Tracer/AgentWriter.cs → src/Datadog.Trace/AgentWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Datadog.Tracer.Logging;
using Datadog.Trace.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;

namespace Datadog.Tracer
namespace Datadog.Trace
{
internal class AgentWriter : IAgentWriter
{
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Tracer/AgentWriterBuffer.cs → src/Datadog.Trace/AgentWriterBuffer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;

namespace Datadog.Tracer
namespace Datadog.Trace
{
internal class AgentWriterBuffer<T>
{
Expand Down
4 changes: 2 additions & 2 deletions src/Datadog.Tracer/Api.cs → src/Datadog.Trace/Api.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Datadog.Tracer.Logging;
using Datadog.Trace.Logging;
using MsgPack.Serialization;
using System;
using System.Collections.Generic;
Expand All @@ -7,7 +7,7 @@
using System.Runtime.InteropServices;
using System.Threading.Tasks;

namespace Datadog.Tracer
namespace Datadog.Trace
{
internal class Api : IApi
{
Expand Down
7 changes: 7 additions & 0 deletions src/Datadog.Trace/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("Datadog.Trace.Tests")]
[assembly: InternalsVisibleTo("Datadog.Trace.Tests.Net45")]
[assembly: InternalsVisibleTo("Datadog.Trace.IntegrationTests")]
[assembly: InternalsVisibleTo("Datadog.Trace.IntegrationTests.Net45")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
2 changes: 1 addition & 1 deletion src/Datadog.Tracer/AsyncLocalCompat.cs → src/Datadog.Trace/AsyncLocalCompat.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

namespace Datadog.Tracer
namespace Datadog.Trace
{
#if NET45
using System.Runtime.Remoting.Messaging;
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Tracer/Constants.cs → src/Datadog.Trace/Constants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Datadog.Tracer
namespace Datadog.Trace
{
internal static class Constants
{
Expand Down
8 changes: 8 additions & 0 deletions src/Datadog.Tracer/Datadog.Tracer.csproj → src/Datadog.Trace/Datadog.Trace.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net46</TargetFrameworks>
<PackageId>Datadog.Trace</PackageId>
<PackageVersion>0.1.0</PackageVersion>
<Authors>Datadog</Authors>
<Description>Datadog tracing code</Description>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageReleaseNotes>Alpha release</PackageReleaseNotes>
<Copyright>Datadog, Inc. 2017</Copyright>
<PackageTags></PackageTags>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Tracer/IAgentWriter.cs → src/Datadog.Trace/IAgentWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Collections.Generic;

namespace Datadog.Tracer
namespace Datadog.Trace
{
internal interface IAgentWriter
{
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Tracer/IApi.cs → src/Datadog.Trace/IApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Threading.Tasks;

namespace Datadog.Tracer
namespace Datadog.Trace
{
interface IApi
{
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Tracer/IDatadogTracer.cs → src/Datadog.Trace/IDatadogTracer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using OpenTracing;
using System.Collections.Generic;

namespace Datadog.Tracer
namespace Datadog.Trace
{
internal interface IDatadogTracer : ITracer
{
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Tracer/ITraceContext.cs → src/Datadog.Trace/ITraceContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Datadog.Tracer
namespace Datadog.Trace
{
internal interface ITraceContext
{
Expand Down
Loading