Merge branch 'main' into xray-sampler-pr1

Author: tammy-baylis-swi

.github/workflows/core_contrib_test_0.yml

@@ -0,0 +1,42 @@
+"""
+This script builds a text file with the list of required checks based on
+the tox environments. Similarly to the system we are using to build the
+github workflows.
+The output is in the format than can be cut-and-pasted into the python-contrib
+terraform configuration in the admin repository.
+"""
+
+from pathlib import Path
+
+from generate_workflows_lib import (
+    get_lint_job_datas,
+    get_misc_job_datas,
+    get_test_job_datas,
+    get_tox_envs,
+)
+
+tox_ini_path = Path(__file__).parent.parent.parent.joinpath("tox.ini")
+
+
+def get_gh_contexts_from_jobs(job_datas):
+    def get_job_name(job):
+        if isinstance(job, str):
+            return job
+        return job["ui_name"]
+
+    return [
+        f"""      {{ context = "{get_job_name(job)}" }},\n"""
+        for job in job_datas
+    ]
+
+
+jobs = sorted(
+    get_gh_contexts_from_jobs(get_lint_job_datas(get_tox_envs(tox_ini_path)))
+    + get_gh_contexts_from_jobs(
+        get_test_job_datas(get_tox_envs(tox_ini_path), ["ubuntu-latest"])
+    )
+    + get_gh_contexts_from_jobs(get_misc_job_datas(get_tox_envs(tox_ini_path)))
+)
+with open("opentelemetry-admin-jobs.txt", "w") as f:
+    for job in jobs:
+        f.write(job)

.github/workflows/generate_required_checks.py

@@ -20,6 +20,10 @@ env:
   CORE_REPO_SHA: ${% raw %}{{ inputs.CORE_REPO_SHA }}{% endraw %}
   CONTRIB_REPO_SHA: ${% raw %}{{ inputs.CONTRIB_REPO_SHA }}{% endraw %}
   PIP_EXISTS_ACTION: w
+  CORE_REPO_API: ${% raw %}{{ github.workspace }}{% endraw %}/opentelemetry-python/opentelemetry-api
+  CORE_REPO_SDK: ${% raw %}{{ github.workspace }}{% endraw %}/opentelemetry-python/opentelemetry-sdk
+  CORE_REPO_SEMCONV: ${% raw %}{{ github.workspace }}{% endraw %}/opentelemetry-python/opentelemetry-semantic-conventions
+  CORE_REPO_TEST_UTILS: ${% raw %}{{ github.workspace }}{% endraw %}/opentelemetry-python/tests/opentelemetry-test-utils
 
 jobs:
   {%- for job_data in job_datas %}

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/core_contrib_test.yml.j2

@@ -5,9 +5,8 @@ name: Lint {{ file_number }}
 
 on:
   push:
-    branches-ignore:
-    - 'release/*'
-    - 'otelbot/*'
+    branches:
+    - 'main'
   pull_request:
 
 permissions:

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/lint.yml.j2

@@ -5,9 +5,8 @@ name: Misc {{ file_number }}
 
 on:
   push:
-    branches-ignore:
-    - 'release/*'
-    - 'otelbot/*'
+    branches:
+    - 'main'
   pull_request:
 
 permissions:

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2

@@ -5,9 +5,8 @@ name: Test {{ file_number }}
 
 on:
   push:
-    branches-ignore:
-    - 'release/*'
-    - 'otelbot/*'
+    branches:
+    - 'main'
   pull_request:
 
 permissions:

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/test.yml.j2

@@ -5,9 +5,8 @@ name: Lint 0
 
 on:
   push:
-    branches-ignore:
-    - 'release/*'
-    - 'otelbot/*'
+    branches:
+    - 'main'
   pull_request:
 
 permissions:
@@ -393,25 +392,6 @@ jobs:
       - name: Run tests
         run: tox -e lint-instrumentation-dbapi
 
-  lint-instrumentation-boto:
-    name: instrumentation-boto
-    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-instrumentation-boto
-
   lint-instrumentation-asyncclick:
     name: instrumentation-asyncclick
     runs-on: ubuntu-latest
@@ -1361,3 +1341,22 @@ jobs:
 
       - name: Run tests
         run: tox -e lint-processor-baggage
+
+  lint-opamp-client:
+    name: opamp-client
+    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-opamp-client

.github/workflows/lint_0.yml

@@ -5,9 +5,8 @@ name: Misc 0
 
 on:
   push:
-    branches-ignore:
-    - 'release/*'
-    - 'otelbot/*'
+    branches:
+    - 'main'
   pull_request:
 
 permissions:

.github/workflows/misc_0.yml

@@ -5,6 +5,7 @@ on:
       package:
         type: choice
         options:
+        - opentelemetry-opamp-client
         - opentelemetry-propagator-aws-xray
         - opentelemetry-resource-detector-azure
         - opentelemetry-sdk-extension-aws

.github/workflows/package-prepare-patch-release.yml

@@ -5,6 +5,7 @@ on:
       package:
         type: choice
         options:
+        - opentelemetry-opamp-client
         - opentelemetry-propagator-aws-xray
         - opentelemetry-resource-detector-azure
         - opentelemetry-sdk-extension-aws