Merge branch 'main' into instrumentationServiceFabricRemoting

open-telemetry · Dec 17, 2024 · 1235ed5 · 1235ed5
2 parents 2b5ffee + 6bd743e
commit 1235ed5
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 28 deletions.
diff --git a/.github/workflows/Component.BuildTest.yml b/.github/workflows/Component.BuildTest.yml
@@ -18,7 +18,7 @@ on:
         required: false
         type: string
       os-list:
-        default: '[ "windows-latest", "ubuntu-latest" ]'
+        default: '[ "windows-latest", "ubuntu-22.04" ]'
         required: false
         type: string
       tfm-list:
@@ -46,7 +46,7 @@ jobs:
         os: ${{ fromJSON(inputs.os-list) }}
         version: ${{ fromJSON(inputs.tfm-list) }}
         exclude:
-        - os: ubuntu-latest
+        - os: ubuntu-22.04
           version: net462
         - os: macos-latest
           version: net462

diff --git a/.github/workflows/add-labels.yml b/.github/workflows/add-labels.yml
@@ -14,7 +14,7 @@ jobs:
   add-labels-on-issues:
     if: github.event_name == 'issues' && !github.event.issue.pull_request
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: check out code
@@ -36,7 +36,7 @@ jobs:
   add-labels-on-pull-requests:
     if: github.event_name == 'pull_request_target'
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: check out code

diff --git a/.github/workflows/assign-reviewers.yml b/.github/workflows/assign-reviewers.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   assign:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: Assign Reviewers
     steps:
       - uses: dyladan/component-owners@main

diff --git a/.github/workflows/automation.yml b/.github/workflows/automation.yml
@@ -18,7 +18,7 @@ on:
 jobs:
   resolve-automation:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     outputs:
       enabled: ${{ steps.evaluate.outputs.enabled }}

diff --git a/.github/workflows/ci-Exporter.OneCollector-Integration.yml b/.github/workflows/ci-Exporter.OneCollector-Integration.yml
@@ -18,7 +18,7 @@ jobs:
       ${{ github.event_name == 'pull_request_target' &&
       github.event.pull_request.head.repo.full_name != github.repository &&
       'external' || 'internal' }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - run: echo ✓
 
@@ -28,10 +28,10 @@ jobs:
     strategy:
       fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
       matrix:
-        os: [ windows-latest, ubuntu-latest ]
+        os: [ windows-latest, ubuntu-22.04 ]
         version: [ net462, net8.0 ]
         exclude:
-        - os: ubuntu-latest
+        - os: ubuntu-22.04
           version: net462
 
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -491,7 +491,7 @@ jobs:
     with:
       project-name: Component[OpenTelemetry.Resources.Host]
       code-cov-name: Resources.Host
-      os-list: '[ "windows-latest", "ubuntu-latest", "macos-latest" ]'
+      os-list: '[ "windows-latest", "ubuntu-22.04", "macos-latest" ]'
 
   build-test-resources-operatingsystem:
     needs: detect-changes
@@ -503,7 +503,7 @@ jobs:
     with:
       project-name: Component[OpenTelemetry.Resources.OperatingSystem]
       code-cov-name: Resources.OperatingSystem
-      os-list: '[ "windows-latest", "ubuntu-latest", "macos-latest" ]'
+      os-list: '[ "windows-latest", "ubuntu-22.04", "macos-latest" ]'
 
   build-test-resources-process:
     needs: detect-changes
@@ -642,7 +642,7 @@ jobs:
       verify-aot-compat
     ]
     if: always() && !cancelled()
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - run: |
           if ( ${{ contains(needs.*.result, 'failure') }} == true ); then echo 'build failed ✗'; exit 1; else echo 'build complete ✓'; fi
diff --git a/.github/workflows/core-version-update.yml b/.github/workflows/core-version-update.yml
@@ -14,7 +14,7 @@ jobs:
     secrets: inherit
 
   core-version-update:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     needs: automation
 

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   redis-integration-test:
     if: inputs.job == 'all' || inputs.job == 'redis-integration-test'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -23,7 +23,7 @@ jobs:
 
   kafka-integration-test:
     if: inputs.job == 'all' || inputs.job == 'kafka-integration-test'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/markdownlint.yml b/.github/workflows/markdownlint.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   run-markdownlint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
     - name: check out code

diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml
@@ -16,7 +16,7 @@ jobs:
     secrets: inherit
 
   post-release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     needs:
     - automation

diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -80,7 +80,7 @@ jobs:
     secrets: inherit
 
   prepare-release-pr:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     needs: automation
 
@@ -111,7 +111,7 @@ jobs:
           -gitUserEmail '${{ needs.automation.outputs.email }}'
 
   lock-pr-and-post-notice-to-create-release-tag:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     needs: automation
 
@@ -143,7 +143,7 @@ jobs:
           -botUserName '${{ needs.automation.outputs.username }}'
 
   create-release-tag-unlock-pr-post-notice:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     needs: automation
 
@@ -182,7 +182,7 @@ jobs:
           -gitUserEmail '${{ needs.automation.outputs.email }}'
 
   update-changelog-release-dates-on-prepare-pr-post-notice:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     needs: automation
 
@@ -222,7 +222,7 @@ jobs:
           -gitUserEmail '${{ needs.automation.outputs.email }}'
 
   process-release-request-issue:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     needs: automation
 

diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml
@@ -104,7 +104,7 @@ jobs:
           nuget push src\**\*.nupkg -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_TOKEN }} -SymbolApiKey ${{ secrets.NUGET_TOKEN }}
 
   post-build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     needs:
       - automation

diff --git a/.github/workflows/sanitycheck.yml b/.github/workflows/sanitycheck.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   run-misspell:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
     - name: check out code
@@ -20,7 +20,7 @@ jobs:
       run: ./bin/misspell -error .
 
   run-sanitycheck:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
     - name: check out code

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   stale:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/stale@v9
         with:

diff --git a/.github/workflows/verifyaotcompat.yml b/.github/workflows/verifyaotcompat.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
       matrix:
-        os: [ ubuntu-latest, windows-latest ]
+        os: [ ubuntu-22.04, windows-latest ]
         version: [ net8.0, net9.0 ]
 
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/yamllint.yml b/.github/workflows/yamllint.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   run-yamllint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
     - name: check out code
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ on: @@
     jobs:
       stale:
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         steps:
           - uses: actions/stale@v9
             with:
@@ Expand Down @@