Skip to content

Commit 374d2eb

Browse files
github-actions[bot]pierotibou
github-actions[bot]
and
pierotibou
authored
[Version Bump] 2.0.0-prerelease (DataDog#2159)
Co-authored-by: pierotibou <pierotibou@users.noreply.github.com>
1 parent 60075b6 commit 374d2eb

File tree

29 files changed

+228
-122
lines changed

29 files changed

+228
-122
lines changed

‎docs/CHANGELOG.md

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,101 @@
11
# Datadog .NET Tracer (`dd-trace-dotnet`) Release Notes
22

3+
## [Release 2.0.0-prerelease](https://github.com/DataDog/dd-trace-dotnet/releases/tag/v2.0.0-prerelease)
4+
5+
## Changes
6+
* Resolver and Formatter improvements for domain-neutral scenarios. (#1500)
7+
* Remove unused throughput test (#1802)
8+
* Couchbase instrumentation (#1925)
9+
* [2.0] Add ImmutableTracerSettings (#1951)
10+
* [2.0] Remove obsolete APIs (#1952)
11+
* [2.0] Drop support for .NET < 4.6.1 (#1957)
12+
* [2.0] - Remove CallSite instrumentation (#1958)
13+
* [2.0] Update default value of DD_TRACE_ROUTE_TEMPLATE_RESOURCE_NAMES_ENABLED to true (#1961)
14+
* [2.0] - Native stats fixes (#1967)
15+
* [2.0] Make various APIs internal (#1968)
16+
* [2.0] - Adds a simple agent port checker on CI Visibility scenarios. (#1972)
17+
* [2.0] Mark deprecated settings obsolete (#1974)
18+
* [2.0] Cleanup old factory method and tests (#1980)
19+
* fold `IntegrationIds.ElasticsearchNet5` into `ElasticsearchNet` (#1983)
20+
* [2.0] - Remove unnescessary copies from native side. (#1989)
21+
* [2.0] Handle multiple tracer instances gracefully (#1990)
22+
* Improves DomainMetadata class (#2003)
23+
* [2.0] Split integration id `AdoNet` into individual ids per db type (#2008)
24+
* [2.0] Use distributed tracing for compatibility across different versions of the tracer (#2020)
25+
* [2.0] Rename ReplaceGlobalSettings() -> Configure() (#2023)
26+
* [2.0] Various small DiagnosticObserver optimisations (#2024)
27+
* [2.0] Use buster-based debian for building (#2032)
28+
* Update CI App specs (#2035)
29+
* Profiler uses environment variables instead of current module for pinvoke generation (#2042)
30+
* Remove dependency from the shared project to main project (#2043)
31+
* [2.0] - Detect current module at runtime and use it for PInvoke rewriting (#2044)
32+
* [2.0] Relax duck type visibility requirements (#2045)
33+
* [2.0] Simplify IntegrationSettingsCollection (#2048)
34+
* [AppSec] Waf fixes: reading register for waf and unit tests for alpine (#2060)
35+
* Restoring Couchbase instrumentation (#2064)
36+
* Remove the newline between the log message and properties (#2070)
37+
* Update supported ADO.NET versions (#2077)
38+
* Remove CIApp Feature Tracking (#2088)
39+
* Change the public API to only use ISpan / IScope (#2090)
40+
* CallTarget ByRef (#2092)
41+
* Add a pointer to the "Performance Counters and In-Process Side-By-Side Applications" doc (#2093)
42+
* Add space in log line (#2094)
43+
* Mock the active span when using multiple versions of the tracer (#2095)
44+
* Add helper for collecting host metadata (#2097)
45+
* Change the CallTargetReturn struct to a ref struct (#2103)
46+
* [CIApp] - MsTest 2.2.8 integration. (#2107)
47+
* Bump supported version of NUnit3TestAdapter (#2118)
48+
* [AppSec] Fix tag prefix bug (#2123)
49+
* Add a big fat warning in NativeCallTargetDefinition file (#2126)
50+
* Use the non truncated UserAgent property in .netfx webapi (#2128)
51+
* Update ITracer interface (#2131)
52+
* Add space before exception message (#2133)
53+
* Make Span internal (#2134)
54+
* Improve performance of AutomaticTracer (#2135)
55+
* Log additional information about the AssemblyLoadContext (#2136)
56+
* Reinstate Integration.AdoNet integration (#2137)
57+
* DBScopeFactory improvements. (#2138)
58+
* Use PathBase.ToUriComponent in AspNetCoreDiagnosticObserver (#2141)
59+
* Adds feature flag to disable integration version checks. (#2147)
60+
* Disable version conflict fix (#2155)
61+
62+
## Fixes
63+
* [2.0] Additional cleanup from CallSite removal (#1966)
64+
* [2.0] - Refactor Integration struct, and remove unused code. (#1969)
65+
* [2.0] - Remove unused files (#1985)
66+
* [2.0] Cleanup some more obsolete usages (#1997)
67+
* Remove SpanId argument from StartActiveWithTags (#2017)
68+
* [2.0] Minor restructuring of logging files (#2040)
69+
* [2.0] Add modified WCF CallTarget instrumentation via opt-in environment variable (#2041)
70+
* Fix a couple of obsolete API usages (#2056)
71+
* [2.0] remove leftover references to `integrations.json` and `DD_INTEGRATIONS` (#2073)
72+
* [2.0] remove unused class `MethodBuilder` and test references (#2074)
73+
* Fix disabled integrations log message (#2078)
74+
* CallTarget ByRef: Fix ByRef Generics arguments (#2099)
75+
* Fix host metadata kernel information (#2104)
76+
* Fix benchmarks comparison (#2130)
77+
78+
## Build / Test
79+
* [2.0] Add support for .NET 6 (#1885)
80+
* [2.0] Update GitLab build to use .NET 6 SDK (#2010)
81+
* [2.0] Fix ASP.NET Core tests + snapshots (#2012)
82+
* [2.0] Add .NET 6 WebApplicationBuilder tests (#2016)
83+
* Don't push artifacts to AWS/Azure unless on main/master (#2018)
84+
* [2.0] Add Linux installer smoke tests (#2036)
85+
* Switch to using curl to send AzDo build GitHub status (#2049)
86+
* Try switch dependabot generation to use pull_request_target (#2055)
87+
* Don't throw in AgentWriterBenchmark (#2057)
88+
* Allow running ITests locally on Mac (#2063)
89+
* [Test Package Versions Bump] Updating package versions (#2072)
90+
* Implementation of Exploration Tests (#2089)
91+
* Redesign package version generator to allow more granular control (#2091)
92+
* Fix flaky test in unit tests (#2106)
93+
* Centralize Mock Trace Agent Initialization (#2114)
94+
* Update dependabot/Nuke targets (#2117)
95+
* Fix asp snapshots file names (#2148)
96+
97+
[Changes since 1.31.0](https://github.com/DataDog/dd-trace-dotnet/compare/v1.31.0...v2.0.0-prerelease)
98+
399
## [Release 1.30.0](https://github.com/DataDog/dd-trace-dotnet/releases/tag/v1.30.0)
4100

5101
## Changes

‎tracer/build/_build/Build.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ partial class Build : NukeBuild
6565
readonly bool IsAlpine = false;
6666

6767
[Parameter("The build version. Default is latest")]
68-
readonly string Version = "1.30.0";
68+
readonly string Version = "2.0.0";
6969

7070
[Parameter("Whether the build version is a prerelease(for packaging purposes). Default is latest")]
71-
readonly bool IsPrerelease = false;
71+
readonly bool IsPrerelease = true;
7272

7373
[Parameter("Prints the available drive space before executing each target. Defaults to false")]
7474
readonly bool PrintDriveSpace = false;

‎tracer/samples/AutomaticTraceIdInjection/Log4NetExample/Log4NetExample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Datadog.Trace" Version="1.30.0" />
9+
<PackageReference Include="Datadog.Trace" Version="2.0.0-prerelease" />
1010
<PackageReference Include="log4net" Version="2.0.12" />
1111
<PackageReference Include="log4net.Ext.Json" Version="2.0.8.3" />
1212
</ItemGroup>

‎tracer/samples/AutomaticTraceIdInjection/MicrosoftExtensionsExample/MicrosoftExtensionsExample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<ItemGroup>
88
<PackageReference Include="Datadog.Monitoring.Distribution" Version="1.28.6-beta01" />
9-
<PackageReference Include="Datadog.Trace" Version="1.30.0" />
9+
<PackageReference Include="Datadog.Trace" Version="2.0.0-prerelease" />
1010
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.18" />
1111
<PackageReference Include="NetEscapades.Extensions.Logging.RollingFile" Version="2.5.0-beta01" />
1212
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />

‎tracer/samples/AutomaticTraceIdInjection/NLog40Example/NLog40Example.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Datadog.Trace" Version="1.30.0" />
9+
<PackageReference Include="Datadog.Trace" Version="2.0.0-prerelease" />
1010
<PackageReference Include="NLog" Version="4.0.0" />
1111
</ItemGroup>
1212

‎tracer/samples/AutomaticTraceIdInjection/NLog45Example/NLog45Example.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Datadog.Trace" Version="1.30.0" />
9+
<PackageReference Include="Datadog.Trace" Version="2.0.0-prerelease" />
1010
<PackageReference Include="NLog" Version="4.5.11" />
1111
</ItemGroup>
1212

‎tracer/samples/AutomaticTraceIdInjection/NLog46Example/NLog46Example.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Datadog.Trace" Version="1.30.0" />
9+
<PackageReference Include="Datadog.Trace" Version="2.0.0-prerelease" />
1010
<PackageReference Include="NLog" Version="4.6.7" />
1111
</ItemGroup>
1212

‎tracer/samples/AutomaticTraceIdInjection/SerilogExample/SerilogExample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Datadog.Trace" Version="1.30.0" />
9+
<PackageReference Include="Datadog.Trace" Version="2.0.0-prerelease" />
1010
<PackageReference Include="Serilog" Version="2.9.0" />
1111
<PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
1212
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />

‎tracer/samples/ConsoleApp/Alpine3.10.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ COPY --from=build /app/out .
1616

1717
# Set up Datadog APM
1818
RUN apk --no-cache update && apk add curl
19-
ARG TRACER_VERSION=1.30.0
19+
ARG TRACER_VERSION=2.0.0
2020
RUN mkdir -p /var/log/datadog
2121
RUN mkdir -p /opt/datadog
2222
RUN curl -L https://github.com/DataDog/dd-trace-dotnet/releases/download/v${TRACER_VERSION}/datadog-dotnet-apm-${TRACER_VERSION}-musl.tar.gz \

‎tracer/samples/ConsoleApp/Alpine3.9.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ COPY --from=build /app/out .
1616

1717
# Set up Datadog APM
1818
RUN apk --no-cache update && apk add curl
19-
ARG TRACER_VERSION=1.30.0
19+
ARG TRACER_VERSION=2.0.0
2020
RUN mkdir -p /var/log/datadog
2121
RUN mkdir -p /opt/datadog
2222
RUN curl -L https://github.com/DataDog/dd-trace-dotnet/releases/download/v${TRACER_VERSION}/datadog-dotnet-apm-${TRACER_VERSION}-musl.tar.gz \

‎tracer/samples/ConsoleApp/Debian.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ WORKDIR /app
1515
COPY --from=build /app/out .
1616

1717
# Set up Datadog APM
18-
ARG TRACER_VERSION=1.30.0
18+
ARG TRACER_VERSION=2.0.0
1919
RUN mkdir -p /var/log/datadog
2020
RUN mkdir -p /opt/datadog
2121
RUN curl -LO https://github.com/DataDog/dd-trace-dotnet/releases/download/v${TRACER_VERSION}/datadog-dotnet-apm_${TRACER_VERSION}_amd64.deb

‎tracer/samples/WindowsContainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
FROM mcr.microsoft.com/dotnet/aspnet:5.0-windowsservercore-ltsc2019 AS base
77
WORKDIR /app
88

9-
ARG TRACER_VERSION=1.30.0
9+
ARG TRACER_VERSION=2.0.0
1010
ENV DD_TRACER_VERSION=$TRACER_VERSION
1111
ENV ASPNETCORE_URLS=http://*.80
1212

‎tracer/src/Datadog.Monitoring.Distribution/Datadog.Monitoring.Distribution.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Version>1.30.0</Version>
4+
<Version>2.0.0-prerelease</Version>
55
<Version>$(Version)-beta01</Version> <!-- Unconditionally add a beta suffix to the package, but keep the rest of the name so we can associate it with the rest of the release -->
66
<Title>Datadog APM Auto-instrumentation Assets</Title>
77
<Description>Auto-instrumentation assets for Datadog APM</Description>

‎tracer/src/Datadog.Trace.AspNet/Datadog.Trace.AspNet.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net461</TargetFrameworks>
5-
<Version>1.30.0</Version>
5+
<Version>2.0.0-prerelease</Version>
66
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
77
</PropertyGroup>
88

‎tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<OutputPath>..\bin\ProfilerResources\</OutputPath>
77

88
<!-- NuGet -->
9-
<Version>1.30.0</Version>
9+
<Version>2.0.0-prerelease</Version>
1010

1111
<!-- Hide warnings for EOL .NET Core targets (e.g. netcoreapp2.0) -->
1212
<CheckEolTargetFramework>false</CheckEolTargetFramework>

‎tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Datadog.Trace.ClrProfiler.Managed.Loader
1313
/// </summary>
1414
public partial class Startup
1515
{
16-
private const string AssemblyName = "Datadog.Trace, Version=1.30.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb";
16+
private const string AssemblyName = "Datadog.Trace, Version=2.0.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb";
1717

1818
/// <summary>
1919
/// Initializes static members of the <see cref="Startup"/> class.

‎tracer/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cmake_policy(SET CMP0015 NEW)
55
# Project definition
66
# ******************************************************
77

8-
project("Datadog.Trace.ClrProfiler.Native" VERSION 1.30.0)
8+
project("Datadog.Trace.ClrProfiler.Native" VERSION 2.0.0)
99

1010
# ******************************************************
1111
# Environment detection

‎tracer/src/Datadog.Trace.ClrProfiler.Native/Resource.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ END
5050
//
5151

5252
VS_VERSION_INFO VERSIONINFO
53-
FILEVERSION 1,30,0,0
54-
PRODUCTVERSION 1,30,0,0
53+
FILEVERSION 2,0,0,0
54+
PRODUCTVERSION 2,0,0,0
5555
FILEFLAGSMASK 0x3fL
5656
#ifdef _DEBUG
5757
FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
6868
BEGIN
6969
VALUE "CompanyName", "Datadog, Inc."
7070
VALUE "FileDescription", "Datadog CLR Profiler"
71-
VALUE "FileVersion", "1.30.0.0"
71+
VALUE "FileVersion", "2.0.0.0"
7272
VALUE "InternalName", "Datadog.Trace.ClrProfiler.Native.DLL"
7373
VALUE "LegalCopyright", "Copyright 2017 Datadog, Inc."
7474
VALUE "OriginalFilename", "Datadog.Trace.ClrProfiler.Native.DLL"
7575
VALUE "ProductName", "Datadog .NET Tracer"
76-
VALUE "ProductVersion", "1.30.0"
76+
VALUE "ProductVersion", "2.0.0"
7777
END
7878
END
7979
BLOCK "VarFileInfo"

‎tracer/src/Datadog.Trace.ClrProfiler.Native/dd_profiler_constants.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ const WSTRING system_private_corelib_assemblyName = WStr("System.Private.CoreLib
7979
const WSTRING datadog_trace_clrprofiler_managed_loader_assemblyName = WStr("Datadog.Trace.ClrProfiler.Managed.Loader");
8080

8181
const WSTRING managed_profiler_full_assembly_version =
82-
WStr("Datadog.Trace, Version=1.30.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");
82+
WStr("Datadog.Trace, Version=2.0.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");
8383

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

@@ -110,7 +110,7 @@ const AssemblyProperty managed_profiler_assembly_property = AssemblyProperty(
110110
49, 105, 236, 40, 21, 176, 12, 238, 238, 204, 141, 90, 27, 244, 61, 182, 125, 41, 97, 163,
111111
233, 190, 161, 57, 127, 4, 62, 192, 116, 145, 112, 150, 73, 37, 47, 85, 101, 183, 86, 197},
112112
160, 32772, 1)
113-
.WithVersion(1, 30, 0, 0);
113+
.WithVersion(2, 0, 0, 0);
114114

115115
} // namespace trace
116116

‎tracer/src/Datadog.Trace.ClrProfiler.Native/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#pragma once
22

3-
constexpr auto PROFILER_VERSION = "1.30.0";
3+
constexpr auto PROFILER_VERSION = "2.0.0";

‎tracer/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Version>1.30.0</Version>
4+
<Version>2.0.0-prerelease</Version>
55
</PropertyGroup>
66

77
<!-- For VS testing purposes only, copy all implementation assemblies to the

‎tracer/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<!-- NuGet -->
5-
<Version>1.30.0</Version>
5+
<Version>2.0.0-prerelease</Version>
66
<Title>Datadog APM - OpenTracing</Title>
77
<Description>Provides OpenTracing support for Datadog APM</Description>
88
<PackageTags>$(PackageTags);OpenTracing</PackageTags>

‎tracer/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.Standalone.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Version>1.30.0</Version>
4+
<Version>2.0.0-prerelease</Version>
55
<Title>Datadog APM Auto-instrumentation Runner</Title>
66
<Copyright>Copyright 2020 Datadog, Inc.</Copyright>
77
<OutputType>Exe</OutputType>

‎tracer/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.Tool.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Version>1.30.0</Version>
4+
<Version>2.0.0-prerelease</Version>
55
<Title>Datadog APM Auto-instrumentation Runner</Title>
66
<Copyright>Copyright 2020 Datadog, Inc.</Copyright>
77
<Description>Auto-instrumentation dotnet global tool for Datadog APM</Description>

0 commit comments

Comments
 (0)