[Version Bump] 1.28.3-prerelease (#1688)

Co-authored-by: zacharycmontoya <[email protected]>
DataDog · Aug 16, 2021 · 8278f55 · 8278f55
1 parent 0e6dadf
commit 8278f55
Show file tree

Hide file tree

Showing 27 changed files with 392 additions and 386 deletions.
diff --git a/build/_build/Build.cs b/build/_build/Build.cs
@@ -51,10 +51,10 @@ partial class Build : NukeBuild
     readonly bool IsAlpine = false;
 
     [Parameter("The build version. Default is latest")]
-    readonly string Version = "1.28.2";
+    readonly string Version = "1.28.3";
 
     [Parameter("Whether the build version is a prerelease(for packaging purposes). Default is latest")]
-    readonly bool IsPrerelease = false;
+    readonly bool IsPrerelease = true;
 
     [Parameter("Prints the available drive space before executing each target. Defaults to false")]
     readonly bool PrintDriveSpace = false;

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,5 +1,38 @@
 # Datadog .NET Tracer (`dd-trace-dotnet`) Release Notes
 
+## [Release 1.28.3-prerelease](https://github.com/DataDog/dd-trace-dotnet/releases/tag/v1.28.3-prerelease)
+
+## Changes
+* Adds Datadog.AutoInstrumentation.NativeLoader (#1577)
+* The v0 version of App Sec (#1647)
+* Read performance counter values from environment variables in AAS (#1651)
+* Improve error handling for performance counters (#1652)
+* Add instrumentation for Begin/EndGetResponse to WebRequest (#1658)
+* Cache native AssemblyReference instances (#1665)
+* Use link shortener for IIS permissions (#1666)
+* Native profiler Initialize callback optimization (#1672)
+* Update CI Visibility specification (#1682)
+
+## Fixes
+* Fixes native regex usage on non windows platforms. (#1662)
+
+## Build / Test
+* Merge auto-instrumentation code into Datadog.Trace.dll (#1443)
+* replace "minimal" solution with a solution filter (#1631)
+* Add support for a temporary NGEN pipeline (#1642)
+* Small build improvements (#1646)
+* Filter now applied to the samples when compiling (#1653)
+* Crank native profiler fix (#1655)
+* Reduce length of snapshot paths (#1657)
+* Update GitHub action release workflows (#1659)
+* Fixes crank pipeline on PR merge commits. (#1669)
+* Disable CallSite scenario from Throughput tests. (#1674)
+* Removes code for Callsite scenario from the throughput tests (#1679)
+* Add a custom test framework to monitor execution of unit tests in ducktyping library (#1680)
+* Add tests for changes to Datadog.Trace's Public API (#1681)
+
+[Changes since 1.28.2](https://github.com/DataDog/dd-trace-dotnet/compare/v1.28.2...v1.28.3-prerelease)
+
 ## [Release 1.28.2](https://github.com/DataDog/dd-trace-dotnet/releases/tag/v1.28.2)
 
 ## Changes

diff --git a/integrations.json b/integrations.json
diff --git a/samples/AutomaticTraceIdInjection/Log4NetExample/Log4NetExample.csproj b/samples/AutomaticTraceIdInjection/Log4NetExample/Log4NetExample.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Datadog.Trace" Version="1.28.2" />
+    <PackageReference Include="Datadog.Trace" Version="1.28.3-prerelease" />
     <PackageReference Include="log4net" Version="2.0.12" />
     <PackageReference Include="log4net.Ext.Json" Version="2.0.8.3" />
   </ItemGroup>

diff --git a/samples/AutomaticTraceIdInjection/NLog40Example/NLog40Example.csproj b/samples/AutomaticTraceIdInjection/NLog40Example/NLog40Example.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Datadog.Trace" Version="1.28.2" />
+    <PackageReference Include="Datadog.Trace" Version="1.28.3-prerelease" />
     <PackageReference Include="NLog" Version="4.0.0" />
   </ItemGroup>
 

diff --git a/samples/AutomaticTraceIdInjection/NLog45Example/NLog45Example.csproj b/samples/AutomaticTraceIdInjection/NLog45Example/NLog45Example.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Datadog.Trace" Version="1.28.2" />
+    <PackageReference Include="Datadog.Trace" Version="1.28.3-prerelease" />
     <PackageReference Include="NLog" Version="4.5.11" />
   </ItemGroup>
 

diff --git a/samples/AutomaticTraceIdInjection/NLog46Example/NLog46Example.csproj b/samples/AutomaticTraceIdInjection/NLog46Example/NLog46Example.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Datadog.Trace" Version="1.28.2" />
+    <PackageReference Include="Datadog.Trace" Version="1.28.3-prerelease" />
     <PackageReference Include="NLog" Version="4.6.7" />
   </ItemGroup>
 

diff --git a/samples/AutomaticTraceIdInjection/SerilogExample/SerilogExample.csproj b/samples/AutomaticTraceIdInjection/SerilogExample/SerilogExample.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Datadog.Trace" Version="1.28.2" />
+    <PackageReference Include="Datadog.Trace" Version="1.28.3-prerelease" />
     <PackageReference Include="Serilog" Version="2.9.0" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />

diff --git a/samples/ConsoleApp/Alpine3.10.dockerfile b/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=1.28.2
+ARG TRACER_VERSION=1.28.3
 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/samples/ConsoleApp/Alpine3.9.dockerfile b/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=1.28.2
+ARG TRACER_VERSION=1.28.3
 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/samples/ConsoleApp/Debian.dockerfile b/samples/ConsoleApp/Debian.dockerfile
@@ -15,7 +15,7 @@ WORKDIR /app
 COPY --from=build /app/out .
 
 # Set up Datadog APM
-ARG TRACER_VERSION=1.28.2
+ARG TRACER_VERSION=1.28.3
 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/samples/WindowsContainer/Dockerfile b/samples/WindowsContainer/Dockerfile
@@ -6,7 +6,7 @@
 FROM mcr.microsoft.com/dotnet/aspnet:5.0-windowsservercore-ltsc2019 AS base
 WORKDIR /app
 
-ARG TRACER_VERSION=1.28.2
+ARG TRACER_VERSION=1.28.3
 ENV DD_TRACER_VERSION=$TRACER_VERSION
 ENV ASPNETCORE_URLS=http://*.80
 

diff --git a/src/Datadog.Trace.AspNet/Datadog.Trace.AspNet.csproj b/src/Datadog.Trace.AspNet/Datadog.Trace.AspNet.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net45</TargetFrameworks>
-    <Version>1.28.2</Version>
+    <Version>1.28.3-prerelease</Version>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
   </PropertyGroup>
 

diff --git a/src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj b/src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj
@@ -6,7 +6,7 @@
     <OutputPath>..\bin\ProfilerResources\</OutputPath>
 
     <!-- NuGet -->
-    <Version>1.28.2</Version>
+    <Version>1.28.3-prerelease</Version>
 
     <!-- Hide warnings for EOL .NET Core targets (e.g. netcoreapp2.0) -->
     <CheckEolTargetFramework>false</CheckEolTargetFramework>

diff --git a/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs b/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs
@@ -39,7 +39,7 @@ private static void TryLoadManagedAssembly()
         {
             try
             {
-                var assembly = Assembly.Load("Datadog.Trace, Version=1.28.2.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");
+                var assembly = Assembly.Load("Datadog.Trace, Version=1.28.3.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");
 
                 if (assembly != null)
                 {

diff --git a/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt b/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt
@@ -5,7 +5,7 @@ cmake_policy(SET CMP0015 NEW)
 # Project definition
 # ******************************************************
 
-project("Datadog.Trace.ClrProfiler.Native" VERSION 1.28.2)
+project("Datadog.Trace.ClrProfiler.Native" VERSION 1.28.3)
 
 # ******************************************************
 # Environment detection

diff --git a/src/Datadog.Trace.ClrProfiler.Native/Resource.rc b/src/Datadog.Trace.ClrProfiler.Native/Resource.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,28,2,0
- PRODUCTVERSION 1,28,2,0
+ FILEVERSION 1,28,3,0
+ PRODUCTVERSION 1,28,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Datadog, Inc."
             VALUE "FileDescription", "Datadog CLR Profiler"
-            VALUE "FileVersion", "1.28.2.0"
+            VALUE "FileVersion", "1.28.3.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", "1.28.2"
+            VALUE "ProductVersion", "1.28.3"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/src/Datadog.Trace.ClrProfiler.Native/dd_profiler_constants.h b/src/Datadog.Trace.ClrProfiler.Native/dd_profiler_constants.h
@@ -65,7 +65,7 @@ const WSTRING skip_assemblies[]{WStr("mscorlib"),
                                 WStr("ISymWrapper")};
 
 const WSTRING managed_profiler_full_assembly_version =
-    WStr("Datadog.Trace, Version=1.28.2.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");
+    WStr("Datadog.Trace, Version=1.28.3.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");
 
 const WSTRING managed_profiler_name = WStr("Datadog.Trace");
 

diff --git a/src/Datadog.Trace.ClrProfiler.Native/version.h b/src/Datadog.Trace.ClrProfiler.Native/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-constexpr auto PROFILER_VERSION = "1.28.2";
+constexpr auto PROFILER_VERSION = "1.28.3";
diff --git a/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj b/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>1.28.2</Version>
+    <Version>1.28.3-prerelease</Version>
   </PropertyGroup>
 
   <!-- For VS testing purposes only, copy all implementation assemblies to the

diff --git a/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj b/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <!-- NuGet -->
-    <Version>1.28.2</Version>
+    <Version>1.28.3-prerelease</Version>
     <Title>Datadog APM - OpenTracing</Title>
     <Description>Provides OpenTracing support for Datadog APM</Description>
     <PackageTags>$(PackageTags);OpenTracing</PackageTags>

diff --git a/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.Standalone.csproj b/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.Standalone.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>1.28.2</Version>
+    <Version>1.28.3-prerelease</Version>
     <Title>Datadog APM Auto-instrumentation Runner</Title>
     <Copyright>Copyright 2020 Datadog, Inc.</Copyright>
     <OutputType>Exe</OutputType>

diff --git a/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.Tool.csproj b/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.Tool.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>1.28.2</Version>
+    <Version>1.28.3-prerelease</Version>
     <Title>Datadog APM Auto-instrumentation Runner</Title>
     <Copyright>Copyright 2020 Datadog, Inc.</Copyright>
     <Description>Auto-instrumentation dotnet global tool for Datadog APM</Description>

diff --git a/src/Datadog.Trace/Datadog.Trace.csproj b/src/Datadog.Trace/Datadog.Trace.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <!-- NuGet -->
-    <Version>1.28.2</Version>
+    <Version>1.28.3-prerelease</Version>
     <Title>Datadog APM</Title>
     <Description>Instrumentation library for Datadog APM.</Description>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>

diff --git a/src/Datadog.Trace/TracerConstants.cs b/src/Datadog.Trace/TracerConstants.cs
@@ -14,6 +14,6 @@ internal static class TracerConstants
         /// </summary>
         public const ulong MaxTraceId = 9_223_372_036_854_775_807;
 
-        public static readonly string AssemblyVersion = "1.28.2.0";
+        public static readonly string AssemblyVersion = "1.28.3.0";
     }
 }
diff --git a/src/WindowsInstaller/WindowsInstaller.wixproj b/src/WindowsInstaller/WindowsInstaller.wixproj
@@ -17,9 +17,9 @@
     <IntermediateOutputPath>obj\$(Configuration)\$(Platform)\</IntermediateOutputPath>
     <SuppressPdbOutput>True</SuppressPdbOutput>
     <DefineSolutionProperties>false</DefineSolutionProperties>
-    <OutputName>datadog-dotnet-apm-1.28.2-$(Platform)</OutputName>
+    <OutputName>datadog-dotnet-apm-1.28.3-prerelease-$(Platform)</OutputName>
     <TracerHomeDirectory Condition="'$(TracerHomeDirectory)' == ''">$(MSBuildThisFileDirectory)..\bin\windows-tracer-home</TracerHomeDirectory>
-    <DefineConstants>InstallerVersion=1.28.2;TracerHomeDirectory=$(TracerHomeDirectory);LibSqreenDirectory=$(LibSqreenDirectory)</DefineConstants>
+    <DefineConstants>InstallerVersion=1.28.3;TracerHomeDirectory=$(TracerHomeDirectory);LibSqreenDirectory=$(LibSqreenDirectory)</DefineConstants>
     <LibSqreenDirectory Condition="'$(LibSqreenDirectory)' == ''">$(LibSqreenDirectory)..\..\packages\libsqreen.1.1.2.3</LibSqreenDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

diff --git a/test/test-applications/regression/AutomapperTest/Dockerfile b/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=1.28.2
+ARG TRACER_VERSION=1.28.3
 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