Merge tag 'v3.3.1' into korniltsev/merge_upstream_v3.3.1

Author: korniltsev

.azure-pipelines/steps/clean-docker-containers.yml

@@ -0,0 +1,16 @@
+steps:
+- bash: |
+    ids=$(docker ps -q -a)
+    if [ ! -z "$ids" ]; then
+      docker rm -f $ids
+    fi
+  displayName: Clean docker
+  condition: and(succeeded(), not(eq(variables['Agent.OS'], 'Windows_NT')))
+
+- powershell: |
+    $ids = $(docker ps -q -a)
+    if ($ids) {
+      docker rm -f $ids
+    }
+  displayName: Clean Windows docker
+  condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))

.azure-pipelines/steps/install-docker-compose-v1.yml

@@ -0,0 +1,24 @@
+parameters:
+  - name: isLinux
+    type: boolean
+    default: false
+  
+  - name: 'dockerComposePath'
+    type: string
+    default: 'C:/docker-compose/docker-compose.exe'
+
+steps:
+- ${{ if eq(parameters.isLinux, true) }}:
+  - bash: |
+      sudo mkdir -p "$(dirname "${{ parameters.dockerComposePath }}")" 
+      sudo curl -SL https://github.com/docker/compose/releases/download/1.29.2/docker-compose-linux-x86_64 -o ${{ parameters.dockerComposePath }}
+      sudo chmod 755 ${{ parameters.dockerComposePath }}
+    displayName: Download docker-compose
+- ${{ else }}:
+  - powershell: |
+      $dir= (Split-Path -parent "${{ parameters.dockerComposePath }}")
+      mkdir -f -p $dir
+      # GitHub now requires TLS1.2. In PowerShell, run the following
+      [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+      Invoke-WebRequest "https://github.com/docker/compose/releases/download/1.29.1/docker-compose-windows-x86_64.exe" -OutFile "${{ parameters.dockerComposePath }}"
+    displayName: Download docker-compose

.azure-pipelines/steps/install-msi.yml

@@ -0,0 +1,44 @@
+parameters:
+  - name: url
+    type: string
+
+  - name: filename
+    type: string
+
+  - name: msiParams
+    type: string
+    default: ''
+
+  - name: addToPath
+    type: string
+    default: ''
+    
+  - name: retries
+    type: number
+    default: 3
+
+steps:
+  - powershell: |
+      $ErrorActionPreference = 'Stop'
+
+      $url = "${{ parameters.url }}";
+      $file = "$(Agent.TempDirectory)\${{ parameters.filename }}"
+      Write-Host "Downloading from $url to $file";
+      Invoke-WebRequest -Uri $url -OutFile $file
+      
+      $installArgs = "/i $file ${{ parameters.msiParams }} /norestart"
+      Write-Host "Installing using msiexec $installArgs";
+      Start-Process msiexec $installArgs -Wait
+      Write-Host "Installed";
+
+      if("${{ parameters.addToPath }}") {
+        Write-Host "Adding to PATH";
+        Write-Host "##vso[task.setvariable variable=PATH;]${env:PATH};${{ parameters.addToPath }}";
+      }
+      
+      Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
+      refreshenv
+    displayName: Installing ${{ parameters.filename }}
+    condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT')) # TODO: error on non-windows? 
+    retryCountOnTaskFailure: ${{ parameters.retries }}
+    timeoutInMinutes: 10

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Helpdesk support
+    url: https://help.datadoghq.com/hc/en-us/requests/new?tf_1260824651490=pt_product_type:apm&tf_1900004146284=pt_apm_language:.net
+    about: This option creates an expedited Bug Report via the helpdesk (no login required). This will allow us to look up your account and allows you to provide additional information in private.

.github/actions/code-freeze/action.yml

@@ -0,0 +1,66 @@
+name: "Code Freeze PRs"
+description: 'Code Freeze PRs'
+
+inputs:
+  page_number:
+    description: "Page number"
+    required: true
+  github_token:
+    description: 'Github token'
+    required: true
+  end_freeze:
+    description: "Start or stop code freeze"
+    default: "false"
+
+runs:
+  using: "composite"
+  steps:
+    - uses: octokit/[email protected]
+      name: 'Get open PRs'
+      id: prs
+      with:
+        route: GET /repos/{owner}/{repo}/pulls
+        owner: DataDog
+        repo: dd-trace-dotnet
+        state: open
+        per_page: 25
+        page: ${{inputs.page_number}}
+      env:
+        GITHUB_TOKEN: "${{ inputs.github_token }}"
+
+    - name: 'Update all PRs with Code Freeze status'
+      shell: bash
+      env:
+        github_token: "${{ inputs.github_token }}"
+      run: |
+        set -o pipefail
+        
+        targetUrl="https://github.com/DataDog/dd-trace-dotnet/actions/workflows/code_freeze_start.yml"
+        state="failure"
+        description="A code freeze is in place"
+        
+        if ${{ inputs.end_freeze }} ; then
+          targetUrl="https://github.com/DataDog/dd-trace-dotnet/actions/workflows/code_freeze_end.yml"
+          state="success"
+          description="No code freeze is in place"
+        fi
+        
+        json=$(cat << 'ENDOFMESSAGE'
+          ${{ steps.prs.outputs.data }}
+        ENDOFMESSAGE
+        )
+        arrayLength=$(echo $json | jq -r 'length')
+        echo "Updating code freeze  status for $arrayLength PRs" 
+      
+        arrayLength=$((arrayLength-1))
+        for i in $(seq 0 $arrayLength); do
+          title=$(echo $json | jq -r ".[$i].title")
+          echo "Setting code freeze for '$title'" 
+          sha=$(echo $json | jq -r ".[$i].head.sha")
+      
+          curl -X POST \
+            -H "Accept: application/vnd.github.v3+json" \
+            -H "Authorization: Bearer ${{ env.github_token }}" \
+              "https://api.github.com/repos/DataDog/dd-trace-dotnet/statuses/$sha" \
+              -d '{"state":"'"$state"'","context":"code_freeze","description":"'"$description"'","target_url":"'"$targetUrl"'"}'
+        done

.github/actions/create-system-test-docker-base-images/action.yml

@@ -0,0 +1,59 @@
+name: 'Build System-test base images'
+description: 'Builds the system-test docker base images'
+
+inputs:
+  artifacts_path:
+    description: 'The location of the assets to use in the current workflow'
+    required: true
+
+  package_version:
+    description: 'The package version of the assets being used'
+    required: true
+
+  lib_waf_version:
+    description: 'The version of the WAF being used'
+    required: true
+
+  waf_rules_version:
+    description: 'The version of the rules being used'
+    required: true
+
+  github_token:
+    description: 'Github token for pushing images to ghcr.io Docker repository'
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+
+    - name: Copy tooling files to artifacts path
+      shell: bash
+      run: |
+        echo "OUTPUT ARTIFACT PATH: ${{inputs.artifacts_path}}"
+        cp ./tracer/build/_build/docker/system-tests.dockerfile ${{inputs.artifacts_path}}
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Login to Docker
+      shell: bash
+      run: docker login -u publisher -p ${{ inputs.github_token }} ghcr.io
+
+    - name: Docker Build linux-x64 and linux-arm64 images
+      uses: docker/build-push-action@v3
+      with:
+        push: true
+        tags: ghcr.io/datadog/dd-trace-dotnet/dd-trace-dotnet:latest_snapshot
+        platforms: 'linux/amd64,linux/arm64'
+        context: ${{inputs.artifacts_path}}
+        file: ${{inputs.artifacts_path}}/system-tests.dockerfile
+        build-args: |
+          LINUX_AMD64_PACKAGE=datadog-dotnet-apm-${{inputs.package_version}}.tar.gz
+          LINUX_ARM64_PACKAGE=datadog-dotnet-apm-${{inputs.package_version}}.arm64.tar.gz
+          LIBRARY_VERSION=${{inputs.package_version}}
+          LIBDDWAF_VERSION=${{inputs.lib_waf_version}}
+          APPSEC_EVENT_RULES_VERSION=${{inputs.waf_rules_version}}

.github/actions/deploy-aas-dev-apps/action.yml

@@ -0,0 +1,19 @@
+name: 'Deploy AAS dev app'
+description: 'Deploy AAS dev app'
+
+inputs:
+  aas_github_token:
+    description: 'aas_github_token'
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: Trigger AAS deploy
+      shell: bash
+      run: |
+        curl -X POST \
+        -H "Accept: application/vnd.github.v3+json" \
+        -H "Authorization: Bearer ${{ inputs.aas_github_token }}" \
+        https://api.github.com/repos/DataDog/datadog-aas-extension/dispatches \
+        -d '{"event_type": "dd-trace-dotnet-nightly", "client_payload": {"sha":"'"$GITHUB_SHA"'" } }'

.gitignore

@@ -64,6 +64,7 @@ bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
+.nuke/temp/
 
 # Visual Studio 2015 cache/options directory
 .vs/
@@ -354,12 +355,15 @@ shared/src/Datadog.Trace.ClrProfiler.Native/CMakeCache.txt
 shared/src/Datadog.Trace.ClrProfiler.Native/cmake_install.cmake
 shared/src/Datadog.Trace.ClrProfiler.Native/cmake-build-debug/
 !shared/src/Datadog.Trace.ClrProfiler.Native/lib/**
+cmake-build-debug/*
 
 #profiler build files
 profiler/_build/
 
 # global build folder
 obj/*
+obj_arm64/*
+obj_x86_64/*
 
 # cmake build files
 .ionide/
@@ -370,3 +374,11 @@ CMakeFiles/
 lib/
 libdatadog-*/
 *-prefix/
+cmake-build-debug/
+.cmake/
+
+#jetbrains cache folder
+.cache/jb
+
+#datadog coverage
+datadog-coverage-*