From 489c1707abf6271fd9e8c2b92083e660ec487147 Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Thu, 7 Nov 2024 15:54:25 -0800 Subject: [PATCH 1/2] Remove generate contrib workflow from core Including the generate contrib workflow in core will block changes in core if contrib workflows are in an erroneous state. While we do want to fix those erroneous workflows, we do not want to block the development of core and fix them in parallel. --- .github/workflows/generate_workflows.py | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/generate_workflows.py b/.github/workflows/generate_workflows.py index 2b456d29423..f2966b9aaae 100644 --- a/.github/workflows/generate_workflows.py +++ b/.github/workflows/generate_workflows.py @@ -17,5 +17,4 @@ "windows-latest", ) generate_lint_workflow(tox_ini_path, workflows_directory_path) -generate_contrib_workflow(workflows_directory_path) generate_misc_workflow(tox_ini_path, workflows_directory_path) From 1e995e6a371ffcaab09a8a6bba42d6a0cdbeef6e Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Thu, 7 Nov 2024 16:37:53 -0800 Subject: [PATCH 2/2] run gen workflow --- .github/workflows/contrib_0.yml | 164 ++++++++++++++++++++++-- .github/workflows/generate_workflows.py | 1 + 2 files changed, 153 insertions(+), 12 deletions(-) diff --git a/.github/workflows/contrib_0.yml b/.github/workflows/contrib_0.yml index 6a515027a7a..ffd46c46d1a 100644 --- a/.github/workflows/contrib_0.yml +++ b/.github/workflows/contrib_0.yml @@ -16,8 +16,8 @@ env: jobs: - py38-test-instrumentation-openai-v2: - name: instrumentation-openai-v2 + py38-test-instrumentation-openai-v2-0: + name: instrumentation-openai-v2-0 runs-on: ubuntu-latest steps: - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} @@ -42,7 +42,35 @@ jobs: run: pip install tox - name: Run tests - run: tox -e py38-test-instrumentation-openai-v2 -- -ra + run: tox -e py38-test-instrumentation-openai-v2-0 -- -ra + + py38-test-instrumentation-openai-v2-1: + name: instrumentation-openai-v2-1 + runs-on: ubuntu-latest + steps: + - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} + uses: actions/checkout@v4 + with: + repository: open-telemetry/opentelemetry-python-contrib + ref: ${{ env.CONTRIB_REPO_SHA }} + + - name: Checkout core repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + with: + repository: open-telemetry/opentelemetry-python + path: opentelemetry-python-core + + - name: Set up Python 3.8 + uses: actions/setup-python@v5 + with: + python-version: "3.8" + architecture: "x64" + + - name: Install tox + run: pip install tox + + - name: Run tests + run: tox -e py38-test-instrumentation-openai-v2-1 -- -ra py38-test-resource-detector-container: name: resource-detector-container @@ -72,8 +100,8 @@ jobs: - name: Run tests run: tox -e py38-test-resource-detector-container -- -ra - py38-test-resource-detector-azure: - name: resource-detector-azure + py38-test-resource-detector-azure-0: + name: resource-detector-azure-0 runs-on: ubuntu-latest steps: - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} @@ -98,10 +126,10 @@ jobs: run: pip install tox - name: Run tests - run: tox -e py38-test-resource-detector-azure -- -ra + run: tox -e py38-test-resource-detector-azure-0 -- -ra - py38-test-sdk-extension-aws: - name: sdk-extension-aws + py38-test-resource-detector-azure-1: + name: resource-detector-azure-1 runs-on: ubuntu-latest steps: - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} @@ -126,7 +154,63 @@ jobs: run: pip install tox - name: Run tests - run: tox -e py38-test-sdk-extension-aws -- -ra + run: tox -e py38-test-resource-detector-azure-1 -- -ra + + py38-test-sdk-extension-aws-0: + name: sdk-extension-aws-0 + runs-on: ubuntu-latest + steps: + - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} + uses: actions/checkout@v4 + with: + repository: open-telemetry/opentelemetry-python-contrib + ref: ${{ env.CONTRIB_REPO_SHA }} + + - name: Checkout core repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + with: + repository: open-telemetry/opentelemetry-python + path: opentelemetry-python-core + + - name: Set up Python 3.8 + uses: actions/setup-python@v5 + with: + python-version: "3.8" + architecture: "x64" + + - name: Install tox + run: pip install tox + + - name: Run tests + run: tox -e py38-test-sdk-extension-aws-0 -- -ra + + py38-test-sdk-extension-aws-1: + name: sdk-extension-aws-1 + runs-on: ubuntu-latest + steps: + - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} + uses: actions/checkout@v4 + with: + repository: open-telemetry/opentelemetry-python-contrib + ref: ${{ env.CONTRIB_REPO_SHA }} + + - name: Checkout core repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + with: + repository: open-telemetry/opentelemetry-python + path: opentelemetry-python-core + + - name: Set up Python 3.8 + uses: actions/setup-python@v5 + with: + python-version: "3.8" + architecture: "x64" + + - name: Install tox + run: pip install tox + + - name: Run tests + run: tox -e py38-test-sdk-extension-aws-1 -- -ra py38-test-distro: name: distro @@ -1584,6 +1668,34 @@ jobs: - name: Run tests run: tox -e py38-test-instrumentation-sqlalchemy-1 -- -ra + py38-test-instrumentation-sqlalchemy-2: + name: instrumentation-sqlalchemy-2 + runs-on: ubuntu-latest + steps: + - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} + uses: actions/checkout@v4 + with: + repository: open-telemetry/opentelemetry-python-contrib + ref: ${{ env.CONTRIB_REPO_SHA }} + + - name: Checkout core repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + with: + repository: open-telemetry/opentelemetry-python + path: opentelemetry-python-core + + - name: Set up Python 3.8 + uses: actions/setup-python@v5 + with: + python-version: "3.8" + architecture: "x64" + + - name: Install tox + run: pip install tox + + - name: Run tests + run: tox -e py38-test-instrumentation-sqlalchemy-2 -- -ra + py38-test-instrumentation-redis: name: instrumentation-redis runs-on: ubuntu-latest @@ -1864,8 +1976,36 @@ jobs: - name: Run tests run: tox -e py38-test-util-http -- -ra - py38-test-propagator-aws-xray: - name: propagator-aws-xray + py38-test-propagator-aws-xray-0: + name: propagator-aws-xray-0 + runs-on: ubuntu-latest + steps: + - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} + uses: actions/checkout@v4 + with: + repository: open-telemetry/opentelemetry-python-contrib + ref: ${{ env.CONTRIB_REPO_SHA }} + + - name: Checkout core repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + with: + repository: open-telemetry/opentelemetry-python + path: opentelemetry-python-core + + - name: Set up Python 3.8 + uses: actions/setup-python@v5 + with: + python-version: "3.8" + architecture: "x64" + + - name: Install tox + run: pip install tox + + - name: Run tests + run: tox -e py38-test-propagator-aws-xray-0 -- -ra + + py38-test-propagator-aws-xray-1: + name: propagator-aws-xray-1 runs-on: ubuntu-latest steps: - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} @@ -1890,7 +2030,7 @@ jobs: run: pip install tox - name: Run tests - run: tox -e py38-test-propagator-aws-xray -- -ra + run: tox -e py38-test-propagator-aws-xray-1 -- -ra py38-test-propagator-ot-trace: name: propagator-ot-trace diff --git a/.github/workflows/generate_workflows.py b/.github/workflows/generate_workflows.py index f2966b9aaae..2b456d29423 100644 --- a/.github/workflows/generate_workflows.py +++ b/.github/workflows/generate_workflows.py @@ -17,4 +17,5 @@ "windows-latest", ) generate_lint_workflow(tox_ini_path, workflows_directory_path) +generate_contrib_workflow(workflows_directory_path) generate_misc_workflow(tox_ini_path, workflows_directory_path)