Merge branch 'master' into mohammad/mass_transit_intg

Author: chojomok

.azure-pipelines/ultimate-pipeline.yml

@@ -143,7 +143,7 @@ variables:
   DD_LOGGER_DD_TAGS: test.configuration.job:$(System.JobDisplayName)
   DD_LOGGER_ENABLED: true
   DD_COLLECTOR_CPU_USAGE: true
-  ToolVersion: 3.35.0
+  ToolVersion: 3.37.0
   # .NET SDK performance optimization variables
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
@@ -1710,12 +1710,25 @@ stages:
         SampleName: $(IntegrationTestSampleName)
 
     - script: tracer\build.cmd RunIntegrationTests RunWindowsRegressionTests -Framework $(framework) --code-coverage-enabled $(CodeCoverageEnabled)
-      displayName: Run integration tests
+      displayName: Run integration tests (Tracer)
+      condition: ne(variables['area'], 'ASM')
+      env:
+        DD_LOGGER_DD_API_KEY: $(ddApiKey)
+        enable_crash_dumps: true
+        Filter: $(IntegrationTestFilter)
+        SampleName: $(IntegrationTestSampleName)
+        Area: $(area)
+
+    - script: tracer\build.cmd RunIntegrationTests RunWindowsRegressionTests -Framework $(framework) --code-coverage-enabled $(CodeCoverageEnabled)
+      displayName: Run integration tests (ASM)
+      condition: eq(variables['area'], 'ASM')
+      retryCountOnTaskFailure: 2
       env:
         DD_LOGGER_DD_API_KEY: $(ddApiKey)
         enable_crash_dumps: true
         Filter: $(IntegrationTestFilter)
         SampleName: $(IntegrationTestSampleName)
+        Area: $(area)
 
 #    TODO: Re-enable test-agent.windows once VM images are updated (hitting rate limits for docker)
 #    - script: docker compose -f docker-compose.windows.yml down
@@ -2272,7 +2285,26 @@ stages:
           -e SampleName=$(IntegrationTestSampleName) \
           -e Area=$(area) \
           IntegrationTests
-      displayName: docker-compose run IntegrationTests
+      displayName: docker-compose run IntegrationTests (Tracer)
+      condition: ne(variables['area'], 'ASM')
+      env:
+        DD_LOGGER_DD_API_KEY: $(ddApiKey)
+        baseImage: $(baseImage) # for interpolation in the docker-compose file
+
+    - script: |
+        docker-compose -f docker-compose.yml -p $(DockerComposeProjectName) \
+          run --no-deps --rm \
+          -e baseImage=$(baseImage) \
+          -e framework=$(publishTargetFramework) \
+          -e CodeCoverageEnabled=$(CodeCoverageEnabled) \
+          -e IncludeTestsRequiringDocker=false  \
+          -e Filter=$(IntegrationTestFilter) \
+          -e SampleName=$(IntegrationTestSampleName) \
+          -e Area=$(area) \
+          IntegrationTests
+      displayName: docker-compose run IntegrationTests (ASM)
+      condition: eq(variables['area'], 'ASM')
+      retryCountOnTaskFailure: 2
       env:
         DD_LOGGER_DD_API_KEY: $(ddApiKey)
         baseImage: $(baseImage) # for interpolation in the docker-compose file
@@ -4511,32 +4543,32 @@ stages:
           sampleName: Computer01
           testName: cpu-walltime
           poolName: ProfilerExecBenchAgent1
-          framework: net7.0
+          framework: net10.0
         Exceptions:
           sampleName: ExceptionGenerator
           testName: exceptions
           poolName: ProfilerExecBenchAgent2
-          framework: net7.0
+          framework: net10.0
         Contention:
           sampleName: Computer01
           testName: contention
           poolName: ProfilerExecBenchAgent3
-          framework: net7.0
+          framework: net10.0
         Allocations:
           sampleName: Computer01
           testName: allocations
           poolName: ProfilerExecBenchAgent4
-          framework: net7.0
+          framework: net10.0
         LiveHeap:
           sampleName: Computer01
           testName: liveheap
           poolName: ProfilerExecBenchAgent5
-          framework: net7.0
+          framework: net10.0
         GarbageCollections:
           sampleName: Computer01
           testName: garbagecollections
           poolName: ProfilerExecBenchAgent11
