Merge remote-tracking branch 'upstream/main' into mike/config-resource-propagator

Author: MikeGoldsmith

.github/workflows/benchmarks.yml

@@ -11,7 +11,7 @@ jobs:
   sdk-benchmarks:
     permissions:
       contents: write # required for pushing to gh-pages
-    runs-on: oracle-bare-metal-64cpu-512gb-x86-64
+    runs-on: oracle-bare-metal-64cpu-1024gb-x86-64-ubuntu-24
     container:
       image: python:3.13-slim
     steps:

.github/workflows/check-links.yml

@@ -2,46 +2,48 @@ name: check-links
 on:
   push:
     branches: [ main ]
+    paths:
+      - '**/*.md'
+      - '.github/workflows/check-links.yml'
+      - '.github/workflows/check_links_config.json'
   pull_request:
+    paths:
+      - '**/*.md'
+      - '.github/workflows/check-links.yml'
+      - '.github/workflows/check_links_config.json'
 
 permissions:
   contents: read
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
-  changedfiles:
-    name: changed files
-    runs-on: ubuntu-latest
-    if: ${{ github.actor != 'dependabot[bot]' }}
-    outputs:
-      md: ${{ steps.changes.outputs.md }}
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Get changed files
-        id: changes
-        run: |
-          echo "md=$(git diff --name-only --diff-filter=ACMRTUXB $(git merge-base origin/main ${{ github.event.pull_request.head.sha }}) ${{ github.event.pull_request.head.sha }} | grep .md$ | xargs)" >> $GITHUB_OUTPUT
   check-links:
     runs-on: ubuntu-latest
-    needs: changedfiles
-    if: |
-      github.event.pull_request.user.login != 'otelbot[bot]' && github.event_name == 'pull_request'
-      && ${{needs.changedfiles.outputs.md}}
+    if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'otelbot[bot]' }}
+    timeout-minutes: 15
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+
+      - name: Get changed markdown files
+        id: changed-files
+        uses: tj-actions/changed-files@v46
         with:
-          fetch-depth: 0
+          files: |
+            **/*.md
 
       - name: Install markdown-link-check
+        if: steps.changed-files.outputs.any_changed == 'true'
         run: npm install -g markdown-link-check@v3.12.2
 
       - name: Run markdown-link-check
+        if: steps.changed-files.outputs.any_changed == 'true'
         run: |
           markdown-link-check \
             --verbose \
             --config .github/workflows/check_links_config.json \
-            ${{needs.changedfiles.outputs.md}} \
-            || { echo "Check that anchor links are lowercase"; exit 1; }
+            ${{ steps.changed-files.outputs.all_changed_files }} \
+            || { echo "Check that anchor links are lowercase"; exit 1; }

.github/workflows/lint_0.yml

@@ -69,6 +69,44 @@ jobs:
       - name: Run tests
         run: tox -e lint-opentelemetry-proto-gen-latest
 
+  lint-opentelemetry-protojson-gen-latest:
+    name: opentelemetry-protojson-gen-latest
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.14
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.14"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e lint-opentelemetry-protojson-gen-latest
+
+  lint-opentelemetry-codegen-json:
+    name: opentelemetry-codegen-json
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.14
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.14"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e lint-opentelemetry-codegen-json
+
   lint-opentelemetry-sdk:
     name: opentelemetry-sdk
     runs-on: ubuntu-latest