Merge branch 'main' into test-metrics-concurrency

Author: chimchim89

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -10,7 +10,7 @@ body:
 
         Before filing a bug, please be sure you have searched through [existing bugs](https://github.com/open-telemetry/opentelemetry-python/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3Abug) to see if your bug is already addressed.
         If your bug is related to an instrumentation or plugin in [opentelemetry-python-contrib](https://github.com/open-telemetry/opentelemetry-python-contrib) please be sure to file it there.
-  
+
   - type: textarea
     id: environment
     attributes:
@@ -19,10 +19,10 @@ body:
         Please describe any aspect of your environment relevant to the problem, including your Python version, [platform](https://docs.python.org/3/library/platform.html), version numbers of installed dependencies, information about your cloud hosting provider, etc. If you're reporting a problem with a specific version of a library in this repo, please check whether the problem has been fixed on main.
       value: |
         OS: (e.g, Ubuntu)
-        Python version: (e.g., Python 3.9.10)
+        Python version: (e.g., Python 3.10.0)
         SDK version: (e.g., 1.25.0)
         API version: (e.g., 1.25.0)
-  
+
   - type: textarea
     attributes:
       label: What happened?

.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/contrib.yml .github/workflows/ci.yml.github/workflows/contrib.yml renamed to .github/workflows/ci.yml

@@ -1,10 +1,12 @@
-name: Core Contrib Test
+# Do not edit this file.
+# This file is generated automatically by executing tox -e generate-workflows
+
+name: CI
 
 on:
   push:
-    branches-ignore:
-    - 'release/*'
-    - 'otelbot/*'
+    branches:
+    - 'main'
   pull_request:
 
 permissions:
@@ -15,12 +17,32 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  contrib_0:
-    uses: open-telemetry/opentelemetry-python-contrib/.github/workflows/core_contrib_test_0.yml@main
+  misc:
+    uses: ./.github/workflows/misc.yml
+  lint:
+    uses: ./.github/workflows/lint.yml
+  tests:
+    uses: ./.github/workflows/test.yml
+  contrib:
+    uses: open-telemetry/opentelemetry-python-contrib/.github/workflows/core_contrib_test.yml@main
     with:
       CORE_REPO_SHA: ${{ github.sha }}
       CONTRIB_REPO_SHA: ${{ github.event_name == 'pull_request' && (
           contains(github.event.pull_request.labels.*.name, 'prepare-release') && github.event.pull_request.head.ref ||
           contains(github.event.pull_request.labels.*.name, 'backport') && github.event.pull_request.base.ref ||
           'main'
         ) || 'main' }}
+
+  check:
+    if: always()
+    needs:
+      - misc
+      - lint
+      - tests
+      - contrib
+    runs-on: ubuntu-latest
+    steps:
+      - name: Decide whether the needed jobs succeeded or failed
+        uses: re-actors/alls-green@release/v1
+        with:
+          jobs: ${{ toJSON(needs) }}

.github/workflows/generate_workflows.py

@@ -14,7 +14,7 @@
 )
 _tox_lint_env_regex = re_compile(r"lint-(?P<name>[-\w]+)")
 _tox_contrib_env_regex = re_compile(
-    r"py39-test-(?P<name>[-\w]+\w)-?(?P<contrib_requirements>\d+)?"
+    r"py310-test-(?P<name>[-\w]+\w)-?(?P<contrib_requirements>\d+)?"
 )
 
 
@@ -47,8 +47,7 @@ def get_test_job_datas(tox_envs: list, operating_systems: list) -> list:
     os_alias = {"ubuntu-latest": "Ubuntu", "windows-latest": "Windows"}
 
     python_version_alias = {
-        "pypy3": "pypy-3.9",
-        "py39": "3.9",
+        "pypy3": "pypy-3.10",
         "py310": "3.10",
         "py311": "3.11",
         "py312": "3.12",
@@ -140,29 +139,17 @@ def _generate_workflow(
     job_datas: list,
     template_name: str,
     output_dir: Path,
-    max_jobs: int = 250,
-):
-    # Github seems to limit the amount of jobs in a workflow file, that is why
-    # they are split in groups of 250 per workflow file.
-    for file_number, job_datas in enumerate(
-        [
-            job_datas[index : index + max_jobs]
-            for index in range(0, len(job_datas), max_jobs)
-        ]
-    ):
-        with open(
-            output_dir.joinpath(f"{template_name}_{file_number}.yml"), "w"
-        ) as test_yml_file:
-            test_yml_file.write(
-                Environment(
-                    loader=FileSystemLoader(
-                        Path(__file__).parent.joinpath("templates")
-                    )
-                )
-                .get_template(f"{template_name}.yml.j2")
-                .render(job_datas=job_datas, file_number=file_number)
+) -> None:
+    env = Environment(
+        loader=FileSystemLoader(Path(__file__).parent.joinpath("templates"))
+    )
+    with open(output_dir.joinpath(f"{template_name}.yml"), "w") as yml_file:
+        yml_file.write(
+            env.get_template(f"{template_name}.yml.j2").render(
+                job_datas=job_datas,
             )
-            test_yml_file.write("\n")
+        )
+        yml_file.write("\n")
 
 
 def generate_test_workflow(
@@ -197,6 +184,22 @@ def generate_misc_workflow(
     )
 
 
+def generate_ci_workflow(
+    output_dir: Path,
+) -> None:
+    with open(output_dir.joinpath("ci.yml"), "w") as ci_yml_file:
+        ci_yml_file.write(
+            Environment(
+                loader=FileSystemLoader(
+                    Path(__file__).parent.joinpath("templates")
+                )
+            )
+            .get_template("ci.yml.j2")
+            .render()
+        )
+        ci_yml_file.write("\n")
+
+
 if __name__ == "__main__":
     tox_ini_path = Path(__file__).parent.parent.parent.joinpath("tox.ini")
     output_dir = Path(__file__).parent
@@ -205,3 +208,4 @@ def generate_misc_workflow(
     )
     generate_lint_workflow(tox_ini_path, output_dir)
     generate_misc_workflow(tox_ini_path, output_dir)
+    generate_ci_workflow(output_dir)

.github/workflows/lint_0.yml .github/workflows/lint.yml.github/workflows/lint_0.yml renamed to .github/workflows/lint.yml

@@ -1,22 +1,14 @@
 # Do not edit this file.
 # This file is generated automatically by executing tox -e generate-workflows
 
-name: Lint 0
+name: Lint
 
 on:
-  push:
-    branches-ignore:
-    - 'release/*'
-    - 'otelbot/*'
-  pull_request:
+  workflow_call:
 
 permissions:
   contents: read
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 env:
   CORE_REPO_SHA: main
   # Set the SHA to the branch name if the PR has a label 'prepare-release' or 'backport' otherwise, set it to 'main'
@@ -70,6 +62,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

.github/workflows/misc_0.yml .github/workflows/misc.yml.github/workflows/misc_0.yml renamed to .github/workflows/misc.yml

@@ -1,22 +1,14 @@
 # Do not edit this file.
 # This file is generated automatically by executing tox -e generate-workflows
 
-name: Misc 0
+name: Misc
 
 on:
-  push:
-    branches-ignore:
-    - 'release/*'
-    - 'otelbot/*'
-  pull_request:
+  workflow_call:
 
 permissions:
   contents: read
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 env:
   CORE_REPO_SHA: main
   # Set the SHA to the branch name if the PR has a label 'prepare-release' or 'backport' otherwise, set it to 'main'

.github/workflows/release.yml

@@ -74,7 +74,7 @@ jobs:
         # next few steps publish to pypi
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: '3.10'
 
       - name: Build wheels
         run: ./scripts/build.sh

.github/workflows/stale.yml

@@ -33,3 +33,5 @@ jobs:
             This PR has been closed due to inactivity. Please reopen if you would
             like to continue working on it.
           exempt-pr-labels: "hold,WIP,blocked by spec,do not merge"
+          # TODO: Revert back to default of 30 after we have cleared the backlog of stale PRs.
+          operations-per-run: 500