diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt index 8b77f64fda6d..7c29182210e5 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 2.5.0) +project("Datadog.AutoInstrumentation.Profiler.Native.Linux" VERSION 2.5.1) # ****************************************************** # Compiler options diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Resource.rc b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Resource.rc index fa0386d085c3..fad37546735c 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 2,5,0,0 -PRODUCTVERSION 2,5,0,0 +FILEVERSION 2,5,1,0 +PRODUCTVERSION 2,5,1,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", "2.5.0.0" + VALUE "FileVersion", "2.5.1.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", "2.5.0.0" + VALUE "ProductVersion", "2.5.1.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 d745496d039e..4f7629efd1cf 100644 --- a/profiler/src/ProfilerEngine/Datadog.Profiler.Native/dd_profiler_version.h +++ b/profiler/src/ProfilerEngine/Datadog.Profiler.Native/dd_profiler_version.h @@ -3,4 +3,4 @@ #pragma once -constexpr auto PROFILER_VERSION = "2.5.0"; \ No newline at end of file +constexpr auto PROFILER_VERSION = "2.5.1"; \ No newline at end of file diff --git a/profiler/src/ProfilerEngine/ProductVersion.props b/profiler/src/ProfilerEngine/ProductVersion.props index ea36e50ec9d2..a87ca99d12e8 100644 --- a/profiler/src/ProfilerEngine/ProductVersion.props +++ b/profiler/src/ProfilerEngine/ProductVersion.props @@ -8,7 +8,7 @@ - 2.5.0 + 2.5.1 1 diff --git a/shared/src/msi-installer/WindowsInstaller.wixproj b/shared/src/msi-installer/WindowsInstaller.wixproj index c75b41a30250..1190adde9414 100644 --- a/shared/src/msi-installer/WindowsInstaller.wixproj +++ b/shared/src/msi-installer/WindowsInstaller.wixproj @@ -17,13 +17,13 @@ obj\$(Configuration)\$(Platform)\ True false - datadog-dotnet-apm-2.5.0-$(Platform) + datadog-dotnet-apm-2.5.1-$(Platform) $(OutputName)-profiler-beta $(OutputName)-$(BetaMsiSuffix) $(MSBuildThisFileDirectory)..\..\bin\monitoring-home $(MSBuildThisFileDirectory)..\bin\windows-tracer-home $(MSBuildThisFileDirectory)..\bin\DDProf-Deploy - InstallerVersion=2.5.0;MonitoringHomeDirectory=$(MonitoringHomeDirectory);TracerHomeDirectory=$(TracerHomeDirectory);LibDdwafDirectory=$(LibDdwafDirectory);ProfilerHomeDirectory=$(ProfilerHomeDirectory) + InstallerVersion=2.5.1;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 181d1cb152a9..caecd68726f3 100644 --- a/tracer/build/_build/Build.cs +++ b/tracer/build/_build/Build.cs @@ -63,7 +63,7 @@ partial class Build : NukeBuild readonly bool IsAlpine = false; [Parameter("The build version. Default is latest")] - readonly string Version = "2.5.0"; + readonly string Version = "2.5.1"; [Parameter("Whether the build version is a prerelease(for packaging purposes). Default is latest")] readonly bool IsPrerelease = false; diff --git a/tracer/samples/AutomaticTraceIdInjection/Log4NetExample/Log4NetExample.csproj b/tracer/samples/AutomaticTraceIdInjection/Log4NetExample/Log4NetExample.csproj index 5fa5cd4cb637..f8f3de0df277 100644 --- a/tracer/samples/AutomaticTraceIdInjection/Log4NetExample/Log4NetExample.csproj +++ b/tracer/samples/AutomaticTraceIdInjection/Log4NetExample/Log4NetExample.csproj @@ -6,7 +6,7 @@ - + diff --git a/tracer/samples/AutomaticTraceIdInjection/MicrosoftExtensionsExample/MicrosoftExtensionsExample.csproj b/tracer/samples/AutomaticTraceIdInjection/MicrosoftExtensionsExample/MicrosoftExtensionsExample.csproj index 6a84a5b851c1..fa4c7aa9f710 100644 --- a/tracer/samples/AutomaticTraceIdInjection/MicrosoftExtensionsExample/MicrosoftExtensionsExample.csproj +++ b/tracer/samples/AutomaticTraceIdInjection/MicrosoftExtensionsExample/MicrosoftExtensionsExample.csproj @@ -6,7 +6,7 @@ - + diff --git a/tracer/samples/AutomaticTraceIdInjection/NLog40Example/NLog40Example.csproj b/tracer/samples/AutomaticTraceIdInjection/NLog40Example/NLog40Example.csproj index 2307a73ff927..5776aa7ba117 100644 --- a/tracer/samples/AutomaticTraceIdInjection/NLog40Example/NLog40Example.csproj +++ b/tracer/samples/AutomaticTraceIdInjection/NLog40Example/NLog40Example.csproj @@ -6,7 +6,7 @@ - + diff --git a/tracer/samples/AutomaticTraceIdInjection/NLog45Example/NLog45Example.csproj b/tracer/samples/AutomaticTraceIdInjection/NLog45Example/NLog45Example.csproj index 84d49ba43271..3af74911d6e9 100644 --- a/tracer/samples/AutomaticTraceIdInjection/NLog45Example/NLog45Example.csproj +++ b/tracer/samples/AutomaticTraceIdInjection/NLog45Example/NLog45Example.csproj @@ -6,7 +6,7 @@ - + diff --git a/tracer/samples/AutomaticTraceIdInjection/NLog46Example/NLog46Example.csproj b/tracer/samples/AutomaticTraceIdInjection/NLog46Example/NLog46Example.csproj index c9d761de8790..65f31584c86f 100644 --- a/tracer/samples/AutomaticTraceIdInjection/NLog46Example/NLog46Example.csproj +++ b/tracer/samples/AutomaticTraceIdInjection/NLog46Example/NLog46Example.csproj @@ -6,7 +6,7 @@ - + diff --git a/tracer/samples/AutomaticTraceIdInjection/SerilogExample/SerilogExample.csproj b/tracer/samples/AutomaticTraceIdInjection/SerilogExample/SerilogExample.csproj index e157a7cccf17..4bbd51a8a6e2 100644 --- a/tracer/samples/AutomaticTraceIdInjection/SerilogExample/SerilogExample.csproj +++ b/tracer/samples/AutomaticTraceIdInjection/SerilogExample/SerilogExample.csproj @@ -6,7 +6,7 @@ - + diff --git a/tracer/samples/ConsoleApp/Alpine3.10.dockerfile b/tracer/samples/ConsoleApp/Alpine3.10.dockerfile index d12742a32a02..390545ec9d67 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=2.5.0 +ARG TRACER_VERSION=2.5.1 RUN mkdir -p /var/log/datadog RUN mkdir -p /opt/datadog RUN curl -L https://github.com/DataDog/dd-trace-dotnet/releases/download/v${TRACER_VERSION}/datadog-dotnet-apm-${TRACER_VERSION}-musl.tar.gz \ diff --git a/tracer/samples/ConsoleApp/Alpine3.9.dockerfile b/tracer/samples/ConsoleApp/Alpine3.9.dockerfile index e08c258345db..ccc43a9beb56 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=2.5.0 +ARG TRACER_VERSION=2.5.1 RUN mkdir -p /var/log/datadog RUN mkdir -p /opt/datadog RUN curl -L https://github.com/DataDog/dd-trace-dotnet/releases/download/v${TRACER_VERSION}/datadog-dotnet-apm-${TRACER_VERSION}-musl.tar.gz \ diff --git a/tracer/samples/ConsoleApp/Debian.dockerfile b/tracer/samples/ConsoleApp/Debian.dockerfile index 5b37a9d03800..1d8e42366954 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=2.5.0 +ARG TRACER_VERSION=2.5.1 RUN mkdir -p /var/log/datadog RUN mkdir -p /opt/datadog RUN curl -LO https://github.com/DataDog/dd-trace-dotnet/releases/download/v${TRACER_VERSION}/datadog-dotnet-apm_${TRACER_VERSION}_amd64.deb diff --git a/tracer/samples/WindowsContainer/Dockerfile b/tracer/samples/WindowsContainer/Dockerfile index 87a849d260a6..bd178729fa65 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=2.5.0 +ARG TRACER_VERSION=2.5.1 ENV DD_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 f2927cad1b72..4427eb8b7bef 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 @@ - 2.5.0 + 2.5.1 $(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 97d4d91fd59f..76450f150083 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 - 2.5.0 + 2.5.1 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 859b16ad39a2..70a9ed951ea2 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 @@ -6,7 +6,7 @@ ..\bin\ProfilerResources\ - 2.5.0 + 2.5.1 false diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs b/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs index 55833a56452d..dad2784c0c87 100644 --- a/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs +++ b/tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs @@ -13,7 +13,7 @@ namespace Datadog.Trace.ClrProfiler.Managed.Loader /// public partial class Startup { - private const string AssemblyName = "Datadog.Trace, Version=2.5.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb"; + private const string AssemblyName = "Datadog.Trace, Version=2.5.1.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb"; private const string AzureAppServicesKey = "DD_AZURE_APP_SERVICES"; private const string AasCustomTracingKey = "DD_AAS_ENABLE_CUSTOM_TRACING"; private const string AasCustomMetricsKey = "DD_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 9e7e9246380d..52e776c29475 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("Datadog.Trace.ClrProfiler.Native" VERSION 2.5.0) +project("Datadog.Trace.ClrProfiler.Native" VERSION 2.5.1) # ****************************************************** # Environment detection diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Native/Resource.rc b/tracer/src/Datadog.Trace.ClrProfiler.Native/Resource.rc index fe2e5c91c79a..ac862eb2a2a8 100644 --- a/tracer/src/Datadog.Trace.ClrProfiler.Native/Resource.rc +++ b/tracer/src/Datadog.Trace.ClrProfiler.Native/Resource.rc @@ -50,8 +50,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,0,0 - PRODUCTVERSION 2,5,0,0 + FILEVERSION 2,5,1,0 + PRODUCTVERSION 2,5,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -68,12 +68,12 @@ BEGIN BEGIN VALUE "CompanyName", "Datadog, Inc." VALUE "FileDescription", "Datadog CLR Profiler" - VALUE "FileVersion", "2.5.0.0" + VALUE "FileVersion", "2.5.1.0" VALUE "InternalName", "Datadog.Trace.ClrProfiler.Native.DLL" VALUE "LegalCopyright", "Copyright 2017 Datadog, Inc." VALUE "OriginalFilename", "Datadog.Trace.ClrProfiler.Native.DLL" VALUE "ProductName", "Datadog .NET Tracer" - VALUE "ProductVersion", "2.5.0" + VALUE "ProductVersion", "2.5.1" 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 75b043bd5cc9..389df7e004e0 100644 --- a/tracer/src/Datadog.Trace.ClrProfiler.Native/dd_profiler_constants.h +++ b/tracer/src/Datadog.Trace.ClrProfiler.Native/dd_profiler_constants.h @@ -80,7 +80,7 @@ const shared::WSTRING system_private_corelib_assemblyName = WStr("System.Private const shared::WSTRING datadog_trace_clrprofiler_managed_loader_assemblyName = WStr("Datadog.Trace.ClrProfiler.Managed.Loader"); const shared::WSTRING managed_profiler_full_assembly_version = - WStr("Datadog.Trace, Version=2.5.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb"); + WStr("Datadog.Trace, Version=2.5.1.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb"); const shared::WSTRING managed_profiler_name = WStr("Datadog.Trace"); @@ -111,7 +111,7 @@ const AssemblyProperty managed_profiler_assembly_property = AssemblyProperty( 49, 105, 236, 40, 21, 176, 12, 238, 238, 204, 141, 90, 27, 244, 61, 182, 125, 41, 97, 163, 233, 190, 161, 57, 127, 4, 62, 192, 116, 145, 112, 150, 73, 37, 47, 85, 101, 183, 86, 197}, 160, 32772, 1) - .WithVersion(2, 5, 0, 0); + .WithVersion(2, 5, 1, 0); } // namespace trace diff --git a/tracer/src/Datadog.Trace.ClrProfiler.Native/version.h b/tracer/src/Datadog.Trace.ClrProfiler.Native/version.h index 306c73ba2107..048cae9b97b9 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 = "2.5.0"; +constexpr auto PROFILER_VERSION = "2.5.1"; diff --git a/tracer/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj b/tracer/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj index 454c780d8325..d19f8f65eef2 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 @@ - 2.5.0 + 2.5.1 - 2.5.0 + 2.5.1 Datadog APM - OpenTracing Provides OpenTracing support for Datadog APM $(PackageTags);OpenTracing diff --git a/tracer/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.csproj b/tracer/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.csproj index c6fbb0db7dbe..a84b372eadea 100644 --- a/tracer/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.csproj +++ b/tracer/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.csproj @@ -1,7 +1,7 @@ - 2.5.0 + 2.5.1 Datadog APM Auto-instrumentation Runner Copyright 2020 Datadog, Inc. Auto-instrumentation dotnet global tool for Datadog APM diff --git a/tracer/src/Datadog.Trace/Datadog.Trace.csproj b/tracer/src/Datadog.Trace/Datadog.Trace.csproj index eb13be92a096..7212adfdf82d 100644 --- a/tracer/src/Datadog.Trace/Datadog.Trace.csproj +++ b/tracer/src/Datadog.Trace/Datadog.Trace.csproj @@ -2,7 +2,7 @@ - 2.5.0 + 2.5.1 Datadog APM Instrumentation library for Datadog APM. true diff --git a/tracer/src/Datadog.Trace/TracerConstants.cs b/tracer/src/Datadog.Trace/TracerConstants.cs index 304a1d42827d..da1d76b6ff94 100644 --- a/tracer/src/Datadog.Trace/TracerConstants.cs +++ b/tracer/src/Datadog.Trace/TracerConstants.cs @@ -14,6 +14,6 @@ internal static class TracerConstants /// public const ulong MaxTraceId = 9_223_372_036_854_775_807; - public const string AssemblyVersion = "2.5.0.0"; + public const string AssemblyVersion = "2.5.1.0"; } } diff --git a/tracer/src/WindowsInstaller/WindowsInstaller.wixproj b/tracer/src/WindowsInstaller/WindowsInstaller.wixproj index 93c37f059114..9fe5db96313c 100644 --- a/tracer/src/WindowsInstaller/WindowsInstaller.wixproj +++ b/tracer/src/WindowsInstaller/WindowsInstaller.wixproj @@ -17,9 +17,9 @@ obj\$(Configuration)\$(Platform)\ True false - datadog-dotnet-apm-2.5.0-$(Platform) + datadog-dotnet-apm-2.5.1-$(Platform) $(MSBuildThisFileDirectory)..\bin\windows-tracer-home - InstallerVersion=2.5.0;TracerHomeDirectory=$(TracerHomeDirectory);LibDdwafDirectory=$(LibDdwafDirectory) + InstallerVersion=2.5.1;TracerHomeDirectory=$(TracerHomeDirectory);LibDdwafDirectory=$(LibDdwafDirectory) $(DefineConstants);Debug diff --git a/tracer/test/test-applications/regression/AutomapperTest/Dockerfile b/tracer/test/test-applications/regression/AutomapperTest/Dockerfile index b40101ab1a17..66d241798397 100644 --- a/tracer/test/test-applications/regression/AutomapperTest/Dockerfile +++ b/tracer/test/test-applications/regression/AutomapperTest/Dockerfile @@ -1,5 +1,5 @@ FROM mcr.microsoft.com/dotnet/core/runtime:2.1-stretch-slim AS base -ARG TRACER_VERSION=2.5.0 +ARG TRACER_VERSION=2.5.1 RUN mkdir -p /opt/datadog RUN mkdir -p /var/log/datadog/dotnet RUN curl -L https://github.com/DataDog/dd-trace-dotnet/releases/download/v$TRACER_VERSION/datadog-dotnet-apm-$TRACER_VERSION.tar.gz | tar xzf - -C /opt/datadog