Merge branch 'dotnet10/UpdateToPreview' into nacho/dotnet10Test

Author: NachoEchevarria

.azure-pipelines/steps/run-in-docker.yml

@@ -75,6 +75,7 @@ steps:
         --env enable_crash_dumps=$(enable_crash_dumps) \
         --env DD_COLLECTOR_CPU_USAGE="1" \
         --env DD_LOGGER_DD_API_KEY="$(DD_LOGGER_DD_API_KEY)" \
+        --env DD_LOGGER_DD_TRACE_LOG_DIRECTORY="/project/artifacts/build_data/infra_logs" \
         --env DD_LOGGER_DD_SERVICE \
         --env DD_LOGGER_DD_ENV \
         --env DD_LOGGER_ENABLED \

.azure-pipelines/steps/update-github-status-jobs.yml

@@ -66,4 +66,4 @@ jobs:
       parameters:
         checkName: $(System.StageName)
         status: 'failure'
-        description: 'Run failed'
+        description: 'Run failed, please investigate and/or retry this (if flake) via Azure DevOps'

.azure-pipelines/ultimate-pipeline.yml

@@ -96,6 +96,7 @@ variables:
   DD_LOGGER_DD_API_KEY: $(DD_API_KEY_PROD)
   DD_LOGGER_DD_SERVICE: dd-trace-dotnet
   DD_LOGGER_DD_ENV: CI
+  DD_LOGGER_DD_TRACE_LOG_DIRECTORY: $(System.DefaultWorkingDirectory)/artifacts/build_data/infra_logs
   DD_LOGGER_TF_BUILD: True
   DD_LOGGER_BUILD_BUILDID: $(Build.BuildId)
   DD_LOGGER_BUILD_DEFINITIONNAME: $(Build.DefinitionName)
@@ -119,7 +120,7 @@ variables:
   DD_LOGGER_DD_TAGS: test.configuration.job:$(System.JobDisplayName)
   DD_LOGGER_ENABLED: true
   DD_COLLECTOR_CPU_USAGE: true
-  ToolVersion: 3.23.0
+  ToolVersion: 3.24.0
   # .NET SDK performance optimization variables
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1

.github/CODEOWNERS

@@ -11,6 +11,27 @@
 # IDM
 /tracer/test/test-applications/integrations/                                                            @DataDog/apm-idm-dotnet  @DataDog/tracing-dotnet
 
+# Capabilities, API, and OpenTelemetry
+
+/tracer/src/Datadog.Trace.Manual/                                                                       @DataDog/apm-sdk-api-dotnet @DataDog/tracing-dotnet
+/tracer/src/Datadog.Trace/Activity/                                                                     @DataDog/apm-sdk-api-dotnet @DataDog/tracing-dotnet
+/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/OpenTelemetry/                                @DataDog/apm-sdk-api-dotnet @DataDog/tracing-dotnet
+/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/ManualInstrumentation/                        @DataDog/apm-sdk-api-dotnet @DataDog/tracing-dotnet
+/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/TraceAnnotations/                             @DataDog/apm-sdk-api-dotnet @DataDog/tracing-dotnet
+
+/tracer/test/test-applications/integrations/Samples.ManualInstrumentation/                              @DataDog/apm-sdk-api-dotnet @DataDog/tracing-dotnet
+/tracer/test/test-applications/integrations/Samples.NetActivitySdk/                                     @DataDog/apm-sdk-api-dotnet @DataDog/tracing-dotnet
+/tracer/test/test-applications/integrations/Samples.OpenTelemetrySdk/                                   @DataDog/apm-sdk-api-dotnet @DataDog/tracing-dotnet
+/tracer/test/test-applications/integrations/Samples.TraceAnnotations/                                   @DataDog/apm-sdk-api-dotnet @DataDog/tracing-dotnet
+/tracer/test/test-applications/integrations/Samples.TraceAnnotations.VersionMismatch.AfterFeature/      @DataDog/apm-sdk-api-dotnet @DataDog/tracing-dotnet
+/tracer/test/test-applications/integrations/Samples.TraceAnnotations.VersionMismatch.BeforeFeature/     @DataDog/apm-sdk-api-dotnet @DataDog/tracing-dotnet
+/tracer/test/test-applications/integrations/Samples.TraceAnnotations.VersionMismatch.NewerNuGet/        @DataDog/apm-sdk-api-dotnet @DataDog/tracing-dotnet
+
+/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/ManualInstrumentationTests.cs                   @DataDog/apm-sdk-api-dotnet @DataDog/tracing-dotnet
+/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/NetActivitySdkTests.cs                          @DataDog/apm-sdk-api-dotnet @DataDog/tracing-dotnet
+/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/OpenTelemetrySdkTests.cs                        @DataDog/apm-sdk-api-dotnet @DataDog/tracing-dotnet
+/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/TraceAnnotationsTests.cs                        @DataDog/apm-sdk-api-dotnet @DataDog/tracing-dotnet
+
 ## DBM and DSM
 /tracer/src/Datadog.Trace/DatabaseMonitoring/                                                           @DataDog/apm-idm-dotnet  @DataDog/tracing-dotnet
 /tracer/src/Datadog.Trace/DataStreamsMonitoring/                                                        @DataDog/apm-idm-dotnet  @DataDog/tracing-dotnet
