diff --git a/src/Datadog.Tracer.IntegrationTests.Net45/Datadog.Tracer.IntegrationTests.Net45.csproj b/src/Datadog.Trace.IntegrationTests.Net45/Datadog.Trace.IntegrationTests.Net45.csproj similarity index 89% rename from src/Datadog.Tracer.IntegrationTests.Net45/Datadog.Tracer.IntegrationTests.Net45.csproj rename to src/Datadog.Trace.IntegrationTests.Net45/Datadog.Trace.IntegrationTests.Net45.csproj index 9049e204874f..afe3960c20ff 100644 --- a/src/Datadog.Tracer.IntegrationTests.Net45/Datadog.Tracer.IntegrationTests.Net45.csproj +++ b/src/Datadog.Trace.IntegrationTests.Net45/Datadog.Trace.IntegrationTests.Net45.csproj @@ -7,8 +7,8 @@ {9DD2FA11-BCBA-4F8A-93CE-D1ED28282A6E} Library Properties - Datadog.Tracer.IntegrationTests.Net45 - Datadog.Tracer.IntegrationTests.Net45 + Datadog.Trace.IntegrationTests.Net45 + Datadog.Trace.IntegrationTests.Net45 v4.5 512 @@ -65,13 +65,13 @@ - + MsgPackHelpers.cs - + RecordHttpHandler.cs - + SendTracesToAgent.cs @@ -80,13 +80,13 @@ - + {5dfdf781-f24c-45b1-82ef-9125875a80a4} - Datadog.Tracer + Datadog.Trace - \ No newline at end of file + diff --git a/src/Datadog.Tracer.IntegrationTests.Net45/Properties/AssemblyInfo.cs b/src/Datadog.Trace.IntegrationTests.Net45/Properties/AssemblyInfo.cs similarity index 90% rename from src/Datadog.Tracer.IntegrationTests.Net45/Properties/AssemblyInfo.cs rename to src/Datadog.Trace.IntegrationTests.Net45/Properties/AssemblyInfo.cs index 9224fdc8ab57..5d57193b71ce 100644 --- a/src/Datadog.Tracer.IntegrationTests.Net45/Properties/AssemblyInfo.cs +++ b/src/Datadog.Trace.IntegrationTests.Net45/Properties/AssemblyInfo.cs @@ -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("")] diff --git a/src/Datadog.Tracer.IntegrationTests.Net45/packages.config b/src/Datadog.Trace.IntegrationTests.Net45/packages.config similarity index 100% rename from src/Datadog.Tracer.IntegrationTests.Net45/packages.config rename to src/Datadog.Trace.IntegrationTests.Net45/packages.config diff --git a/src/Datadog.Tracer.IntegrationTests/Datadog.Tracer.IntegrationTests.csproj b/src/Datadog.Trace.IntegrationTests/Datadog.Trace.IntegrationTests.csproj similarity index 92% rename from src/Datadog.Tracer.IntegrationTests/Datadog.Tracer.IntegrationTests.csproj rename to src/Datadog.Trace.IntegrationTests/Datadog.Trace.IntegrationTests.csproj index 43cef98636a0..1d2d35c2ea84 100644 --- a/src/Datadog.Tracer.IntegrationTests/Datadog.Tracer.IntegrationTests.csproj +++ b/src/Datadog.Trace.IntegrationTests/Datadog.Trace.IntegrationTests.csproj @@ -20,9 +20,8 @@ - - + diff --git a/src/Datadog.Tracer.IntegrationTests/MsgPackHelpers.cs b/src/Datadog.Trace.IntegrationTests/MsgPackHelpers.cs similarity index 98% rename from src/Datadog.Tracer.IntegrationTests/MsgPackHelpers.cs rename to src/Datadog.Trace.IntegrationTests/MsgPackHelpers.cs index 7f6f0e00fa21..d6c9114991ea 100644 --- a/src/Datadog.Tracer.IntegrationTests/MsgPackHelpers.cs +++ b/src/Datadog.Trace.IntegrationTests/MsgPackHelpers.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace Datadog.Tracer.IntegrationTests +namespace Datadog.Trace.IntegrationTests { /// /// This class provides a bunch of helpers to read Span and ServiceInfo data diff --git a/src/Datadog.Tracer.IntegrationTests/RecordHttpHandler.cs b/src/Datadog.Trace.IntegrationTests/RecordHttpHandler.cs similarity index 98% rename from src/Datadog.Tracer.IntegrationTests/RecordHttpHandler.cs rename to src/Datadog.Trace.IntegrationTests/RecordHttpHandler.cs index 2392a1472fa6..d02d23209291 100644 --- a/src/Datadog.Tracer.IntegrationTests/RecordHttpHandler.cs +++ b/src/Datadog.Trace.IntegrationTests/RecordHttpHandler.cs @@ -6,7 +6,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Datadog.Tracer.IntegrationTests +namespace Datadog.Trace.IntegrationTests { /// /// This class implements a handler that can be passed as parameter of a new HttpClient diff --git a/src/Datadog.Tracer.IntegrationTests/SendTracesToAgent.cs b/src/Datadog.Trace.IntegrationTests/SendTracesToAgent.cs similarity index 99% rename from src/Datadog.Tracer.IntegrationTests/SendTracesToAgent.cs rename to src/Datadog.Trace.IntegrationTests/SendTracesToAgent.cs index f1c9055086dc..b6e1e1c9dcd7 100644 --- a/src/Datadog.Tracer.IntegrationTests/SendTracesToAgent.cs +++ b/src/Datadog.Trace.IntegrationTests/SendTracesToAgent.cs @@ -5,7 +5,7 @@ using System.Net; using Xunit; -namespace Datadog.Tracer.IntegrationTests +namespace Datadog.Trace.IntegrationTests { public class SendTracesToAgent { diff --git a/src/Datadog.Tracer.Tests.Net45/Datadog.Tracer.Tests.Net45.csproj b/src/Datadog.Trace.Tests.Net45/Datadog.Trace.Tests.Net45.csproj similarity index 88% rename from src/Datadog.Tracer.Tests.Net45/Datadog.Tracer.Tests.Net45.csproj rename to src/Datadog.Trace.Tests.Net45/Datadog.Trace.Tests.Net45.csproj index daa90a55176d..2d2cd102d3bd 100644 --- a/src/Datadog.Tracer.Tests.Net45/Datadog.Tracer.Tests.Net45.csproj +++ b/src/Datadog.Trace.Tests.Net45/Datadog.Trace.Tests.Net45.csproj @@ -7,8 +7,8 @@ {E03FF1CD-8DC2-42C3-B85E-921893710CF0} Library Properties - Datadog.Tracer.Tests.Net45 - Datadog.Tracer.Tests.Net45 + Datadog.Trace.Tests.Net45 + Datadog.Trace.Tests.Net45 v4.5 512 @@ -71,30 +71,30 @@ - + AgentWriterBufferTests.cs - + AgentWriterTests.cs - + ApiTests.cs - + SpanBuilderTests.cs - + SpanTests.cs - + TracerTests.cs - + {5dfdf781-f24c-45b1-82ef-9125875a80a4} - Datadog.Tracer + Datadog.Trace @@ -104,4 +104,4 @@ - \ No newline at end of file + diff --git a/src/Datadog.Tracer.Tests.Net45/Properties/AssemblyInfo.cs b/src/Datadog.Trace.Tests.Net45/Properties/AssemblyInfo.cs similarity index 91% rename from src/Datadog.Tracer.Tests.Net45/Properties/AssemblyInfo.cs rename to src/Datadog.Trace.Tests.Net45/Properties/AssemblyInfo.cs index 0e47e933c863..bed7307c3c76 100644 --- a/src/Datadog.Tracer.Tests.Net45/Properties/AssemblyInfo.cs +++ b/src/Datadog.Trace.Tests.Net45/Properties/AssemblyInfo.cs @@ -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("")] diff --git a/src/Datadog.Tracer.Tests.Net45/packages.config b/src/Datadog.Trace.Tests.Net45/packages.config similarity index 100% rename from src/Datadog.Tracer.Tests.Net45/packages.config rename to src/Datadog.Trace.Tests.Net45/packages.config diff --git a/src/Datadog.Tracer.Tests/AgentWriterBufferTests.cs b/src/Datadog.Trace.Tests/AgentWriterBufferTests.cs similarity index 97% rename from src/Datadog.Tracer.Tests/AgentWriterBufferTests.cs rename to src/Datadog.Trace.Tests/AgentWriterBufferTests.cs index 43615614fd86..539a21ad8275 100644 --- a/src/Datadog.Tracer.Tests/AgentWriterBufferTests.cs +++ b/src/Datadog.Trace.Tests/AgentWriterBufferTests.cs @@ -1,7 +1,7 @@ using System.Linq; using Xunit; -namespace Datadog.Tracer.Tests +namespace Datadog.Trace.Tests { public class AgentWriterBufferTests { diff --git a/src/Datadog.Tracer.Tests/AgentWriterTests.cs b/src/Datadog.Trace.Tests/AgentWriterTests.cs similarity index 98% rename from src/Datadog.Tracer.Tests/AgentWriterTests.cs rename to src/Datadog.Trace.Tests/AgentWriterTests.cs index bef7ac098016..62081a181ca3 100644 --- a/src/Datadog.Tracer.Tests/AgentWriterTests.cs +++ b/src/Datadog.Trace.Tests/AgentWriterTests.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Xunit; -namespace Datadog.Tracer.Tests +namespace Datadog.Trace.Tests { public class AgentWriterTests { diff --git a/src/Datadog.Tracer.Tests/ApiTests.cs b/src/Datadog.Trace.Tests/ApiTests.cs similarity index 98% rename from src/Datadog.Tracer.Tests/ApiTests.cs rename to src/Datadog.Trace.Tests/ApiTests.cs index a6b065d1f2f6..40c71dbe787f 100644 --- a/src/Datadog.Tracer.Tests/ApiTests.cs +++ b/src/Datadog.Trace.Tests/ApiTests.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Xunit; -namespace Datadog.Tracer.Tests +namespace Datadog.Trace.Tests { public class SetResponseHandler : DelegatingHandler { diff --git a/src/Datadog.Tracer.Tests/Datadog.Tracer.Tests.csproj b/src/Datadog.Trace.Tests/Datadog.Trace.Tests.csproj similarity index 91% rename from src/Datadog.Tracer.Tests/Datadog.Tracer.Tests.csproj rename to src/Datadog.Trace.Tests/Datadog.Trace.Tests.csproj index 18c0867516f7..cc05ea681f9e 100644 --- a/src/Datadog.Tracer.Tests/Datadog.Tracer.Tests.csproj +++ b/src/Datadog.Trace.Tests/Datadog.Trace.Tests.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/Datadog.Tracer.Tests/SpanBuilderTests.cs b/src/Datadog.Trace.Tests/SpanBuilderTests.cs similarity index 99% rename from src/Datadog.Tracer.Tests/SpanBuilderTests.cs rename to src/Datadog.Trace.Tests/SpanBuilderTests.cs index 265904a48a27..3d5257093590 100644 --- a/src/Datadog.Tracer.Tests/SpanBuilderTests.cs +++ b/src/Datadog.Trace.Tests/SpanBuilderTests.cs @@ -3,7 +3,7 @@ using System; using Xunit; -namespace Datadog.Tracer.Tests +namespace Datadog.Trace.Tests { public class SpanBuilderTests { diff --git a/src/Datadog.Tracer.Tests/SpanTests.cs b/src/Datadog.Trace.Tests/SpanTests.cs similarity index 99% rename from src/Datadog.Tracer.Tests/SpanTests.cs rename to src/Datadog.Trace.Tests/SpanTests.cs index 619613718128..73e5b294248e 100644 --- a/src/Datadog.Tracer.Tests/SpanTests.cs +++ b/src/Datadog.Trace.Tests/SpanTests.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Xunit; -namespace Datadog.Tracer.Tests +namespace Datadog.Trace.Tests { public class SpanTests { diff --git a/src/Datadog.Tracer.Tests/TimeUtilsTests.cs b/src/Datadog.Trace.Tests/TimeUtilsTests.cs similarity index 95% rename from src/Datadog.Tracer.Tests/TimeUtilsTests.cs rename to src/Datadog.Trace.Tests/TimeUtilsTests.cs index 2b97d6345646..3dd940fb8bd0 100644 --- a/src/Datadog.Tracer.Tests/TimeUtilsTests.cs +++ b/src/Datadog.Trace.Tests/TimeUtilsTests.cs @@ -2,7 +2,7 @@ using System; using Xunit; -namespace Datadog.Tracer.Tests +namespace Datadog.Trace.Tests { public class TimeUtilsTests { diff --git a/src/Datadog.Tracer.Tests/TracerTests.cs b/src/Datadog.Trace.Tests/TracerTests.cs similarity index 97% rename from src/Datadog.Tracer.Tests/TracerTests.cs rename to src/Datadog.Trace.Tests/TracerTests.cs index 2c70c9e5a452..ec4c3d565863 100644 --- a/src/Datadog.Tracer.Tests/TracerTests.cs +++ b/src/Datadog.Trace.Tests/TracerTests.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Xunit; -namespace Datadog.Tracer.Tests +namespace Datadog.Trace.Tests { public class TracerTests { @@ -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); } diff --git a/src/Datadog.APM.sln b/src/Datadog.Trace.sln similarity index 90% rename from src/Datadog.APM.sln rename to src/Datadog.Trace.sln index 8396ed6aaee7..964d5dc39c1d 100644 --- a/src/Datadog.APM.sln +++ b/src/Datadog.Trace.sln @@ -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 diff --git a/src/Datadog.Tracer/AgentWriter.cs b/src/Datadog.Trace/AgentWriter.cs similarity index 97% rename from src/Datadog.Tracer/AgentWriter.cs rename to src/Datadog.Trace/AgentWriter.cs index c4ecd5a1d14c..ca71d140da95 100644 --- a/src/Datadog.Tracer/AgentWriter.cs +++ b/src/Datadog.Trace/AgentWriter.cs @@ -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 { diff --git a/src/Datadog.Tracer/AgentWriterBuffer.cs b/src/Datadog.Trace/AgentWriterBuffer.cs similarity index 97% rename from src/Datadog.Tracer/AgentWriterBuffer.cs rename to src/Datadog.Trace/AgentWriterBuffer.cs index ae8dcb542582..eb41cbff14a4 100644 --- a/src/Datadog.Tracer/AgentWriterBuffer.cs +++ b/src/Datadog.Trace/AgentWriterBuffer.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Datadog.Tracer +namespace Datadog.Trace { internal class AgentWriterBuffer { diff --git a/src/Datadog.Tracer/Api.cs b/src/Datadog.Trace/Api.cs similarity index 98% rename from src/Datadog.Tracer/Api.cs rename to src/Datadog.Trace/Api.cs index 9b017fc89c58..8592f30afd0c 100644 --- a/src/Datadog.Tracer/Api.cs +++ b/src/Datadog.Trace/Api.cs @@ -1,4 +1,4 @@ -using Datadog.Tracer.Logging; +using Datadog.Trace.Logging; using MsgPack.Serialization; using System; using System.Collections.Generic; @@ -7,7 +7,7 @@ using System.Runtime.InteropServices; using System.Threading.Tasks; -namespace Datadog.Tracer +namespace Datadog.Trace { internal class Api : IApi { diff --git a/src/Datadog.Trace/AssemblyInfo.cs b/src/Datadog.Trace/AssemblyInfo.cs new file mode 100644 index 000000000000..e8a1472fbae6 --- /dev/null +++ b/src/Datadog.Trace/AssemblyInfo.cs @@ -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")] \ No newline at end of file diff --git a/src/Datadog.Tracer/AsyncLocalCompat.cs b/src/Datadog.Trace/AsyncLocalCompat.cs similarity index 97% rename from src/Datadog.Tracer/AsyncLocalCompat.cs rename to src/Datadog.Trace/AsyncLocalCompat.cs index eafe46b8c039..80b582d1ddf9 100644 --- a/src/Datadog.Tracer/AsyncLocalCompat.cs +++ b/src/Datadog.Trace/AsyncLocalCompat.cs @@ -1,5 +1,5 @@  -namespace Datadog.Tracer +namespace Datadog.Trace { #if NET45 using System.Runtime.Remoting.Messaging; diff --git a/src/Datadog.Tracer/Constants.cs b/src/Datadog.Trace/Constants.cs similarity index 88% rename from src/Datadog.Tracer/Constants.cs rename to src/Datadog.Trace/Constants.cs index b7ebf0a2bf8b..42d3e33912bf 100644 --- a/src/Datadog.Tracer/Constants.cs +++ b/src/Datadog.Trace/Constants.cs @@ -1,4 +1,4 @@ -namespace Datadog.Tracer +namespace Datadog.Trace { internal static class Constants { diff --git a/src/Datadog.Tracer/Datadog.Tracer.csproj b/src/Datadog.Trace/Datadog.Trace.csproj similarity index 70% rename from src/Datadog.Tracer/Datadog.Tracer.csproj rename to src/Datadog.Trace/Datadog.Trace.csproj index 2b1fc06d3013..1345fad6f88f 100644 --- a/src/Datadog.Tracer/Datadog.Tracer.csproj +++ b/src/Datadog.Trace/Datadog.Trace.csproj @@ -2,6 +2,14 @@ netstandard2.0;net45;net46 + Datadog.Trace + 0.1.0 + Datadog + Datadog tracing code + false + Alpha release + Datadog, Inc. 2017 + diff --git a/src/Datadog.Tracer/IAgentWriter.cs b/src/Datadog.Trace/IAgentWriter.cs similarity index 88% rename from src/Datadog.Tracer/IAgentWriter.cs rename to src/Datadog.Trace/IAgentWriter.cs index 41209a350c67..f9a819f5ddeb 100644 --- a/src/Datadog.Tracer/IAgentWriter.cs +++ b/src/Datadog.Trace/IAgentWriter.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Datadog.Tracer +namespace Datadog.Trace { internal interface IAgentWriter { diff --git a/src/Datadog.Tracer/IApi.cs b/src/Datadog.Trace/IApi.cs similarity index 89% rename from src/Datadog.Tracer/IApi.cs rename to src/Datadog.Trace/IApi.cs index d7998fa94e34..210e84df91a2 100644 --- a/src/Datadog.Tracer/IApi.cs +++ b/src/Datadog.Trace/IApi.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace Datadog.Tracer +namespace Datadog.Trace { interface IApi { diff --git a/src/Datadog.Tracer/IDatadogTracer.cs b/src/Datadog.Trace/IDatadogTracer.cs similarity index 91% rename from src/Datadog.Tracer/IDatadogTracer.cs rename to src/Datadog.Trace/IDatadogTracer.cs index c9171bada8fa..d17d87495160 100644 --- a/src/Datadog.Tracer/IDatadogTracer.cs +++ b/src/Datadog.Trace/IDatadogTracer.cs @@ -1,7 +1,7 @@ using OpenTracing; using System.Collections.Generic; -namespace Datadog.Tracer +namespace Datadog.Trace { internal interface IDatadogTracer : ITracer { diff --git a/src/Datadog.Tracer/ITraceContext.cs b/src/Datadog.Trace/ITraceContext.cs similarity index 87% rename from src/Datadog.Tracer/ITraceContext.cs rename to src/Datadog.Trace/ITraceContext.cs index 62bb5bb2100f..b04ee9acbcae 100644 --- a/src/Datadog.Tracer/ITraceContext.cs +++ b/src/Datadog.Trace/ITraceContext.cs @@ -1,4 +1,4 @@ -namespace Datadog.Tracer +namespace Datadog.Trace { internal interface ITraceContext { diff --git a/src/Datadog.Tracer/LibLog.cs b/src/Datadog.Trace/LibLog.cs similarity index 99% rename from src/Datadog.Tracer/LibLog.cs rename to src/Datadog.Trace/LibLog.cs index 11f851c6ba32..c52c2bfaa880 100644 --- a/src/Datadog.Tracer/LibLog.cs +++ b/src/Datadog.Trace/LibLog.cs @@ -40,23 +40,23 @@ using System.Diagnostics.CodeAnalysis; -[assembly: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "Datadog.Tracer.Logging")] -[assembly: SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed", Scope = "member", Target = "Datadog.Tracer.Logging.Logger.#Invoke(Datadog.Tracer.Logging.LogLevel,System.Func`1,System.Exception,System.Object[])")] +[assembly: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "Datadog.Trace.Logging")] +[assembly: SuppressMessage("Microsoft.Design", "CA1026:DefaultParametersShouldNotBeUsed", Scope = "member", Target = "Datadog.Trace.Logging.Logger.#Invoke(Datadog.Trace.Logging.LogLevel,System.Func`1,System.Exception,System.Object[])")] // If you copied this file manually, you need to change all "YourRootNameSpace" so not to clash with other libraries // that use LibLog #if LIBLOG_PROVIDERS_ONLY -namespace Datadog.Tracer.LibLog +namespace Datadog.Trace.LibLog #else -namespace Datadog.Tracer.Logging +namespace Datadog.Trace.Logging #endif { using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; #if LIBLOG_PROVIDERS_ONLY - using Datadog.Tracer.LibLog.LogProviders; + using Datadog.Trace.LibLog.LogProviders; #else - using Datadog.Tracer.Logging.LogProviders; + using Datadog.Trace.Logging.LogProviders; #endif using System; #if !LIBLOG_PROVIDERS_ONLY @@ -714,9 +714,9 @@ public bool Log(LogLevel logLevel, Func messageFunc, Exception exception } #if LIBLOG_PROVIDERS_ONLY -namespace Datadog.Tracer.LibLog.LogProviders +namespace Datadog.Trace.LibLog.LogProviders #else -namespace Datadog.Tracer.Logging.LogProviders +namespace Datadog.Trace.Logging.LogProviders #endif { using System; diff --git a/src/Datadog.Tracer/MsgPackContent.cs b/src/Datadog.Trace/MsgPackContent.cs similarity index 97% rename from src/Datadog.Tracer/MsgPackContent.cs rename to src/Datadog.Trace/MsgPackContent.cs index a83fbb7e2929..3da68c124885 100644 --- a/src/Datadog.Tracer/MsgPackContent.cs +++ b/src/Datadog.Trace/MsgPackContent.cs @@ -5,7 +5,7 @@ using System.Net.Http.Headers; using System.Threading.Tasks; -namespace Datadog.Tracer +namespace Datadog.Trace { public class MsgPackContent : HttpContent { diff --git a/src/Datadog.Tracer/RandomUtils.cs b/src/Datadog.Trace/RandomUtils.cs similarity index 93% rename from src/Datadog.Tracer/RandomUtils.cs rename to src/Datadog.Trace/RandomUtils.cs index 804f46d85811..6713cf928e51 100644 --- a/src/Datadog.Tracer/RandomUtils.cs +++ b/src/Datadog.Trace/RandomUtils.cs @@ -1,6 +1,6 @@ using System; -namespace Datadog.Tracer +namespace Datadog.Trace { public static class RandomUtils { diff --git a/src/Datadog.Tracer/ServiceInfo.cs b/src/Datadog.Trace/ServiceInfo.cs similarity index 86% rename from src/Datadog.Tracer/ServiceInfo.cs rename to src/Datadog.Trace/ServiceInfo.cs index 12a17bd2bcdd..cfc7d8840067 100644 --- a/src/Datadog.Tracer/ServiceInfo.cs +++ b/src/Datadog.Trace/ServiceInfo.cs @@ -1,4 +1,4 @@ -namespace Datadog.Tracer +namespace Datadog.Trace { public class ServiceInfo { diff --git a/src/Datadog.Tracer/ServiceInfoMessagePackSerializer.cs b/src/Datadog.Trace/ServiceInfoMessagePackSerializer.cs similarity index 97% rename from src/Datadog.Tracer/ServiceInfoMessagePackSerializer.cs rename to src/Datadog.Trace/ServiceInfoMessagePackSerializer.cs index c253c703959c..d3f2952d0596 100644 --- a/src/Datadog.Tracer/ServiceInfoMessagePackSerializer.cs +++ b/src/Datadog.Trace/ServiceInfoMessagePackSerializer.cs @@ -1,7 +1,7 @@ using MsgPack; using MsgPack.Serialization; -namespace Datadog.Tracer +namespace Datadog.Trace { internal class ServiceInfoMessagePackSerializer : MessagePackSerializer { diff --git a/src/Datadog.Tracer/Span.cs b/src/Datadog.Trace/Span.cs similarity index 96% rename from src/Datadog.Tracer/Span.cs rename to src/Datadog.Trace/Span.cs index dea249b5a635..b3e22e6920dc 100644 --- a/src/Datadog.Tracer/Span.cs +++ b/src/Datadog.Trace/Span.cs @@ -1,11 +1,11 @@ -using Datadog.Tracer.Logging; +using Datadog.Trace.Logging; using OpenTracing; using System; using System.Collections.Generic; using System.Diagnostics; using System.Text; -namespace Datadog.Tracer +namespace Datadog.Trace { public class Span : ISpan { @@ -119,37 +119,37 @@ public void Finish(DateTimeOffset finishTimestamp) public string GetBaggageItem(string key) { - _log.Debug("ISpan.GetBaggageItem is not implemented by Datadog.Tracer"); + _log.Debug("ISpan.GetBaggageItem is not implemented by Datadog.Trace"); return null; } public ISpan Log(IEnumerable> fields) { - _log.Debug("ISpan.Log is not implemented by Datadog.Tracer"); + _log.Debug("ISpan.Log is not implemented by Datadog.Trace"); return this; } public ISpan Log(DateTimeOffset timestamp, IEnumerable> fields) { - _log.Debug("ISpan.Log is not implemented by Datadog.Tracer"); + _log.Debug("ISpan.Log is not implemented by Datadog.Trace"); return this; } public ISpan Log(string eventName) { - _log.Debug("ISpan.Log is not implemented by Datadog.Tracer"); + _log.Debug("ISpan.Log is not implemented by Datadog.Trace"); return this; } public ISpan Log(DateTimeOffset timestamp, string eventName) { - _log.Debug("ISpan.Log is not implemented by Datadog.Tracer"); + _log.Debug("ISpan.Log is not implemented by Datadog.Trace"); return this; } public ISpan SetBaggageItem(string key, string value) { - _log.Debug("ISpan.SetBaggageItem is not implemented by Datadog.Tracer"); + _log.Debug("ISpan.SetBaggageItem is not implemented by Datadog.Trace"); return this; } @@ -187,13 +187,13 @@ public ISpan SetTag(string key, string value) return this; } switch (key) { - case Datadog.Tracer.Tags.ResourceName: + case Datadog.Trace.Tags.ResourceName: ResourceName = value; return this; case OpenTracing.Tags.Error: Error = value == "True"; return this; - case Datadog.Tracer.Tags.SpanType: + case Datadog.Trace.Tags.SpanType: Type = value; return this; } diff --git a/src/Datadog.Tracer/SpanBuilder.cs b/src/Datadog.Trace/SpanBuilder.cs similarity index 95% rename from src/Datadog.Tracer/SpanBuilder.cs rename to src/Datadog.Trace/SpanBuilder.cs index a2f7bc191ff5..914e7c0c5a87 100644 --- a/src/Datadog.Tracer/SpanBuilder.cs +++ b/src/Datadog.Trace/SpanBuilder.cs @@ -1,9 +1,9 @@ using System; using OpenTracing; using System.Collections.Generic; -using Datadog.Tracer.Logging; +using Datadog.Trace.Logging; -namespace Datadog.Tracer +namespace Datadog.Trace { public class SpanBuilder : ISpanBuilder { @@ -33,7 +33,7 @@ public ISpanBuilder AddReference(string referenceType, ISpanContext referencedCo return this; } } - _log.Debug("ISpanBuilder.AddReference is not implemented for other references than ChildOf by Datadog.Tracer"); + _log.Debug("ISpanBuilder.AddReference is not implemented for other references than ChildOf by Datadog.Trace"); return this; } @@ -57,13 +57,13 @@ public ISpanBuilder AsChildOf(ISpanContext parent) public ISpanBuilder FollowsFrom(ISpan parent) { - _log.Debug("ISpanBuilder.FollowsFrom is not implemented by Datadog.Tracer"); + _log.Debug("ISpanBuilder.FollowsFrom is not implemented by Datadog.Trace"); return this; } public ISpanBuilder FollowsFrom(ISpanContext parent) { - _log.Debug("ISpanBuilder.FollowsFrom is not implemented by Datadog.Tracer"); + _log.Debug("ISpanBuilder.FollowsFrom is not implemented by Datadog.Trace"); return this; } diff --git a/src/Datadog.Tracer/SpanContext.cs b/src/Datadog.Trace/SpanContext.cs similarity index 94% rename from src/Datadog.Tracer/SpanContext.cs rename to src/Datadog.Trace/SpanContext.cs index 6227053afbb8..4c81e40bb157 100644 --- a/src/Datadog.Tracer/SpanContext.cs +++ b/src/Datadog.Trace/SpanContext.cs @@ -1,9 +1,9 @@ -using Datadog.Tracer.Logging; +using Datadog.Trace.Logging; using OpenTracing; using System; using System.Collections.Generic; -namespace Datadog.Tracer +namespace Datadog.Trace { internal class SpanContext : ISpanContext { @@ -45,7 +45,7 @@ public SpanContext(ITraceContext traceContext, string serviceName) public IEnumerable> GetBaggageItems() { - _log.Debug("SpanContext.GetBaggageItems is not implemented by Datadog.Tracer"); + _log.Debug("SpanContext.GetBaggageItems is not implemented by Datadog.Trace"); yield break; } } diff --git a/src/Datadog.Tracer/SpanMsgpackSerializer.cs b/src/Datadog.Trace/SpanMsgpackSerializer.cs similarity index 98% rename from src/Datadog.Tracer/SpanMsgpackSerializer.cs rename to src/Datadog.Trace/SpanMsgpackSerializer.cs index 70312d66daed..7f07e79d8307 100644 --- a/src/Datadog.Tracer/SpanMsgpackSerializer.cs +++ b/src/Datadog.Trace/SpanMsgpackSerializer.cs @@ -2,7 +2,7 @@ using MsgPack.Serialization; using System; -namespace Datadog.Tracer +namespace Datadog.Trace { internal class SpanMessagePackSerializer : MessagePackSerializer { diff --git a/src/Datadog.Tracer/Tags.cs b/src/Datadog.Trace/Tags.cs similarity index 88% rename from src/Datadog.Tracer/Tags.cs rename to src/Datadog.Trace/Tags.cs index a441f48ce95b..997070f7fe05 100644 --- a/src/Datadog.Tracer/Tags.cs +++ b/src/Datadog.Trace/Tags.cs @@ -1,4 +1,4 @@ -namespace Datadog.Tracer +namespace Datadog.Trace { public static class Tags { diff --git a/src/Datadog.Tracer/TimeUtils.cs b/src/Datadog.Trace/TimeUtils.cs similarity index 95% rename from src/Datadog.Tracer/TimeUtils.cs rename to src/Datadog.Trace/TimeUtils.cs index 3f4db9010939..115010dad6d5 100644 --- a/src/Datadog.Tracer/TimeUtils.cs +++ b/src/Datadog.Trace/TimeUtils.cs @@ -1,6 +1,6 @@ using System; -namespace Datadog.Tracer +namespace Datadog.Trace { static class TimeUtils { diff --git a/src/Datadog.Tracer/TraceContext.cs b/src/Datadog.Trace/TraceContext.cs similarity index 92% rename from src/Datadog.Tracer/TraceContext.cs rename to src/Datadog.Trace/TraceContext.cs index 696413657be8..2de00f286b7a 100644 --- a/src/Datadog.Tracer/TraceContext.cs +++ b/src/Datadog.Trace/TraceContext.cs @@ -1,8 +1,8 @@ -using Datadog.Tracer.Logging; +using Datadog.Trace.Logging; using System.Collections.Generic; using System.Linq; -namespace Datadog.Tracer +namespace Datadog.Trace { internal class TraceContext : ITraceContext { @@ -12,7 +12,7 @@ internal class TraceContext : ITraceContext private IDatadogTracer _tracer; private List _spans = new List(); private int _openSpans = 0; - private AsyncLocalCompat _currentSpanContext = new AsyncLocalCompat("Datadog.Tracer.TraceContext._currentSpanContext"); + private AsyncLocalCompat _currentSpanContext = new AsyncLocalCompat("Datadog.Trace.TraceContext._currentSpanContext"); public bool Sampled { get; set; } diff --git a/src/Datadog.Tracer/Tracer.cs b/src/Datadog.Trace/Tracer.cs similarity index 93% rename from src/Datadog.Tracer/Tracer.cs rename to src/Datadog.Trace/Tracer.cs index c21645796006..54e35e47c15f 100644 --- a/src/Datadog.Tracer/Tracer.cs +++ b/src/Datadog.Trace/Tracer.cs @@ -1,17 +1,17 @@ -using Datadog.Tracer.Logging; +using Datadog.Trace.Logging; using OpenTracing; using OpenTracing.Propagation; using System; using System.Collections.Generic; using System.Reflection; -namespace Datadog.Tracer +namespace Datadog.Trace { internal class Tracer : ITracer, IDatadogTracer { private static readonly ILog _log = LogProvider.For(); - private AsyncLocalCompat _currentContext = new AsyncLocalCompat("Datadog.Tracer.Tracer._currentContext"); + private AsyncLocalCompat _currentContext = new AsyncLocalCompat("Datadog.Trace.Tracer._currentContext"); private string _defaultServiceName; private Dictionary _services = new Dictionary(); private IAgentWriter _agentWriter; @@ -55,13 +55,13 @@ public ISpanBuilder BuildSpan(string operationName) public ISpanContext Extract(Format format, TCarrier carrier) { - _log.Error("Tracer.Extract is not implemented by Datadog.Tracer"); + _log.Error("Tracer.Extract is not implemented by Datadog.Trace"); throw new UnsupportedFormatException(); } public void Inject(ISpanContext spanContext, Format format, TCarrier carrier) { - _log.Error("Tracer.Extract is not implemented by Datadog.Tracer"); + _log.Error("Tracer.Extract is not implemented by Datadog.Trace"); throw new UnsupportedFormatException(); } diff --git a/src/Datadog.Tracer/TracerFactory.cs b/src/Datadog.Trace/TracerFactory.cs similarity index 97% rename from src/Datadog.Tracer/TracerFactory.cs rename to src/Datadog.Trace/TracerFactory.cs index 74421849225e..724df0cdeece 100644 --- a/src/Datadog.Tracer/TracerFactory.cs +++ b/src/Datadog.Trace/TracerFactory.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Net.Http; -namespace Datadog.Tracer +namespace Datadog.Trace { public static class TracerFactory { diff --git a/src/Datadog.Tracer/AssemblyInfo.cs b/src/Datadog.Tracer/AssemblyInfo.cs deleted file mode 100644 index ad2af0c8b72e..000000000000 --- a/src/Datadog.Tracer/AssemblyInfo.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("Datadog.Tracer.Tests")] -[assembly: InternalsVisibleTo("Datadog.Tracer.Tests.Net45")] -[assembly: InternalsVisibleTo("Datadog.Tracer.IntegrationTests")] -[assembly: InternalsVisibleTo("Datadog.Tracer.IntegrationTests.Net45")] -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] \ No newline at end of file