-          framework: net7.0
+          framework: net10.0
     pool:
       name: $(poolName)
     timeoutInMinutes: 30 #default value
@@ -4605,32 +4637,32 @@ stages:
           sampleName: Computer01
           testName: cpu-walltime
           poolName: ProfilerExecBenchAgent6
-          framework: net7.0
+          framework: net10.0
         Exceptions:
           sampleName: ExceptionGenerator
           testName: exceptions
           poolName: ProfilerExecBenchAgent7
-          framework: net7.0
+          framework: net10.0
         Contention:
           sampleName: Computer01
           testName: contention
           poolName: ProfilerExecBenchAgent8
-          framework: net7.0
+          framework: net10.0
         Allocations:
           sampleName: Computer01
           testName: allocations
           poolName: ProfilerExecBenchAgent9
-          framework: net7.0
+          framework: net10.0
         LiveHeap:
           sampleName: Computer01
           testName: liveheap
           poolName: ProfilerExecBenchAgent10
-          framework: net7.0
+          framework: net10.0
         GarbageCollections:
           sampleName: Computer01
           testName: garbagecollections
           poolName: ProfilerExecBenchAgent12
-          framework: net7.0
+          framework: net10.0
     pool:
       name: $(poolName)
     timeoutInMinutes: 30 #default value

.editorconfig

@@ -82,3 +82,20 @@ csharp_new_line_before_members_in_anonymous_types = true
 # Rider
 csharp_keep_existing_initializer_arrangement=true
 csharp_keep_existing_arrangement=true
