Skip to content
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.

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

[Version Bump] 1.28.5-prerelease #1709

Merged
merged 1 commit into from
Aug 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build/_build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ partial class Build : NukeBuild
readonly bool IsAlpine = false;

[Parameter("The build version. Default is latest")]
readonly string Version = "1.28.3";
readonly string Version = "1.28.5";

[Parameter("Whether the build version is a prerelease(for packaging purposes). Default is latest")]
readonly bool IsPrerelease = true;
Expand Down
28 changes: 28 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,33 @@
# Datadog .NET Tracer (`dd-trace-dotnet`) Release Notes

## [Release 1.28.5-prerelease](https://github.com/DataDog/dd-trace-dotnet/releases/tag/v1.28.5-prerelease)

## Changes
* Remove usage of non-builtin types in Attribute named arguments (#1601)
* Add Microsoft.Extensions.Logging.ILogger instrumentation (#1663)
* Adding appsec crank scenarios (#1684)
* Proxy calls to dl (#1686)
* Add tracer metrics to startup logs (#1689)
* New version of the WAF (#1692)
* Merging repos: 'dd-shared-components-dotnet' into 'dd-trace-dotnet'. (#1694)
* Sending more relevant data to backend (#1695)
* Prepare the `/shared` folder for consumption by the Profiler. (#1697)
* Don't cache the process instance for runtime metrics (#1698)
* Use AppDomain.CurrentDomain.BaseDirectory to get current directory for configuration (#1700)
* Don't trigger Tracer-specific CI for changes to shared assets not used by the Tracer (#1701)

## Fixes
* Add PreserveContext attribute for async integrations (#1702)

## Build / Test
* Add end-to-end integration tests for logs injection (#1637)
* Produce NuGet package to deploy automatic instrumentation (#1661)
* Adds Execution time benchmarks (#1687)
* Add fix for Samples.MultiDomainHost.App.NuGetHttpWithRedirects test application (#1691)
* Reduce snapshot file path length (#1696)

[Changes since 1.28.2](https://github.com/DataDog/dd-trace-dotnet/compare/v1.28.2...v1.28.5-prerelease)

## [Release 1.28.3-prerelease](https://github.com/DataDog/dd-trace-dotnet/releases/tag/v1.28.3-prerelease)

## Changes
Expand Down
660 changes: 330 additions & 330 deletions integrations.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Datadog.Trace" Version="1.28.3-prerelease" />
<PackageReference Include="Datadog.Trace" Version="1.28.5-prerelease" />
<PackageReference Include="log4net" Version="2.0.12" />
<PackageReference Include="log4net.Ext.Json" Version="2.0.8.3" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Datadog.Trace" Version="1.28.3-prerelease" />
<PackageReference Include="Datadog.Trace" Version="1.28.5-prerelease" />
<PackageReference Include="NLog" Version="4.0.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Datadog.Trace" Version="1.28.3-prerelease" />
<PackageReference Include="Datadog.Trace" Version="1.28.5-prerelease" />
<PackageReference Include="NLog" Version="4.5.11" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Datadog.Trace" Version="1.28.3-prerelease" />
<PackageReference Include="Datadog.Trace" Version="1.28.5-prerelease" />
<PackageReference Include="NLog" Version="4.6.7" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Datadog.Trace" Version="1.28.3-prerelease" />
<PackageReference Include="Datadog.Trace" Version="1.28.5-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" />
Expand Down
2 changes: 1 addition & 1 deletion samples/ConsoleApp/Alpine3.10.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
ARG TRACER_VERSION=1.28.5
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 \
Expand Down
2 changes: 1 addition & 1 deletion samples/ConsoleApp/Alpine3.9.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
ARG TRACER_VERSION=1.28.5
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 \
Expand Down
2 changes: 1 addition & 1 deletion samples/ConsoleApp/Debian.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ WORKDIR /app
COPY --from=build /app/out .

# Set up Datadog APM
ARG TRACER_VERSION=1.28.3
ARG TRACER_VERSION=1.28.5
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
Expand Down
2 changes: 1 addition & 1 deletion samples/WindowsContainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
FROM mcr.microsoft.com/dotnet/aspnet:5.0-windowsservercore-ltsc2019 AS base
WORKDIR /app

ARG TRACER_VERSION=1.28.3
ARG TRACER_VERSION=1.28.5
ENV DD_TRACER_VERSION=$TRACER_VERSION
ENV ASPNETCORE_URLS=http://*.80

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>1.28.3-prerelease</Version>
<Version>1.28.5-prerelease</Version>
<Title>Datadog APM Auto-instrumentation Assets</Title>
<Description>Auto-instrumentation assets for Datadog APM</Description>
<IncludeBuildOutput>false</IncludeBuildOutput>
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Trace.AspNet/Datadog.Trace.AspNet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFrameworks>net45</TargetFrameworks>
<Version>1.28.3-prerelease</Version>
<Version>1.28.5-prerelease</Version>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<OutputPath>..\bin\ProfilerResources\</OutputPath>

<!-- NuGet -->
<Version>1.28.3-prerelease</Version>
<Version>1.28.5-prerelease</Version>

<!-- Hide warnings for EOL .NET Core targets (e.g. netcoreapp2.0) -->
<CheckEolTargetFramework>false</CheckEolTargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ private static void TryLoadManagedAssembly()
{
try
{
var assembly = Assembly.Load("Datadog.Trace, Version=1.28.3.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");
var assembly = Assembly.Load("Datadog.Trace, Version=1.28.5.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");

if (assembly != null)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cmake_policy(SET CMP0015 NEW)
# Project definition
# ******************************************************

project("Datadog.Trace.ClrProfiler.Native" VERSION 1.28.3)
project("Datadog.Trace.ClrProfiler.Native" VERSION 1.28.5)

# ******************************************************
# Environment detection
Expand Down
8 changes: 4 additions & 4 deletions src/Datadog.Trace.ClrProfiler.Native/Resource.rc
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,28,3,0
PRODUCTVERSION 1,28,3,0
FILEVERSION 1,28,5,0
PRODUCTVERSION 1,28,5,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -68,12 +68,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Datadog, Inc."
VALUE "FileDescription", "Datadog CLR Profiler"
VALUE "FileVersion", "1.28.3.0"
VALUE "FileVersion", "1.28.5.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.3"
VALUE "ProductVersion", "1.28.5"
END
END
BLOCK "VarFileInfo"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const WSTRING skip_assemblies[]{WStr("mscorlib"),
WStr("ISymWrapper")};

const WSTRING managed_profiler_full_assembly_version =
WStr("Datadog.Trace, Version=1.28.3.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");
WStr("Datadog.Trace, Version=1.28.5.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");

const WSTRING managed_profiler_name = WStr("Datadog.Trace");

Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Trace.ClrProfiler.Native/version.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#pragma once

constexpr auto PROFILER_VERSION = "1.28.3";
constexpr auto PROFILER_VERSION = "1.28.5";
2 changes: 1 addition & 1 deletion src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>1.28.3-prerelease</Version>
<Version>1.28.5-prerelease</Version>
</PropertyGroup>

<!-- For VS testing purposes only, copy all implementation assemblies to the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<!-- NuGet -->
<Version>1.28.3-prerelease</Version>
<Version>1.28.5-prerelease</Version>
<Title>Datadog APM - OpenTracing</Title>
<Description>Provides OpenTracing support for Datadog APM</Description>
<PackageTags>$(PackageTags);OpenTracing</PackageTags>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>1.28.3-prerelease</Version>
<Version>1.28.5-prerelease</Version>
<Title>Datadog APM Auto-instrumentation Runner</Title>
<Copyright>Copyright 2020 Datadog, Inc.</Copyright>
<OutputType>Exe</OutputType>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>1.28.3-prerelease</Version>
<Version>1.28.5-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>
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Trace/Datadog.Trace.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<!-- NuGet -->
<Version>1.28.3-prerelease</Version>
<Version>1.28.5-prerelease</Version>
<Title>Datadog APM</Title>
<Description>Instrumentation library for Datadog APM.</Description>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Trace/TracerConstants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.0";
public static readonly string AssemblyVersion = "1.28.5.0";
}
}
4 changes: 2 additions & 2 deletions src/WindowsInstaller/WindowsInstaller.wixproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<IntermediateOutputPath>obj\$(Configuration)\$(Platform)\</IntermediateOutputPath>
<SuppressPdbOutput>True</SuppressPdbOutput>
<DefineSolutionProperties>false</DefineSolutionProperties>
<OutputName>datadog-dotnet-apm-1.28.3-prerelease-$(Platform)</OutputName>
<OutputName>datadog-dotnet-apm-1.28.5-prerelease-$(Platform)</OutputName>
<TracerHomeDirectory Condition="'$(TracerHomeDirectory)' == ''">$(MSBuildThisFileDirectory)..\bin\windows-tracer-home</TracerHomeDirectory>
<DefineConstants>InstallerVersion=1.28.3;TracerHomeDirectory=$(TracerHomeDirectory);LibDdwafDirectory=$(LibDdwafDirectory)</DefineConstants>
<DefineConstants>InstallerVersion=1.28.5;TracerHomeDirectory=$(TracerHomeDirectory);LibDdwafDirectory=$(LibDdwafDirectory)</DefineConstants>
<LibDdwafDirectory Condition="'$(LibDdwafDirectory)' == ''">$(LibDdwafDirectory)..\..\packages\libddwaf.1.0.6</LibDdwafDirectory>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM mcr.microsoft.com/dotnet/core/runtime:2.1-stretch-slim AS base
ARG TRACER_VERSION=1.28.3
ARG TRACER_VERSION=1.28.5
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
Expand Down