From d2a2805caf1cf7840b275612b335aad70f737832 Mon Sep 17 00:00:00 2001 From: Dawid Szmigielski Date: Wed, 29 Jun 2022 09:14:18 +0200 Subject: [PATCH] Bump version to 0.2.6.0 (#545) --- docs/CHANGELOG.md | 10 ++++++++-- docs/internal/docker-windows.md | 4 ++-- overhead-test/src/Docker/eshop-app.dockerfile | 2 +- .../Datadog.Profiler.Native.Linux/CMakeLists.txt | 2 +- .../Datadog.Profiler.Native.Windows/Resource.rc | 8 ++++---- .../Datadog.Profiler.Native/dd_profiler_version.h | 2 +- profiler/src/ProfilerEngine/ProductVersion.props | 2 +- .../Azure.Site.Extension.nuspec | 2 +- .../src/azure-site-extension/applicationHost.xdt | 14 +++++++------- shared/src/azure-site-extension/install.cmd | 2 +- shared/src/msi-installer/WindowsInstaller.wixproj | 4 ++-- tracer/build/_build/Build.cs | 2 +- tracer/samples/ConsoleApp/Alpine3.10.dockerfile | 2 +- tracer/samples/ConsoleApp/Alpine3.9.dockerfile | 2 +- tracer/samples/ConsoleApp/Debian.dockerfile | 2 +- tracer/samples/WindowsContainer/Dockerfile | 2 +- .../Datadog.Monitoring.Distribution.csproj | 2 +- .../Datadog.Trace.AspNet.csproj | 2 +- ...Datadog.Trace.ClrProfiler.Managed.Loader.csproj | 2 +- .../Startup.cs | 2 +- .../CMakeLists.txt | 2 +- .../Datadog.Trace.ClrProfiler.Native/Resource.rc | 8 ++++---- .../dd_profiler_constants.h | 4 ++-- .../src/Datadog.Trace.ClrProfiler.Native/version.h | 2 +- .../Datadog.Trace.MSBuild.csproj | 2 +- .../Datadog.Trace.OpenTracing.csproj | 2 +- tracer/src/Datadog.Trace/Datadog.Trace.csproj | 2 +- tracer/src/Datadog.Trace/Tracer.cs | 2 +- tracer/src/Datadog.Trace/TracerConstants.cs | 2 +- .../src/WindowsInstaller/WindowsInstaller.wixproj | 4 ++-- .../CI/MsTestV2Tests.cs | 2 +- .../CI/NUnitTests.cs | 2 +- .../CI/XUnitTests.cs | 2 +- .../tools/PipelineMonitor/PipelineMonitor.csproj | 2 +- 34 files changed, 57 insertions(+), 51 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 523868150..a09da5d4f 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -15,12 +15,18 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2. ### Bugfixes -- Fix context propagation on .NET Framework. - ### Enhancements --- +## [Release 0.2.6](https://github.com/signalfx/signalfx-dotnet-tracing/releases/tag/v0.2.6) + +### Bugfixes + +- Fix context propagation on .NET Framework. + +--- + ## [Release 0.2.5](https://github.com/signalfx/signalfx-dotnet-tracing/releases/tag/v0.2.5) ### General diff --git a/docs/internal/docker-windows.md b/docs/internal/docker-windows.md index 1bfb63171..08c31faa0 100644 --- a/docs/internal/docker-windows.md +++ b/docs/internal/docker-windows.md @@ -6,7 +6,7 @@ Setting up SignalFx Instrumentation for .NET to run in Windows Nano Server Docke FROM mcr.microsoft.com/dotnet/aspnet:6.0-nanoserver-ltsc2022 # Download SignalFx Instrumentation for .NET zip. -ARG TRACER_VERSION=0.2.5 +ARG TRACER_VERSION=0.2.6 ADD https://github.com/signalfx/signalfx-dotnet-tracing/releases/download/v${TRACER_VERSION}/signalfx-dotnet-tracing-${TRACER_VERSION}.zip "C:/signalfx-dotnet-tracing.zip" # Extract zip to C:/signalfx/ @@ -48,7 +48,7 @@ ENV CORECLR_ENABLE_PROFILING=1 \ CORECLR_PROFILER='{B4C89B0F-9908-4F73-9F59-0D77C5A06874}' \ SIGNALFX_ENDPOINT_URL='' \ -ARG TRACER_VERSION=0.2.5 +ARG TRACER_VERSION=0.2.6 # Download and install SignalFx Instrumentation for .NET MSI. # Note: MSI is preferred installation method for Windows to setup profiler at once and reduce manual steps. diff --git a/overhead-test/src/Docker/eshop-app.dockerfile b/overhead-test/src/Docker/eshop-app.dockerfile index fe3256178..91fa5ecbd 100644 --- a/overhead-test/src/Docker/eshop-app.dockerfile +++ b/overhead-test/src/Docker/eshop-app.dockerfile @@ -44,7 +44,7 @@ RUN apt-get update \ curl # TODO Splunk: update with release -ARG TRACER_VERSION=0.2.5 +ARG TRACER_VERSION=0.2.6 RUN curl -LO https://github.com/signalfx/signalfx-dotnet-tracing/releases/download/v${TRACER_VERSION}/signalfx-dotnet-tracing_${TRACER_VERSION}_amd64.deb RUN dpkg -i ./signalfx-dotnet-tracing_${TRACER_VERSION}_amd64.deb diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt index 9be32bffd..a17bd576f 100644 --- a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt +++ b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt @@ -2,7 +2,7 @@ # Project definition # ****************************************************** -project("Datadog.AutoInstrumentation.Profiler.Native.Linux" VERSION 0.2.5) +project("Datadog.AutoInstrumentation.Profiler.Native.Linux" VERSION 0.2.6) option(RUN_ASAN "Build with Clang Undefined-Behavior Sanitizer" OFF) option(RUN_UBSAN "Build with Clang Undefined-Behavior Sanitizer" OFF) diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Resource.rc b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Resource.rc index 9d8d3c2e2..4063f3a84 100644 --- a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Resource.rc +++ b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Resource.rc @@ -89,8 +89,8 @@ NETCOREAPP20_Datadog_AutoInstrumentation_ManagedLoader_pdb SYMBOLS "net // ------- version info ------------------------------------------------------- VS_VERSION_INFO VERSIONINFO -FILEVERSION 0,2,5,0 -PRODUCTVERSION 0,2,5,0 +FILEVERSION 0,2,6,0 +PRODUCTVERSION 0,2,6,0 FILEFLAGSMASK VS_FF_PRERELEASE FILEOS VOS_NT FILETYPE VFT_DLL @@ -101,12 +101,12 @@ BEGIN BEGIN VALUE "CompanyName", "Datadog" VALUE "FileDescription", "Continuous Profiler for .NET Applications" - VALUE "FileVersion", "0.2.5.0" + VALUE "FileVersion", "0.2.6.0" VALUE "InternalName", "Native Profiler Engine" VALUE "LegalCopyright", "(c) Datadog 2020-2022" VALUE "OriginalFilename", "Datadog.Profiler.Native.dll" VALUE "ProductName", "Continuous Profiler for .NET Applications" - VALUE "ProductVersion", "0.2.5.0" + VALUE "ProductVersion", "0.2.6.0" END END BLOCK "VarFileInfo" diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native/dd_profiler_version.h b/profiler/src/ProfilerEngine/Datadog.Profiler.Native/dd_profiler_version.h index 014a43675..5a4f0fd94 100644 --- a/profiler/src/ProfilerEngine/Datadog.Profiler.Native/dd_profiler_version.h +++ b/profiler/src/ProfilerEngine/Datadog.Profiler.Native/dd_profiler_version.h @@ -3,7 +3,7 @@ #pragma once -constexpr auto PROFILER_VERSION = "0.2.5"; +constexpr auto PROFILER_VERSION = "0.2.6"; // The beta revision is temporary constexpr auto PROFILER_BETA_REVISION = "1"; diff --git a/profiler/src/ProfilerEngine/ProductVersion.props b/profiler/src/ProfilerEngine/ProductVersion.props index 8e2d98f20..94f7cd2c8 100644 --- a/profiler/src/ProfilerEngine/ProductVersion.props +++ b/profiler/src/ProfilerEngine/ProductVersion.props @@ -6,7 +6,7 @@ - 0.2.5 + 0.2.6 1 diff --git a/shared/src/azure-site-extension/Azure.Site.Extension.nuspec b/shared/src/azure-site-extension/Azure.Site.Extension.nuspec index d757da4f0..8a866e344 100644 --- a/shared/src/azure-site-extension/Azure.Site.Extension.nuspec +++ b/shared/src/azure-site-extension/Azure.Site.Extension.nuspec @@ -2,7 +2,7 @@ SignalFx.NET.Tracing.Azure.Site.Extension - 0.2.5.0 + 0.2.6.0 SignalFx .NET Tracing SignalFx icon.png diff --git a/shared/src/azure-site-extension/applicationHost.xdt b/shared/src/azure-site-extension/applicationHost.xdt index c31503901..2c7036228 100644 --- a/shared/src/azure-site-extension/applicationHost.xdt +++ b/shared/src/azure-site-extension/applicationHost.xdt @@ -25,17 +25,17 @@ - - - + + + - - + + - - + + diff --git a/shared/src/azure-site-extension/install.cmd b/shared/src/azure-site-extension/install.cmd index 9793785ab..8d8fa69ac 100644 --- a/shared/src/azure-site-extension/install.cmd +++ b/shared/src/azure-site-extension/install.cmd @@ -8,7 +8,7 @@ echo Extension directory is %extensionBaseDir% echo Site root directory is %siteHome% REM Create version specific tracer directory -SET tracerDir=%siteHome%\signalfx\tracing\v0.2.5 +SET tracerDir=%siteHome%\signalfx\tracing\v0.2.6 if not exist %tracerDir% mkdir %tracerDir% REM Copy tracer to version specific directory diff --git a/shared/src/msi-installer/WindowsInstaller.wixproj b/shared/src/msi-installer/WindowsInstaller.wixproj index b5a03a3a3..fb0b882d1 100644 --- a/shared/src/msi-installer/WindowsInstaller.wixproj +++ b/shared/src/msi-installer/WindowsInstaller.wixproj @@ -17,11 +17,11 @@ obj\$(Configuration)\$(Platform)\ True false - datadog-dotnet-apm-0.2.5-$(Platform) + datadog-dotnet-apm-0.2.6-$(Platform) $(MSBuildThisFileDirectory)..\..\bin\monitoring-home $(MSBuildThisFileDirectory)..\bin\windows-tracer-home $(MSBuildThisFileDirectory)..\bin\DDProf-Deploy - InstallerVersion=0.2.5;MonitoringHomeDirectory=$(MonitoringHomeDirectory);TracerHomeDirectory=$(TracerHomeDirectory);LibDdwafDirectory=$(LibDdwafDirectory);ProfilerHomeDirectory=$(ProfilerHomeDirectory) + InstallerVersion=0.2.6;MonitoringHomeDirectory=$(MonitoringHomeDirectory);TracerHomeDirectory=$(TracerHomeDirectory);LibDdwafDirectory=$(LibDdwafDirectory);ProfilerHomeDirectory=$(ProfilerHomeDirectory) $(DefineConstants);Debug diff --git a/tracer/build/_build/Build.cs b/tracer/build/_build/Build.cs index 5e97daae1..a7562b845 100644 --- a/tracer/build/_build/Build.cs +++ b/tracer/build/_build/Build.cs @@ -65,7 +65,7 @@ partial class Build : NukeBuild readonly bool IsAlpine = false; [Parameter("The current version of the source and build")] - readonly string Version = "0.2.5"; + readonly string Version = "0.2.6"; [Parameter("Whether the current build version is a prerelease(for packaging purposes)")] readonly bool IsPrerelease = false; diff --git a/tracer/samples/ConsoleApp/Alpine3.10.dockerfile b/tracer/samples/ConsoleApp/Alpine3.10.dockerfile index d0b11aba8..dd4a2dea3 100644 --- a/tracer/samples/ConsoleApp/Alpine3.10.dockerfile +++ b/tracer/samples/ConsoleApp/Alpine3.10.dockerfile @@ -16,7 +16,7 @@ COPY --from=build /app/out . # Set up Datadog APM RUN apk --no-cache update && apk add curl -ARG TRACER_VERSION=0.2.5 +ARG TRACER_VERSION=0.2.6 RUN mkdir -p /var/log/signalfx RUN mkdir -p /opt/signalfx RUN curl -L https://github.com/signalfx/signalfx-dotnet-tracing/releases/download/v${TRACER_VERSION}/signalfx-dotnet-tracing-${TRACER_VERSION}-musl.tar.gz \ diff --git a/tracer/samples/ConsoleApp/Alpine3.9.dockerfile b/tracer/samples/ConsoleApp/Alpine3.9.dockerfile index 886c4f8f8..a8db7b361 100644 --- a/tracer/samples/ConsoleApp/Alpine3.9.dockerfile +++ b/tracer/samples/ConsoleApp/Alpine3.9.dockerfile @@ -16,7 +16,7 @@ COPY --from=build /app/out . # Set up Datadog APM RUN apk --no-cache update && apk add curl -ARG TRACER_VERSION=0.2.5 +ARG TRACER_VERSION=0.2.6 RUN mkdir -p /var/log/signalfx RUN mkdir -p /opt/signalfx RUN curl -L https://github.com/signalfx/signalfx-dotnet-tracing/releases/download/v${TRACER_VERSION}/signalfx-dotnet-tracing-${TRACER_VERSION}-musl.tar.gz \ diff --git a/tracer/samples/ConsoleApp/Debian.dockerfile b/tracer/samples/ConsoleApp/Debian.dockerfile index 5de6ab728..1f0f90228 100644 --- a/tracer/samples/ConsoleApp/Debian.dockerfile +++ b/tracer/samples/ConsoleApp/Debian.dockerfile @@ -15,7 +15,7 @@ WORKDIR /app COPY --from=build /app/out . # Set up Datadog APM -ARG TRACER_VERSION=0.2.5 +ARG TRACER_VERSION=0.2.6 RUN mkdir -p /var/log/signalfx RUN mkdir -p /opt/signalfx RUN curl -LO https://github.com/signalfx/signalfx-dotnet-tracing/releases/download/v${TRACER_VERSION}/signalfx-dotnet-tracing_${TRACER_VERSION}_amd64.deb diff --git a/tracer/samples/WindowsContainer/Dockerfile b/tracer/samples/WindowsContainer/Dockerfile index d729d48d3..8fc3e3ede 100644 --- a/tracer/samples/WindowsContainer/Dockerfile +++ b/tracer/samples/WindowsContainer/Dockerfile @@ -6,7 +6,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:5.0-windowsservercore-ltsc2019 AS base WORKDIR /app -ARG TRACER_VERSION=0.2.5 +ARG TRACER_VERSION=0.2.6 ENV SIGNALFX_TRACER_VERSION=$TRACER_VERSION ENV ASPNETCORE_URLS=http://*.80 diff --git a/tracer/src/Datadog.Monitoring.Distribution/Datadog.Monitoring.Distribution.csproj b/tracer/src/Datadog.Monitoring.Distribution/Datadog.Monitoring.Distribution.csproj index 33d4ec922..f263aa92b 100644 --- a/tracer/src/Datadog.Monitoring.Distribution/Datadog.Monitoring.Distribution.csproj +++ b/tracer/src/Datadog.Monitoring.Distribution/Datadog.Monitoring.Distribution.csproj @@ -1,7 +1,7 @@ - 0.2.5 + 0.2.6 $(Version)-beta01 Datadog APM Auto-instrumentation Assets Auto-instrumentation assets for Datadog APM diff --git a/tracer/src/Datadog.Trace.AspNet/Datadog.Trace.AspNet.csproj b/tracer/src/Datadog.Trace.AspNet/Datadog.Trace.AspNet.csproj index fb1b0653c..e2046cefa 100644 --- a/tracer/src/Datadog.Trace.AspNet/Datadog.Trace.AspNet.csproj +++ b/tracer/src/Datadog.Trace.AspNet/Datadog.Trace.AspNet.csproj @@ -2,7 +2,7 @@ net461 - 0.2.5 + 0.2.6 SignalFx.Tracing.AspNet false diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj b/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj index ddb3d9f4b..75856e913 100644 --- a/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj +++ b/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj @@ -7,7 +7,7 @@ SignalFx.Tracing.ClrProfiler.Managed.Loader - 0.2.5 + 0.2.6 false diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs b/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs index 27e366d43..ca68c4f2c 100644 --- a/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs +++ b/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs @@ -16,7 +16,7 @@ namespace Datadog.Trace.ClrProfiler.Managed.Loader /// public partial class Startup { - private const string AssemblyName = "SignalFx.Tracing, Version=0.2.5.0, Culture=neutral, PublicKeyToken=e43a27c2023d388a"; + private const string AssemblyName = "SignalFx.Tracing, Version=0.2.6.0, Culture=neutral, PublicKeyToken=e43a27c2023d388a"; private const string AzureAppServicesKey = "SIGNALFX_AZURE_APP_SERVICES"; private const string AasCustomTracingKey = "SIGNALFX_AAS_ENABLE_CUSTOM_TRACING"; private const string AasCustomMetricsKey = "SIGNALFX_AAS_ENABLE_CUSTOM_METRICS"; diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt b/tracer/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt index b344f4496..196b3908a 100644 --- a/tracer/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt +++ b/tracer/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_policy(SET CMP0015 NEW) # Project definition # ****************************************************** -project("SignalFx.Tracing.ClrProfiler.Native" VERSION 0.2.5) +project("SignalFx.Tracing.ClrProfiler.Native" VERSION 0.2.6) # ****************************************************** # Environment detection diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Native/Resource.rc b/tracer/src/Datadog.Trace.ClrProfiler.Native/Resource.rc index 78b700fc9..dd6543466 100644 --- a/tracer/src/Datadog.Trace.ClrProfiler.Native/Resource.rc +++ b/tracer/src/Datadog.Trace.ClrProfiler.Native/Resource.rc @@ -49,8 +49,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,2,5,0 - PRODUCTVERSION 0,2,5,0 + FILEVERSION 0,2,6,0 + PRODUCTVERSION 0,2,6,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -67,12 +67,12 @@ BEGIN BEGIN VALUE "CompanyName", "SignalFx" VALUE "FileDescription", "SignalFx CLR Profiler" - VALUE "FileVersion", "0.2.5.0" + VALUE "FileVersion", "0.2.6.0" VALUE "InternalName", "SignalFx.Tracing.ClrProfiler.Native.DLL" VALUE "LegalCopyright", "Copyright (C) 2021-2023" VALUE "OriginalFilename", "SignalFx.Tracing.ClrProfiler.Native.DLL" VALUE "ProductName", "SignalFx .NET Tracing" - VALUE "ProductVersion", "0.2.5" + VALUE "ProductVersion", "0.2.6" END END BLOCK "VarFileInfo" diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Native/dd_profiler_constants.h b/tracer/src/Datadog.Trace.ClrProfiler.Native/dd_profiler_constants.h index b0cfba0e6..145c9284a 100644 --- a/tracer/src/Datadog.Trace.ClrProfiler.Native/dd_profiler_constants.h +++ b/tracer/src/Datadog.Trace.ClrProfiler.Native/dd_profiler_constants.h @@ -83,7 +83,7 @@ const shared::WSTRING system_private_corelib_assemblyName = WStr("System.Private const shared::WSTRING datadog_trace_clrprofiler_managed_loader_assemblyName = WStr("SignalFx.Tracing.ClrProfiler.Managed.Loader"); const shared::WSTRING managed_profiler_full_assembly_version = - WStr("SignalFx.Tracing, Version=0.2.5.0, Culture=neutral, PublicKeyToken=e43a27c2023d388a"); + WStr("SignalFx.Tracing, Version=0.2.6.0, Culture=neutral, PublicKeyToken=e43a27c2023d388a"); const shared::WSTRING managed_profiler_name = WStr("SignalFx.Tracing"); @@ -118,7 +118,7 @@ const AssemblyProperty managed_profiler_assembly_property = AssemblyProperty( 123, 102, 42, 57, 219, 122, 95, 191, 59, 10, 120, 157, 167, 170, 1, 81, 183, 182, 51, 111, 204, 130, 205, 122, 20, 157, 247, 246, 102, 245, 57, 108, 141, 233, 44, 166, 68, 215, 162, 209}, 160, 32772, 1) - .WithVersion(0, 2, 5, 0); + .WithVersion(0, 2, 6, 0); } // namespace trace diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Native/version.h b/tracer/src/Datadog.Trace.ClrProfiler.Native/version.h index f4177c1bf..237398ed8 100644 --- a/tracer/src/Datadog.Trace.ClrProfiler.Native/version.h +++ b/tracer/src/Datadog.Trace.ClrProfiler.Native/version.h @@ -1,3 +1,3 @@ #pragma once -constexpr auto PROFILER_VERSION = "0.2.5"; +constexpr auto PROFILER_VERSION = "0.2.6"; diff --git a/tracer/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj b/tracer/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj index 3e5134a2f..45637d8ee 100644 --- a/tracer/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj +++ b/tracer/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj @@ -1,7 +1,7 @@ - 0.2.5 + 0.2.6 SignalFx.Tracing.MSBuild diff --git a/tracer/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj b/tracer/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj index d3450a89e..a9e8e47a8 100644 --- a/tracer/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj +++ b/tracer/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj @@ -2,7 +2,7 @@ - 0.2.5 + 0.2.6 SignalFx Tracing OpenTracing Provides OpenTracing support for SignalFx Tracing SignalFx.Tracing.OpenTracing diff --git a/tracer/src/Datadog.Trace/Datadog.Trace.csproj b/tracer/src/Datadog.Trace/Datadog.Trace.csproj index 6d60ea8fe..64feb847b 100644 --- a/tracer/src/Datadog.Trace/Datadog.Trace.csproj +++ b/tracer/src/Datadog.Trace/Datadog.Trace.csproj @@ -2,7 +2,7 @@ - 0.2.5 + 0.2.6 SignalFx .NET Tracing SignalFx .NET Tracing library SignalFx.Tracing diff --git a/tracer/src/Datadog.Trace/Tracer.cs b/tracer/src/Datadog.Trace/Tracer.cs index d28e538f4..fc6411c9b 100644 --- a/tracer/src/Datadog.Trace/Tracer.cs +++ b/tracer/src/Datadog.Trace/Tracer.cs @@ -429,7 +429,7 @@ private static void RegisterGlobalTracer(Tracer instance) return; } - var signalFxOpenTracingAssembly = Assembly.Load(new AssemblyName("SignalFx.Tracing.OpenTracing, Version=0.2.5.0, Culture=neutral, PublicKeyToken=e43a27c2023d388a")); + var signalFxOpenTracingAssembly = Assembly.Load(new AssemblyName("SignalFx.Tracing.OpenTracing, Version=0.2.6.0, Culture=neutral, PublicKeyToken=e43a27c2023d388a")); var openTracingTracerFactoryType = signalFxOpenTracingAssembly.GetType("Datadog.Trace.OpenTracing.OpenTracingTracerFactory"); var methodInfo = openTracingTracerFactoryType.GetMethod("RegisterGlobalTracerIfAbsent"); object[] args = { instance }; diff --git a/tracer/src/Datadog.Trace/TracerConstants.cs b/tracer/src/Datadog.Trace/TracerConstants.cs index 54e1e16f5..44bbe5ac1 100644 --- a/tracer/src/Datadog.Trace/TracerConstants.cs +++ b/tracer/src/Datadog.Trace/TracerConstants.cs @@ -17,6 +17,6 @@ internal static class TracerConstants /// public const ulong MaxTraceId = 9_223_372_036_854_775_807; - public static readonly string AssemblyVersion = "0.2.5.0"; + public static readonly string AssemblyVersion = "0.2.6.0"; } } diff --git a/tracer/src/WindowsInstaller/WindowsInstaller.wixproj b/tracer/src/WindowsInstaller/WindowsInstaller.wixproj index 2413f8103..37d510fbe 100644 --- a/tracer/src/WindowsInstaller/WindowsInstaller.wixproj +++ b/tracer/src/WindowsInstaller/WindowsInstaller.wixproj @@ -17,9 +17,9 @@ obj\$(Configuration)\$(Platform)\ True false - signalfx-dotnet-tracing-0.2.5-$(Platform) + signalfx-dotnet-tracing-0.2.6-$(Platform) $(MSBuildThisFileDirectory)..\bin\dd-tracer-home - InstallerVersion=0.2.5;TracerHomeDirectory=$(TracerHomeDirectory) + InstallerVersion=0.2.6;TracerHomeDirectory=$(TracerHomeDirectory) $(DefineConstants);Debug diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/MsTestV2Tests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/MsTestV2Tests.cs index 77f622eab..08f635339 100644 --- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/MsTestV2Tests.cs +++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/MsTestV2Tests.cs @@ -85,7 +85,7 @@ public void SubmitTraces(string packageVersion) AssertTargetSpanEqual(targetSpan, "signalfx.tracing.library", "dotnet-tracing"); // check the SignalFx library version - AssertTargetSpanEqual(targetSpan, "signalfx.tracing.version", "0.2.5.0"); + AssertTargetSpanEqual(targetSpan, "signalfx.tracing.version", "0.2.6.0"); // checks the runtime id tag AssertTargetSpanExists(targetSpan, Tags.RuntimeId); diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/NUnitTests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/NUnitTests.cs index 0fa83b70d..9f0e6672b 100644 --- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/NUnitTests.cs +++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/NUnitTests.cs @@ -100,7 +100,7 @@ public void SubmitTraces(string packageVersion) AssertTargetSpanEqual(targetSpan, "signalfx.tracing.library", "dotnet-tracing"); // check the SignalFx library version - AssertTargetSpanEqual(targetSpan, "signalfx.tracing.version", "0.2.5.0"); + AssertTargetSpanEqual(targetSpan, "signalfx.tracing.version", "0.2.6.0"); // checks the runtime id tag AssertTargetSpanExists(targetSpan, Tags.RuntimeId); diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/XUnitTests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/XUnitTests.cs index 6dd26a800..1c058acd4 100644 --- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/XUnitTests.cs +++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/XUnitTests.cs @@ -93,7 +93,7 @@ public void SubmitTraces(string packageVersion) AssertTargetSpanEqual(targetSpan, "signalfx.tracing.library", "dotnet-tracing"); // check the SignalFx library version - AssertTargetSpanEqual(targetSpan, "signalfx.tracing.version", "0.2.5.0"); + AssertTargetSpanEqual(targetSpan, "signalfx.tracing.version", "0.2.6.0"); // checks the origin tag CheckOriginTag(targetSpan); diff --git a/tracer/tools/PipelineMonitor/PipelineMonitor.csproj b/tracer/tools/PipelineMonitor/PipelineMonitor.csproj index d8ac59b08..558436aed 100644 --- a/tracer/tools/PipelineMonitor/PipelineMonitor.csproj +++ b/tracer/tools/PipelineMonitor/PipelineMonitor.csproj @@ -8,7 +8,7 @@ - +