Merge from main, resolve conflicts

newrelic · Jul 11, 2024 · 814a557 · 814a557
2 parents bc612cf + b24d2c9
commit 814a557
Show file tree

Hide file tree

Showing 29 changed files with 486 additions and 258 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -5,4 +5,4 @@
 # the repo. Unless a later match takes precedence,
 # the users listed below will be requested for
 # review when someone opens a pull request.
-* @newrelic/dotnet-code-reviewers
+* @newrelic/DOTNET
diff --git a/.github/workflows/all_solutions.yml b/.github/workflows/all_solutions.yml
@@ -71,7 +71,7 @@ jobs:
  shell: powershell
 
  - name: Archive FullAgent Home folders
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+ uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
  with:
  name: homefolders
  path: |
@@ -115,7 +115,7 @@ jobs:
  shell: powershell
 
  - name: Archive msi _build Artifacts
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+ uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
  with:
  name: msi-build-folder-artifacts
  path: ${{ github.workspace }}\src\_build
@@ -160,7 +160,7 @@ jobs:
  shell: powershell
 
  - name: Archive Artifacts
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+ uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
  with:
  name: integrationtests
  path: |
@@ -198,7 +198,7 @@ jobs:
  shell: powershell
 
  - name: Archive Artifacts
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+ uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
  with:
  name: unboundedintegrationtests
  path: |
@@ -312,13 +312,13 @@ jobs:
  shell: pwsh #this doesn't work with normal powershell due to UTF-8 BOM handling
 
  - name: Download Agent Home Folders
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  name: homefolders
  path: src/Agent
 
  - name: Download Integration Test Artifacts
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  name: integrationtests
  # Should not need a path because the integration test artifacts are archived with the full directory structure
@@ -361,7 +361,7 @@ jobs:
 
  - name: Archive integration test results on failure
  if: ${{ failure() }}
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+ uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
  with:
  name: integration-test-results-${{ matrix.namespace }}
  path: |
@@ -413,13 +413,13 @@ jobs:
  fetch-depth: 0
 
  - name: Download Agent Home Folders
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  name: homefolders
  path: src/Agent
 
  - name: Download Unbounded Integration Test Artifacts
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  name: unboundedintegrationtests
  # Should not need a path because the integration test artifacts are archived with the full directory structure
@@ -494,7 +494,7 @@ jobs:
 
  - name: Archive unbounded test results on failure
  if: ${{ failure() }}
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+ uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
  with:
  name: unbounded-test-working-directory-${{ matrix.namespace }}
  path: |
@@ -521,13 +521,13 @@ jobs:
  fetch-depth: 0
 
  - name: Download msi _build Artifacts
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  name: msi-build-folder-artifacts
  path: src/_build
 
  - name: Download Agent Home Folders
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  name: homefolders
  path: src/Agent
@@ -564,7 +564,7 @@ jobs:
  shell: bash
 
  - name: Archive RPM Package Artifacts
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+ uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
  with:
  name: rpm-build-artifacts
  path: ${{ github.workspace }}/src/_build/CoreArtifacts
@@ -588,13 +588,13 @@ jobs:
  fetch-depth: 0
 
  - name: Download Agent Home Folders
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  name: homefolders
  path: src/Agent
 
  - name: Download msi _build Artifacts
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  name: msi-build-folder-artifacts
  path: src/_build
@@ -617,7 +617,7 @@ jobs:
  shell: bash
 
  - name: Archive Debian Package Artifacts
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+ uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
  with:
  name: debian-build-artifacts
  path: ${{ github.workspace }}/src/_build/CoreArtifacts
@@ -635,25 +635,25 @@ jobs:
  fetch-depth: 0
 
  - name: Download Agent Home Folders
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  name: homefolders
  path: src/Agent
 
  - name: Download msi _build Artifacts
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  name: msi-build-folder-artifacts
  path: src/_build
 
  - name: Download Debian _build Artifacts
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  name: debian-build-artifacts
  path: src/_build/CoreArtifacts
 
  - name: Download RPM _build Artifacts
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  name: rpm-build-artifacts
  path: src/_build/CoreArtifacts