+
+# Config registry banned api configuration
+# Error when static analyzers aren't respected
+dotnet_diagnostic.RS0030.severity = error
+
+## Exceptions for banned apis:
+# - EnvironmentHelpers.GetEnvironmentVariable (DD0011/DD0012)
+# - EnvironmentHelpersNoLogging.GetEnvironmentVariable (DD0011/DD0012)
+# - EnvironmentHelpers.EnvironmentVariableExists (DD0011/DD0012)
+# - EnvironmentHelpersNoLogging.EnvironmentVariableExists (DD0011/DD0012)
+# - EnvironmentVariablesProvider.GetValue (DD0011/DD0012)
+# - EnvironmentConfigurationSource.GetEnvironmentVariable (RS0030)
+# - IConfigurationSource.Get* methods (GetString, GetInt32, GetDouble, GetBool, GetDictionary, GetAs) (DD0013/DD0014)
+
+# Disables static analyzer errors for a specific folder
+[/tracer/src/Datadog.Trace/Vendors/**.*]
+dotnet_diagnostic.RS0030.severity = none

.github/CODEOWNERS

@@ -91,6 +91,29 @@
 /tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/TracingIntegrationTest.cs                       @DataDog/tracing-dotnet
 /tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/TransportTests.cs                               @DataDog/tracing-dotnet
 
+## Serverless (AWS Lambda)
+/tracer/src/**/*Lambda*                                                         @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-aws
+/tracer/test/**/*Lambda*                                                        @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-aws
+/tracer/build/_build/docker/serverless.lambda.dockerfile                        @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-aws
+/docker-compose.serverless.yml                                                  @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-aws
+/.gitlab/download-serverless-artifacts.sh                                       @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-aws
+/docs/development/**/*Lambda*.md                                                @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-aws
+
+## Serverless (Azure)
+/tracer/src/**/*AzureAppService*.cs                                             @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
+/tracer/src/**/*AzureFunctions*.cs                                              @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
+/tracer/src/Datadog.AzureFunctions/                                             @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
+/tracer/test/**/*AzureAppService*.cs                                            @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
+/tracer/test/**/*AzureFunctions*.cs                                             @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
+/tracer/test/test-applications/azure-functions/                                 @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
+/tracer/test/Datadog.Trace.ClrProfiler.Managed.Tests/HttpBypassTests.cs         @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
+/tracer/samples/AzureFunctionsWithAgentLessLogging/                             @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
+/docs/development/**/AzureFunctions*.md                                         @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
+
+## Serverless (GCP)
+/tracer/src/**/*GCP*.cs                                                         @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
+/tracer/test/**/*GCP*.cs                                                        @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
+
 # ASM
 /tracer/src/Datadog.Trace/AppSec/         @DataDog/asm-dotnet
 /tracer/src/Datadog.Tracer.Native/iast/    @DataDog/asm-dotnet
@@ -142,28 +165,14 @@ Datadog.Trace.Debugger.slnf                @DataDog/debugger-dotnet
 # Exploration tests
 /tracer/build/_build/Build.ExplorationTests.cs @DataDog/debugger-dotnet @DataDog/tracing-dotnet @DataDog/profiling-dotnet
 
-## Serverless (AWS Lambda)
-/tracer/src/**/*Lambda*                                                         @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-aws
-/tracer/test/**/*Lambda*                                                        @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-aws
-/tracer/build/_build/docker/serverless.lambda.dockerfile                        @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-aws
-/docker-compose.serverless.yml                                                  @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-aws
-/.gitlab/download-serverless-artifacts.sh                                       @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-aws
-/docs/development/**/*Lambda*.md                                                @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-aws
-
-## Serverless (Azure)
-/tracer/src/**/*AzureAppService*.cs                                             @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
-/tracer/src/**/*AzureFunctions*.cs                                              @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
-/tracer/src/Datadog.AzureFunctions/                                             @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
-/tracer/test/**/*AzureAppService*.cs                                            @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
-/tracer/test/**/*AzureFunctions*.cs                                             @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
-/tracer/test/test-applications/azure-functions/                                 @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
-/tracer/test/Datadog.Trace.ClrProfiler.Managed.Tests/HttpBypassTests.cs         @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
-/tracer/samples/AzureFunctionsWithAgentLessLogging/                             @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
-/docs/development/**/AzureFunctions*.md                                         @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
-
-## Serverless (GCP)
-/tracer/src/**/*GCP*.cs                                                         @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
-/tracer/test/**/*GCP*.cs                                                        @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
+## Feature Flagging and Experimentation
+/tracer/src/Datadog.Trace/FeatureFlags/                                                        @DataDog/feature-flagging-and-experimentation-sdk @DataDog/tracing-dotnet
+/tracer/src/Datadog.Trace.Manual/FeatureFlags/                                                 @DataDog/feature-flagging-and-experimentation-sdk @DataDog/tracing-dotnet
+/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/ManualInstrumentation/FeatureFlags/  @DataDog/feature-flagging-and-experimentation-sdk @DataDog/tracing-dotnet
+/tracer/test/Datadog.Trace.Tests/FeatureFlags/                                                 @DataDog/feature-flagging-and-experimentation-sdk @DataDog/tracing-dotnet
+/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/FeatureFlags/                          @DataDog/feature-flagging-and-experimentation-sdk @DataDog/tracing-dotnet
+/tracer/test/test-applications/integrations/Samples.FeatureFlags/                              @DataDog/feature-flagging-and-experimentation-sdk @DataDog/tracing-dotnet
+/tracer/test/test-applications/integrations/Samples.OpenFeature/                               @DataDog/feature-flagging-and-experimentation-sdk @DataDog/tracing-dotnet
 
 # Shared code we could move to the root folder
 /tracer/build/                            @DataDog/apm-dotnet

.github/workflows/_create_draft_release.yml

@@ -44,6 +44,7 @@ jobs:
   create_draft_release:
     runs-on: ubuntu-latest
     environment: publish-debug-symbols-env
+    # These permissions need to map to the ones demanded in create_normal_draft_release.yml and create_hotfix_draft_release.yml
     permissions:
       contents: write # create release
       actions: read # read secrets

.github/workflows/create_hotfix_draft_release.yml

@@ -28,6 +28,11 @@ jobs:
     create_hotfix_draft_release:
         needs: check_branch
         uses: ./.github/workflows/_create_draft_release.yml
+        # These permissions need to map to the ones demanded in _create_draft_release.yml
+        permissions:
+          contents: write # create release
+          actions: read # read secrets
+          issues: write # change milestones 
         with:
             forced_commit_id: ${{ inputs.forced_commit_id }}
             ignore_gitlab_failures: ${{ inputs.ignore_gitlab_failures }}

.github/workflows/create_normal_draft_release.yml

@@ -28,6 +28,11 @@ jobs:
     create_normal_draft_release:
         needs: check_branch
         uses: ./.github/workflows/_create_draft_release.yml
+        # These permissions need to map to the ones demanded in _create_draft_release.yml
+        permissions:
+          contents: write # create release
+          actions: read # read secrets
+          issues: write # change milestones 
         with:
             forced_commit_id: ${{ inputs.forced_commit_id }}
             ignore_gitlab_failures: ${{ inputs.ignore_gitlab_failures }}

.gitlab-ci.yml

@@ -13,6 +13,7 @@ variables:
   DOTNET_PACKAGE_VERSION:
     description: "Used by the package stage when triggered manually"
   REPO_NOTIFICATION_CHANNEL: "#apm-dotnet-bots"
+  CI_IDENTITIES_CLIENT_URL: s3://binaries-ddbuild-io-prod/ci-identities/ci-identities-gitlab-job-client/versions/v0.2.0/ci-identities-gitlab-job-client-windows-amd64.exe
 
 build:
   except:
@@ -37,7 +38,9 @@ build:
         -e AWS_NETWORKING=true `
         -e SIGN_WINDOWS=true `
         -e NUGET_CERT_REVOCATION_MODE=offline `
-        registry.ddbuild.io/images/mirror/datadog/dd-trace-dotnet-docker-build:dotnet10 `
+        -e CI_IDENTITIES_GITLAB_ID_TOKEN `
+        -e CI_PROJECT_NAME `
+        registry.ddbuild.io/images/mirror/datadog/dd-trace-dotnet-docker-build:ci-identities `
         Info Clean BuildTracerHome BuildProfilerHome BuildNativeLoader BuildDdDotnet PublishFleetInstaller PackageTracerHome ZipSymbols SignDlls SignMsi DownloadWinSsiTelemetryForwarder
     - mkdir artifacts-out
     - xcopy /e/s build-out\${CI_JOB_ID}\*.* artifacts-out
@@ -48,6 +51,9 @@ build:
     expire_in: 2 weeks
     paths:
     - artifacts-out
+  id_tokens:
+    CI_IDENTITIES_GITLAB_ID_TOKEN:
+      aud: ci-identities
 
 publish:
   only:
@@ -67,19 +73,17 @@ publish:
     pre_get_sources_script:
       - git config --system core.longpaths true
   script:
-    - $result =  aws sts assume-role --role-arn "arn:aws:iam::486234852809:role/ci-datadog-windows-filter" --role-session-name AWSCLI-Session
-    - $resultjson = $result | convertfrom-json
-    - $credentials = $($resultjson.Credentials)
-    - $Env:AWS_ACCESS_KEY_ID="$($credentials.AccessKeyId)"
-    - $Env:AWS_SECRET_ACCESS_KEY="$($credentials.SecretAccessKey)"
-    - $Env:AWS_SESSION_TOKEN="$($credentials.SessionToken)"
+    # TODO remove the aws s3 cp command
+    # when the client is installed in the Windows runner image
+    - aws s3 cp --only-show-errors ${CI_IDENTITIES_CLIENT_URL} ./ci-identities-gitlab-job-client.exe
+    - ./ci-identities-gitlab-job-client.exe assume-role
     - |
       $i = 0
       do {
           try {
               # The grants option at the end is used to allow public access on the files we upload as the acls only aren't enough.
               aws s3 cp artifacts-out/ s3://dd-windowsfilter/builds/tracer/${CI_COMMIT_SHA} --recursive --region us-east-1 --exclude "*" --include "*.zip" --include "*.msi" --include "telemetry_forwarder.exe" --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers full=id=3a6e02b08553fd157ae3fb918945dd1eaae5a1aa818940381ef07a430cf25732
-              If ($LASTEXITCODE -eq 0) { 
+              If ($LASTEXITCODE -eq 0) {
                 return
               }
 
@@ -95,6 +99,11 @@ publish:
       # If we got here, all retries failed – fail the job:
       Write-Error "Failed to upload artifacts to S3 after $i attempts."
       exit 1
+  variables:
+    AWS_SHARED_CREDENTIALS_FILE: ${CI_PROJECT_DIR}\.aws\credentials-by-job-id\${CI_JOB_ID}
+  id_tokens:
+    CI_IDENTITIES_GITLAB_ID_TOKEN:
+      aud: ci-identities
 
 
 download-single-step-artifacts:
@@ -245,4 +254,4 @@ validate_supported_configurations_local_file:
     - when: on_success
   extends: .validate_supported_configurations_local_file
   variables:
-    LOCAL_JSON_PATH: "tracer/src/Datadog.Trace/Configuration/supported-configurations.json"
+    LOCAL_JSON_PATH: "tracer/src/Datadog.Trace/Configuration/supported-configurations.json"