@@ -44,16 +65,6 @@
 
 ## NON-IDM
 
-/tracer/test/test-applications/integrations/Samples.ManualInstrumentation/                              @DataDog/tracing-dotnet
-/tracer/test/test-applications/integrations/Samples.NetActivitySdk/                                     @DataDog/tracing-dotnet
-/tracer/test/test-applications/integrations/Samples.OpenTelemetrySdk/                                   @DataDog/tracing-dotnet
-/tracer/test/test-applications/integrations/Samples.TraceAnnotations/                                   @DataDog/tracing-dotnet
-/tracer/test/test-applications/integrations/Samples.TraceAnnotations.VersionMismatch.AfterFeature/      @DataDog/tracing-dotnet
-/tracer/test/test-applications/integrations/Samples.TraceAnnotations.VersionMismatch.BeforeFeature/     @DataDog/tracing-dotnet
-/tracer/test/test-applications/integrations/Samples.TraceAnnotations.VersionMismatch.NewerNuGet/        @DataDog/tracing-dotnet
-
-/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/OpenTelemetry/                                @DataDog/tracing-dotnet
-/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/TraceAnnotations/                             @DataDog/tracing-dotnet
 /tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Helpers/                                        @DataDog/tracing-dotnet
 /tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/SmokeTests/                                     @DataDog/tracing-dotnet
 /tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/TestCollections/                                @DataDog/tracing-dotnet
@@ -65,19 +76,15 @@
 /tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CustomTestFramework.cs                          @DataDog/tracing-dotnet
 /tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/DynamicConfigurationTests.cs                    @DataDog/tracing-dotnet
 /tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/InstrumentationVerificationSanityCheckTests.cs  @DataDog/tracing-dotnet
-/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/ManualInstrumentationTests.cs                   @DataDog/tracing-dotnet
 /tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/NativeProfilerChecks.cs                         @DataDog/tracing-dotnet
-/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/NetActivitySdkTests.cs                          @DataDog/tracing-dotnet
 /tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/NoMultiLoaderTests.cs                           @DataDog/tracing-dotnet
-/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/OpenTelemetrySdkTests.cs                        @DataDog/tracing-dotnet
 /tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersions.g.cs                            @DataDog/tracing-dotnet
 /tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMajors.g.cs                @DataDog/tracing-dotnet
 /tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMinors.g.cs                @DataDog/tracing-dotnet
 /tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestSpecific.g.cs              @DataDog/tracing-dotnet
 /tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/RemotingTests.cs                                @DataDog/tracing-dotnet
 /tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/RuntimeMetricsTests.cs                          @DataDog/tracing-dotnet
 /tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/TelemetryTests.cs                               @DataDog/tracing-dotnet
-/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/TraceAnnotationsTests.cs                        @DataDog/tracing-dotnet
 /tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/TracerFlareTests.cs                             @DataDog/tracing-dotnet
 /tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/TracingIntegrationTest.cs                       @DataDog/tracing-dotnet
 /tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/TransportTests.cs                               @DataDog/tracing-dotnet

.github/pull_request_template.md

@@ -9,4 +9,10 @@
 ## Other details
 <!-- Fixes #{issue} -->
 
