Merge latest from main, resolve conflicts

newrelic · Nov 20, 2023 · 32c9f05 · 32c9f05
2 parents 2bcd0d6 + 9e355f3
commit 32c9f05
Show file tree

Hide file tree

Showing 687 changed files with 10,282 additions and 5,308 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -11,6 +11,7 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
+charset = utf-8 # supposed to get rid of the BOM issue
 
 ###############################
 # .NET Coding Conventions     #

diff --git a/.github/workflows/all_solutions.yml b/.github/workflows/all_solutions.yml
diff --git a/.github/workflows/assignproj.yml b/.github/workflows/assignproj.yml
@@ -16,7 +16,7 @@ jobs:
     name: Assign to One Project
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@cba0d00b1fc9a034e1e642ea0f1103c282990604 # v2.5.0
+        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
         with:
           disable-sudo: true
           egress-policy: audit

diff --git a/.github/workflows/awslambda_release.yml b/.github/workflows/awslambda_release.yml
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3        
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -55,7 +55,7 @@ jobs:
         shell: powershell
 
       - name: Archive NewRelic.OpenTracing.AmazonLambda.Tracer
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: NewRelic.OpenTracing.AmazonLambda.Tracer
           path: ${{ github.workspace }}\src\AwsLambda\AwsLambdaOpenTracer\bin\Release\netstandard2.0-ILRepacked
@@ -92,7 +92,7 @@ jobs:
 
       - name: Archive Test Results
         if: ${{ always() }}
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: test-results
           path: ${{ github.workspace }}\TestResults
@@ -109,7 +109,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3        
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -128,7 +128,7 @@ jobs:
         shell: powershell
 
       - name: Archive Deploy Artifacts
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: deploy-artifacts
           path: |

diff --git a/.github/workflows/build_download_site_index_files.yml b/.github/workflows/build_download_site_index_files.yml
@@ -55,7 +55,7 @@ jobs:
       image: ghcr.io/newrelic/s3indexer
     steps:
       - name: Login to AWS
-        uses: aws-actions/configure-aws-credentials@5fd3084fc36e372ff1fff382a39b10d03659f355 # v2.2.0
+        uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
         with:
           aws-region: ${{ inputs.aws-region }}
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}

diff --git a/.github/workflows/build_profiler.yml b/.github/workflows/build_profiler.yml
@@ -2,11 +2,18 @@ name: Build and Package Profiler
 
 on:
   # run this workflow on a push to any branch other than main or a feature branch
+  #
+  # NOTE: On a push, only the build jobs will execute; the NuGet jobs will not run. 
+  #       Manually run this workflow on your branch when you want it to update the
+  #       NuGet package and create a PR to update the package version reference in 
+  #       Home.csproj.
   push:
     branches-ignore:
       - main
       - "feature/**"
-
+    paths-ignore:
+      - ".github/**" # skip changes to the .github branch (workflows, etc.)
+
   # this workflow can be called from another workflow
   workflow_call:
     inputs:
@@ -51,19 +58,23 @@ jobs:
   check-for-changes:
     name: Check for Updated Profiler Files
     runs-on: ubuntu-22.04
+
+    # don't run this job if triggered by Dependabot, will cause all other jobs to be skipped as well
+    if: ${{ github.actor != 'dependabot[bot]' }}
+
     permissions:
       pull-requests: read
     outputs:
       profiler_src: ${{ steps.filter.outputs.profiler_src }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@cba0d00b1fc9a034e1e642ea0f1103c282990604 # v2.5.0
+        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
         with:
           disable-sudo: true
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3        
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -91,7 +102,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3        
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -145,7 +156,7 @@ jobs:
             files: ${{ env.test_results_path }}\profiler.xml
 
       - name: Archive Artifacts
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: profiler
           path: ${{ github.workspace }}\src\Agent\_profilerBuild\**\*
@@ -170,7 +181,7 @@ jobs:
       #     egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3        
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -197,7 +208,7 @@ jobs:
         shell: bash
 
       - name: Archive Artifacts
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: profiler
           path: ${{ github.workspace }}/src/Agent/_profilerBuild/
@@ -217,12 +228,12 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@cba0d00b1fc9a034e1e642ea0f1103c282990604 # v2.5.0
+        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
         with:
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3        
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -235,7 +246,7 @@ jobs:
           rm -rf ${{ github.workspace }}/src/Agent/_profilerBuild/x86-Release || true
         shell: bash
 
-      - uses: uraimo/run-on-arch-action@a8003307a739516fdd80ee6d3da8924db811b8da # v2.5.0
+      - uses: uraimo/run-on-arch-action@4ed76f16f09d12e83abd8a49e1ac1e5bf08784d4 # v2.5.1
         name: Run commands
         id: runcmd
         with:
@@ -271,7 +282,7 @@ jobs:
         shell: bash
 
       - name: Archive Artifacts
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: profiler
           path: ${{ github.workspace }}/src/Agent/_profilerBuild/
@@ -297,7 +308,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3        
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 
@@ -360,7 +371,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@cba0d00b1fc9a034e1e642ea0f1103c282990604 # v2.5.0
+        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
         with:
           egress-policy: audit
 
@@ -369,7 +380,7 @@ jobs:
           sudo apt-get install -y xmlstarlet
 
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3        
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
 

diff --git a/.github/workflows/check_modified_files.yml b/.github/workflows/check_modified_files.yml
@@ -0,0 +1,42 @@
+name: Check for Modified Source Files
+
+on: 
+    workflow_call:
+        outputs:
+            non-workflow-files-changed:
+                value: ${{ jobs.check-modified-files.outputs.non-workflow-files-changed }}
+
+permissions:
+    contents: read
+
+jobs: 
+    check-modified-files:
+        name: Check if source files were modified, skip remaining jobs if not
+        runs-on: ubuntu-latest
+        permissions:
+          pull-requests: read
+        # don't run this job if triggered by Dependabot, will cause all other jobs to be skipped as well
+        # don't run if triggered by a release or manual execution, as we're going to do the full build in those cases anyway
+        if: github.actor != 'dependabot[bot]' || !(github.event.release || github.event_name == 'workflow_dispatch')
+        outputs:
+          non-workflow-files-changed: ${{ steps.filter.outputs.non-workflow-files-changed }}
+        steps:
+          - name: Harden Runner
+            uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+            with:
+              disable-sudo: true
+              egress-policy: audit
+          - name: Checkout
+            uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+            with:
+              fetch-depth: 0
+          - name: Verify which files were modified
+            uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
+            id: filter
+            with:
+              base: ${{ github.ref }}
+              filters: |
+                non-workflow-files-changed:
+                  - '!.github/**'
+              list-files: 'csv'
+