Skip to content

Commit 90f2350

Browse files
andrewlockandrewlock
authored
Cherry-pick/backport to master (DataDog#1996)
* [Version Bump] 1.29.1-prerelease (DataDog#1949) The following files were found to be modified. Confirm that these changes were expected (for example, changes to files in the MSI project are expected if our dependencies have changed). - [ ] tracer/dependabot/Datadog.Dependabot.Integrations.csproj The following files were found to be modified (as expected) - [x] docs/CHANGELOG.md - [x] tracer/build/_build/Build.cs - [x] tracer/integrations.json - [x] tracer/samples/AutomaticTraceIdInjection/MicrosoftExtensionsExample/MicrosoftExtensionsExample.csproj - [x] tracer/samples/AutomaticTraceIdInjection/Log4NetExample/Log4NetExample.csproj - [x] tracer/samples/AutomaticTraceIdInjection/NLog40Example/NLog40Example.csproj - [x] tracer/samples/AutomaticTraceIdInjection/NLog45Example/NLog45Example.csproj - [x] tracer/samples/AutomaticTraceIdInjection/NLog46Example/NLog46Example.csproj - [x] tracer/samples/AutomaticTraceIdInjection/SerilogExample/SerilogExample.csproj - [x] tracer/samples/ConsoleApp/Alpine3.10.dockerfile - [x] tracer/samples/ConsoleApp/Alpine3.9.dockerfile - [x] tracer/samples/ConsoleApp/Debian.dockerfile - [x] tracer/samples/WindowsContainer/Dockerfile - [x] tracer/src/Datadog.Monitoring.Distribution/Datadog.Monitoring.Distribution.csproj - [x] tracer/src/Datadog.Trace.AspNet/Datadog.Trace.AspNet.csproj - [x] tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj - [x] tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs - [x] tracer/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt - [x] tracer/src/Datadog.Trace.ClrProfiler.Native/dd_profiler_constants.h - [x] tracer/src/Datadog.Trace.ClrProfiler.Native/Resource.rc - [x] tracer/src/Datadog.Trace.ClrProfiler.Native/version.h - [x] tracer/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj - [x] tracer/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj - [x] tracer/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.Standalone.csproj - [x] tracer/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.Tool.csproj - [x] tracer/src/Datadog.Trace/Datadog.Trace.csproj - [x] tracer/src/Datadog.Trace/TracerConstants.cs - [x] tracer/src/WindowsInstaller/WindowsInstaller.wixproj - [x] tracer/test/test-applications/regression/AutomapperTest/Dockerfile @DataDog/apm-dotnet * [2.0] Make various APIs internal (DataDog#1968) Cherry-picked from `release/2.0` with some updates but ignored any changes that converted public -> internal. We could have used the [Browsable] attributes on them instead, but that would cause merge issues later, which I don't think is worth the hassle personally. We could add these later if we wish. Notably: - All Tags and SpanTypes remain public - Add duck types remain public - Can still simplify publci API tests - Integration duck types made not browsable - Hide IgnoresAccessChecksToAttribute * Add workaround for "Unable move and reuse existing repository to required location."
1 parent 05143f5 commit 90f2350

File tree

46 files changed

+239
-906
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+239
-906
lines changed

‎.azure-pipelines/ultimate-pipeline.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,12 @@ stages:
118118

119119
- template: steps/install-dotnet-5-sdk.yml
120120

121+
# workaround for "Unable move and reuse existing repository to required location."
122+
# https://github.com/microsoft/azure-pipelines-yaml/issues/403
123+
- powershell: |
124+
New-Item -Path . -Name "dd-continuous-profiler-dotnet" -ItemType "directory"
125+
displayName: "Create repository folder (workaround)"
126+
121127
- checkout: dd-continuous-profiler-dotnet
122128
path: dd-continuous-profiler-dotnet
123129

‎docs/CHANGELOG.md

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

3+
## [Release 1.29.1-prerelease](https://github.com/DataDog/dd-trace-dotnet/releases/tag/v1.29.0)
4+
5+
## Changes
6+
* [Appsec] Send events in utf 8 without byte marker (#1932)
7+
8+
[Changes since 1.29.0](https://github.com/DataDog/dd-trace-dotnet/compare/v1.29.0...v1.29.1-prerelease)
9+
310
## [Release 1.29.0](https://github.com/DataDog/dd-trace-dotnet/releases/tag/v1.29.0)
411

512
## 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.29.0";
68+
readonly string Version = "1.29.1";
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/dependabot/Datadog.Dependabot.Integrations.csproj

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313

1414
<!-- Integration: Microsoft.Data.Sqlite -->
1515
<!-- Assembly: Microsoft.Data.Sqlite -->
16-
<!-- Latest package https://www.nuget.org/packages/Microsoft.Data.Sqlite/5.0.10 -->
17-
<PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.10" />
16+
<!-- Latest package https://www.nuget.org/packages/Microsoft.Data.Sqlite/5.0.11 -->
17+
<PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.11" />
1818

1919
<!-- Integration: MySql.Data -->
2020
<!-- Assembly: MySql.Data -->
21-
<!-- Latest package https://www.nuget.org/packages/MySql.Data/8.0.26 -->
22-
<PackageReference Include="MySql.Data" Version="8.0.26" />
21+
<!-- Latest package https://www.nuget.org/packages/MySql.Data/8.0.27 -->
22+
<PackageReference Include="MySql.Data" Version="8.0.27" />
2323

2424
<!-- Integration: MySqlConnector -->
2525
<!-- Assembly: MySqlConnector -->
26-
<!-- Latest package https://www.nuget.org/packages/MySqlConnector/1.3.13 -->
27-
<PackageReference Include="MySqlConnector" Version="1.3.13" />
26+
<!-- Latest package https://www.nuget.org/packages/MySqlConnector/1.3.14 -->
27+
<PackageReference Include="MySqlConnector" Version="1.3.14" />
2828

2929
<!-- Integration: Npgsql -->
3030
<!-- Assembly: Npgsql -->
@@ -33,8 +33,8 @@
3333

3434
<!-- Integration: Oracle.ManagedDataAccess -->
3535
<!-- Assembly: Oracle.ManagedDataAccess -->
36-
<!-- Latest package https://www.nuget.org/packages/Oracle.ManagedDataAccess/21.3.0 -->
37-
<PackageReference Include="Oracle.ManagedDataAccess" Version="21.3.0" />
36+
<!-- Latest package https://www.nuget.org/packages/Oracle.ManagedDataAccess/21.4.0 -->
37+
<PackageReference Include="Oracle.ManagedDataAccess" Version="21.4.0" />
3838

3939
<!-- Integration: System.Data -->
4040
<!-- Assembly: System.Data -->
@@ -58,8 +58,8 @@
5858

5959
<!-- Integration: AerospikeClient -->
6060
<!-- Assembly: AerospikeClient -->
61-
<!-- Latest package https://www.nuget.org/packages/Aerospike.Client/4.2.3 -->
62-
<PackageReference Include="Aerospike.Client" Version="4.2.3" />
61+
<!-- Latest package https://www.nuget.org/packages/Aerospike.Client/4.2.4 -->
62+
<PackageReference Include="Aerospike.Client" Version="4.2.4" />
6363

6464
<!-- Integration: System.Web.Mvc -->
6565
<!-- Assembly: System.Web.Mvc -->
@@ -68,23 +68,23 @@
6868

6969
<!-- Integration: AWSSDK.Core -->
7070
<!-- Assembly: AWSSDK.Core -->
71-
<!-- Latest package https://www.nuget.org/packages/AWSSDK.Core/3.7.3.15 -->
72-
<PackageReference Include="AWSSDK.Core" Version="3.7.3.15" />
71+
<!-- Latest package https://www.nuget.org/packages/AWSSDK.Core/3.7.3.27 -->
72+
<PackageReference Include="AWSSDK.Core" Version="3.7.3.27" />
7373

7474
<!-- Integration: AWSSDK.SQS -->
7575
<!-- Assembly: AWSSDK.SQS -->
76-
<!-- Latest package https://www.nuget.org/packages/AWSSDK.SQS/3.7.1.18 -->
77-
<PackageReference Include="AWSSDK.SQS" Version="3.7.1.18" />
76+
<!-- Latest package https://www.nuget.org/packages/AWSSDK.SQS/3.7.1.30 -->
77+
<PackageReference Include="AWSSDK.SQS" Version="3.7.1.30" />
7878

7979
<!-- Integration: Microsoft.Azure.Cosmos.Client -->
8080
<!-- Assembly: Microsoft.Azure.Cosmos.Client -->
81-
<!-- Latest package https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.21.0 -->
82-
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.21.0" />
81+
<!-- Latest package https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.22.0 -->
82+
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.22.0" />
8383

8484
<!-- Integration: Elasticsearch.Net -->
8585
<!-- Assembly: Elasticsearch.Net -->
86-
<!-- Latest package https://www.nuget.org/packages/Elasticsearch.Net/7.15.0 -->
87-
<PackageReference Include="Elasticsearch.Net" Version="7.15.0" />
86+
<!-- Latest package https://www.nuget.org/packages/Elasticsearch.Net/7.15.1 -->
87+
<PackageReference Include="Elasticsearch.Net" Version="7.15.1" />
8888

8989
<!-- Integration: GraphQL -->
9090
<!-- Assembly: GraphQL -->
@@ -118,18 +118,23 @@
118118

119119
<!-- Integration: Confluent.Kafka -->
120120
<!-- Assembly: Confluent.Kafka -->
121-
<!-- Latest package https://www.nuget.org/packages/Confluent.Kafka/1.8.1 -->
122-
<PackageReference Include="Confluent.Kafka" Version="1.8.1" />
121+
<!-- Latest package https://www.nuget.org/packages/Confluent.Kafka/1.8.2 -->
122+
<PackageReference Include="Confluent.Kafka" Version="1.8.2" />
123+
124+
<!-- Integration: log4net -->
125+
<!-- Assembly: log4net -->
126+
<!-- Latest package https://www.nuget.org/packages/log4net/2.0.12 -->
127+
<PackageReference Include="log4net" Version="2.0.12" />
123128

124129
<!-- Integration: MongoDB.Driver.Core -->
125130
<!-- Assembly: MongoDB.Driver.Core -->
126-
<!-- Latest package https://www.nuget.org/packages/MongoDB.Driver.Core/2.13.1 -->
127-
<PackageReference Include="MongoDB.Driver.Core" Version="2.13.1" />
131+
<!-- Latest package https://www.nuget.org/packages/MongoDB.Driver.Core/2.13.2 -->
132+
<PackageReference Include="MongoDB.Driver.Core" Version="2.13.2" />
128133

129134
<!-- Integration: MongoDB.Driver.Core -->
130135
<!-- Assembly: MongoDB.Driver.Core -->
131-
<!-- Latest package https://www.nuget.org/packages/MongoDB.Driver/2.13.1 -->
132-
<PackageReference Include="MongoDB.Driver" Version="2.13.1" />
136+
<!-- Latest package https://www.nuget.org/packages/MongoDB.Driver/2.13.2 -->
137+
<PackageReference Include="MongoDB.Driver" Version="2.13.2" />
133138

134139
<!-- Integration: Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter -->
135140
<!-- Assembly: Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter -->
@@ -163,8 +168,8 @@
163168

164169
<!-- Integration: StackExchange.Redis -->
165170
<!-- Assembly: StackExchange.Redis -->
166-
<!-- Latest package https://www.nuget.org/packages/StackExchange.Redis/2.2.62 -->
167-
<PackageReference Include="StackExchange.Redis" Version="2.2.62" />
171+
<!-- Latest package https://www.nuget.org/packages/StackExchange.Redis/2.2.79 -->
172+
<PackageReference Include="StackExchange.Redis" Version="2.2.79" />
168173

169174
<!-- Integration: StackExchange.Redis.StrongName -->
170175
<!-- Assembly: StackExchange.Redis.StrongName -->

0 commit comments

Comments
 (0)