-<!--  ⚠️ Note: where possible, please obtain 2 approvals prior to merging. Unless CODEOWNERS specifies otherwise, for external teams it is typically best to have one review from a team member, and one review from apm-dotnet. Trivial changes do not require 2 reviews. -->
+
+<!--  ⚠️ Note:
+
+Where possible, please obtain 2 approvals prior to merging. Unless CODEOWNERS specifies otherwise, for external teams it is typically best to have one review from a team member, and one review from apm-dotnet. Trivial changes do not require 2 reviews.
+
+MergeQueue is NOT enabled in this repository. If you have write access to the repo, the PR has 1-2 approvals (see above), and all of the required checks have passed, you can use the Squash and Merge button to merge the PR. If you don't have write access, or you need help, reach out in the #apm-dotnet channel in Slack.
+-->

.github/workflows/create_draft_release.yml

@@ -138,7 +138,7 @@ jobs:
           dotnet nuget push "*.${{steps.versions.outputs.full_version}}*.nupkg" --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
 
       - name: "Copy gitlab artifacts to artifacts_path"
-        run: cp "${{steps.assets.outputs.gitlab_artifacts_path}}/*.zip" "${{steps.assets.outputs.artifacts_path}}/""
+        run: cp "${{steps.assets.outputs.gitlab_artifacts_path}}/*.zip" "${{steps.assets.outputs.artifacts_path}}/"
 
       - name: 'Push debug symbols to datadog'
         uses: ./.github/actions/publish-debug-symbols

build/cmake/FindRe2.cmake

@@ -8,11 +8,11 @@ if (ISMACOS)
     SET (OSXRE2BUILDCOMMAND
             echo "Building Re2 Arm64" &&
             rm -f -r ${CMAKE_CURRENT_BINARY_DIR}/re2-prefix/src/re2/obj &&
-            ${CMAKE_COMMAND} -E env LDFLAGS=-arch\ arm64 ARFLAGS=-r\ -s\ -c CXXFLAGS=-O3\ -g\ -fPIC\ -target\ arm64-apple-darwin${CMAKE_HOST_SYSTEM_VERSION}\ -Wno-unused-but-set-variable\ -D_GLIBCXX_USE_CXX11_ABI=0 $(MAKE) -j &&
+            ${CMAKE_COMMAND} -E env MAKEFLAGS=-s LDFLAGS=-arch\ arm64 ARFLAGS=-r\ -s\ -c CXXFLAGS=-O3\ -g\ -fPIC\ -target\ arm64-apple-darwin${CMAKE_HOST_SYSTEM_VERSION}\ -Wno-unused-but-set-variable\ -D_GLIBCXX_USE_CXX11_ABI=0 $(MAKE) -j &&
             mv ${CMAKE_CURRENT_BINARY_DIR}/re2-prefix/src/re2/obj/libre2.a ${CMAKE_CURRENT_BINARY_DIR}/re2-prefix/src/re2/libre2.arm64.a &&
             echo "Building Re2 X86_64" &&
             rm -f -r ${CMAKE_CURRENT_BINARY_DIR}/re2-prefix/src/re2/obj &&
-            ${CMAKE_COMMAND} -E env LDFLAGS=-arch\ x86_64 ARFLAGS=-r\ -s\ -c CXXFLAGS=-O3\ -g\ -fPIC\ -target\ x86_64-apple-darwin${CMAKE_HOST_SYSTEM_VERSION}\ -Wno-unused-but-set-variable\ -D_GLIBCXX_USE_CXX11_ABI=0 $(MAKE) -j &&
+            ${CMAKE_COMMAND} -E env MAKEFLAGS=-s LDFLAGS=-arch\ x86_64 ARFLAGS=-r\ -s\ -c CXXFLAGS=-O3\ -g\ -fPIC\ -target\ x86_64-apple-darwin${CMAKE_HOST_SYSTEM_VERSION}\ -Wno-unused-but-set-variable\ -D_GLIBCXX_USE_CXX11_ABI=0 $(MAKE) -j &&
             mv ${CMAKE_CURRENT_BINARY_DIR}/re2-prefix/src/re2/obj/libre2.a ${CMAKE_CURRENT_BINARY_DIR}/re2-prefix/src/re2/libre2.x86_64.a &&
             echo "Creating Re2 universal binary" &&
             lipo ${CMAKE_CURRENT_BINARY_DIR}/re2-prefix/src/re2/libre2.arm64.a ${CMAKE_CURRENT_BINARY_DIR}/re2-prefix/src/re2/libre2.x86_64.a -create -output ${CMAKE_CURRENT_BINARY_DIR}/re2-prefix/src/re2/obj/libre2.a
@@ -27,6 +27,9 @@ if (ISMACOS)
         BUILD_COMMAND ${OSXRE2BUILDCOMMAND}
         BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/re2-prefix/src/re2/obj/libre2.a
     )