@@ -672,7 +672,7 @@ jobs:
  shell: powershell
 
  - name: Archive Deploy Artifacts
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+ uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
  with:
  name: deploy-artifacts
  path: |

diff --git a/.github/workflows/build_profiler.yml b/.github/workflows/build_profiler.yml
@@ -116,14 +116,14 @@ jobs:
  token: ${{ secrets.CODECOV_TOKEN }}
 
  - name: Archive Build Artifacts
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+ uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
  with:
  name: profiler-windows
  path: ${{ github.workspace }}\src\Agent\_profilerBuild\**\*
  if-no-files-found: error
 
  - name: Archive Code Coverage Artifacts
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+ uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
  with:
  name: profiler-code-coverage
  path: |
@@ -175,7 +175,7 @@ jobs:
  shell: bash
 
  - name: Archive Artifacts
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+ uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
  with:
  name: profiler-amd64
  path: ${{ github.workspace }}/src/Agent/_profilerBuild/
@@ -247,7 +247,7 @@ jobs:
  shell: bash
 
  - name: Archive Artifacts
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+ uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
  with:
  name: profiler-arm64
  path: ${{ github.workspace }}/src/Agent/_profilerBuild/
@@ -277,19 +277,19 @@ jobs:
  fetch-depth: 0
 
  - name: Download Windows Profiler Artifacts to working Directory
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  name: profiler-windows
  path: ${{ github.workspace }}/_workingDir
 
  - name: Download Linux amd64 Profiler Artifacts to working Directory
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  name: profiler-amd64
  path: ${{ github.workspace }}/_workingDir
 
  - name: Download Linux arm64 Profiler Artifacts to working Directory
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  name: profiler-arm64
  path: ${{ github.workspace }}/_workingDir

diff --git a/.github/workflows/deploy_agent.yml b/.github/workflows/deploy_agent.yml
@@ -161,7 +161,7 @@ jobs:
  egress-policy: audit
 
  - name: Download Deploy Artifacts
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  github-token: ${{ secrets.GITHUB_TOKEN }}
  run-id: ${{ needs.get-release-info.outputs.workflow_run_id }}
@@ -170,7 +170,7 @@ jobs:
  repository: ${{ github.repository }}
 
  - name: Upload Deploy Artifacts Locally
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+ uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
  with:
  name: deploy-artifacts
  path: ${{ github.workspace }}
@@ -184,7 +184,7 @@ jobs:
 
  steps:
  - name: Download Deploy Artifacts
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  name: deploy-artifacts
  path: ${{ github.workspace }}\staging_dir
@@ -263,7 +263,7 @@ jobs:
 
  steps:
  - name: Download Deploy Artifacts
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  name: deploy-artifacts
  path: ${{ github.workspace }}\working_dir
@@ -366,7 +366,7 @@ jobs:
  fetch-depth: 0
 
  - name: Download Deploy Artifacts
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  name: deploy-artifacts
  path: ${{ github.workspace }}/

diff --git a/.github/workflows/deploy_siteextension.yml b/.github/workflows/deploy_siteextension.yml
@@ -29,7 +29,7 @@ jobs:
 
  steps:
  - name: Download Deploy Artifacts
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  github-token: ${{ secrets.GITHUB_TOKEN }}
  run-id: ${{ inputs.run_id }}

diff --git a/.github/workflows/multiverse_run.yml b/.github/workflows/multiverse_run.yml
@@ -73,7 +73,7 @@ jobs:
  shell: bash
 
  - name: Upload MVS
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+ uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
  with:
  name: mvs
  path: |
@@ -118,7 +118,7 @@ jobs:
  fetch-depth: 0
 
  - name: Download MVS
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+ uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
  with:
  name: mvs
  path: ${{ env.multiverse_path }}
@@ -131,7 +131,7 @@ jobs:
  shell: bash
 
  - name: Deploy 🚀
- uses: JamesIves/github-pages-deploy-action@5c6e9e9f3672ce8fd37b9856193d2a537941e66c # 4.6.1
+ uses: JamesIves/github-pages-deploy-action@94f3c658273cf92fb48ef99e5fbc02bd2dc642b2 # 4.6.3
  with:
  branch: gh-pages
  folder: .