+
+    set_property(TARGET re2 PROPERTY JOB_SERVER_AWARE TRUE)
+
 elseif(ISLINUX)
     ExternalProject_Add(re2
         DOWNLOAD_COMMAND ${DOWNLOAD_COMMAND}

docker-compose.yml

@@ -348,6 +348,7 @@ services:
       - IncludeMinorPackageVersions=${IncludeMinorPackageVersions:-false}
       - enable_crash_dumps=${enable_crash_dumps:-true}
       - DD_LOGGER_DD_API_KEY
+      - DD_LOGGER_DD_TRACE_LOG_DIRECTORY=/project/artifacts/build_data/infra_logs
       - DD_LOGGER_DD_SERVICE
       - DD_LOGGER_DD_ENV
       - DD_LOGGER_ENABLED
@@ -426,6 +427,7 @@ services:
       - COUCHBASE_PORT=8091
       - CONTAINER_HOSTNAME=http://integrationtests
       - DD_LOGGER_DD_API_KEY
+      - DD_LOGGER_DD_TRACE_LOG_DIRECTORY=/project/artifacts/build_data/infra_logs
       - DD_LOGGER_DD_SERVICE
       - DD_LOGGER_DD_ENV
       - DD_LOGGER_ENABLED
@@ -496,6 +498,7 @@ services:
       - Verify_DisableClipboard=true
       - DiffEngine_Disabled=true
       - DD_LOGGER_DD_API_KEY
+      - DD_LOGGER_DD_TRACE_LOG_DIRECTORY=/project/artifacts/build_data/infra_logs
       - DD_LOGGER_DD_SERVICE
       - DD_LOGGER_DD_ENV
       - DD_LOGGER_ENABLED
@@ -552,6 +555,7 @@ services:
       - CONTAINER_HOSTNAME=http://integrationtests
       - IncludeAllTestFrameworks
       - DD_LOGGER_DD_API_KEY
+      - DD_LOGGER_DD_TRACE_LOG_DIRECTORY=/project/artifacts/build_data/infra_logs
       - DD_LOGGER_DD_SERVICE
       - DD_LOGGER_DD_ENV
       - DD_LOGGER_ENABLED
@@ -602,6 +606,7 @@ services:
       - IncludeAllTestFrameworks
       - DD_CLR_ENABLE_NGEN=${DD_CLR_ENABLE_NGEN:-1}
       - DD_LOGGER_DD_API_KEY
+      - DD_LOGGER_DD_TRACE_LOG_DIRECTORY=/project/artifacts/build_data/infra_logs
       - DD_LOGGER_DD_SERVICE
       - DD_LOGGER_DD_ENV
       - DD_LOGGER_ENABLED
@@ -693,6 +698,7 @@ services:
       - RABBITMQ_HOST=rabbitmq_arm64
       - AWS_SDK_HOST=localstack_arm64:4566
       - DD_LOGGER_DD_API_KEY
+      - DD_LOGGER_DD_TRACE_LOG_DIRECTORY=/project/artifacts/build_data/infra_logs
       - DD_LOGGER_DD_SERVICE
       - DD_LOGGER_DD_ENV
       - DD_LOGGER_ENABLED
@@ -771,6 +777,7 @@ services:
       - Verify_DisableClipboard=true
       - DiffEngine_Disabled=true
       - DD_LOGGER_DD_API_KEY
+      - DD_LOGGER_DD_TRACE_LOG_DIRECTORY=/project/artifacts/build_data/infra_logs
       - DD_LOGGER_DD_SERVICE
       - DD_LOGGER_DD_ENV
       - DD_LOGGER_ENABLED
@@ -1177,3 +1184,7 @@ services:
     environment:
       - ACCEPT_EULA=Y
       - SA_PASSWORD=Strong!Passw0rd
+
+  # keep syncronized image version with tracer\test\Datadog.Trace.TestHelpers.AutoInstrumentation\Containers\AerospikeFixture.cs
+  aerospike:
+    image: aerospike/aerospike-server:6.2.0.6

docs/CHANGELOG.md

@@ -24,6 +24,69 @@
 
 
 
+
+
+## [Release 3.23.0](https://github.com/DataDog/dd-trace-dotnet/releases/tag/v3.23.0)
+
+## Summary
+
+- [Tracer] Baggage tags are automatically added as span tags
+- [Tracer] Fix resource-based sampling for ASP.NET Core
+- [Test Optimization] Various fixes for commit info and codeowners
+- [Test Optimization] Fix crash with Allure.Xunit
+- [IAST] Fix potential crash on `ReadOnlySpan<>` `string.Concat()` methods
+
+## Changes
+
+### Tracer
+* feat(baggage): adding baggage to span tags (#7020)
+* Swap disposal ordering of inferred span (#7293)
+* Add `[MethodImpl(MethodImplOptions.NoInlining]` to all our instrumented APIs in Datadog.Trace.Manual (#7302)
+* Refactor `TraceSampler` to separate building from evaluation (#7311)
+* Avoid generating resource name that will be thrown away if it's not required (#7312)
+* Fix resource-based sampling for ASP.NET Core (#7316)
+
+### CI Visibility
+* [Test Optimization] Retrieve head commit info (#7285)
+* [Test Optimization] Add codeowners and test source file tag at suite level (#7295)
+* [Test Optimization] Fix base branch SHA usage (#7300)
+* [Test Optimization] Avoid crashing on Allure.Xunit usage (#7305)
+
+### ASM
+* [AAP] Update WAF to v1.27.0 (#7330)
+
+### Continuous Profiler
+* [Profiler] Use ringbuffer with timer create (#7066)
+
+### Fixes
+* [IAST] Remove troublesome string.Concat overloads with ReadOnlySpan<char> (#7318)
+
+### Miscellaneous
+* Set default timeout for Trace Exporter to 15s. (#7252)
+* [OTEL] OTLP Metrics Exporter POC (#7138)
+* [Test Package Versions Bump] Updating package versions (#7279)
+* [Profiler] Add vcpkg setup for build (#7292)
+* Ensure file_opened_ is getting updated when rotating (#7296)
+* Bump rejit timeout to 200ms (#7301)
+
+### Build / Test
+* Filter connection header in flaky tests (#7290)
+* Remove global state to try to fix flake (#7291)
+* Improve repeatability & precision of throughput tests on Linux & ARM (#7268)
+* More fixes for do-not-merge (#7274)
+* Update the Windows test agent to latest (#7275)
+* Fix potential deadlocks in `IisFixture` process code (#7281)
+* [Profiler] Fix and bump timeitsharp (#7294)
+* Fix debug symbol upload in release (#7297)
+* Additional test that requires HTTP FP connection header scrubbing (#7306)
+* Bump timeitsharp to v0.4.5 (#7308)
+* Avoid using GITHUB_TOKEN for pr creation (#7310)
+* Fix octo sts trust policy subject (#7313)
+* Write `DD_LOGGER_` logs to a separate un-checked location (#7323)
+* Add note about MergeQueue (`/merge`) to PR template (#7329)
+
+
+[Changes since 3.22.0](https://github.com/DataDog/dd-trace-dotnet/compare/v3.22.0...v3.23.0)
 
 ## [Release 3.22.0](https://github.com/DataDog/dd-trace-dotnet/releases/tag/v3.22.0)
 

profiler/README.MD

@@ -29,6 +29,31 @@ You can develop the profiler on various environments.
     - .NET Framework 4.7 targeting pack
     - C++ for Linux Development
     - Windows 10 SDK (10.0.18362)
+    - vcpkg manager
+
+It is needed to setup vcpkg by following the first steps of [the documentation](https://learn.microsoft.com/en-us/vcpkg/get_started/get-started-msbuild):
+
+1. Clone the vcpkg repository
+   ```cmd
+   git clone https://github.com/microsoft/vcpkg.git
+   ```
+
+2. Run the bootstrap script
+
+   Now that you have cloned the vcpkg repository, navigate to the vcpkg directory and execute the bootstrap script:
+
+   ```cmd
+   cd vcpkg; .\bootstrap-vcpkg.bat
+   ```
+
+
+3. Integrate with Visual Studio MSBuild
+
+   Run the following command:
+   ```cmd
+   .\vcpkg.exe integrate install
+   ```
+
 
 #### Building in Visual Studio