Merge branch 'main' into sqlalchemy-db-statement-with-sqlcomment

Author: tammy-baylis-swi

.github/component_owners.yml

@@ -71,3 +71,6 @@ components:
     - karthikscale3
     - lmolkova
     - lzchen
+    - gyliu513
+    - nirga
+    - codefromthecrypt

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

@@ -23,13 +23,17 @@ jobs:
     {%- if job_data == "generate-workflows" %}
     if: |
       !contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows')
-      && github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
+      && github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
     {%- endif %}
     {%- if job_data == "public-symbols-check" %}
     if: |
       !contains(github.event.pull_request.labels.*.name, 'Approve Public API check')
       && github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
     {%- endif %}
+    {%- if job_data == "docs" %}
+    if: |
+      github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
+    {%- endif %}
     steps:
       - name: Checkout repo @ SHA - ${% raw %}{{ github.sha }}{% endraw %}
         uses: actions/checkout@v4

.github/workflows/misc_0.yml

@@ -55,6 +55,8 @@ jobs:
   docs:
     name: docs
     runs-on: ubuntu-latest
+    if: |
+      github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v4
@@ -96,7 +98,7 @@ jobs:
     runs-on: ubuntu-latest
     if: |
       !contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows')
-      && github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
+      && github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v4

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

@@ -8,6 +8,7 @@ on:
         - opentelemetry-propagator-aws-xray
         - opentelemetry-resource-detector-azure
         - opentelemetry-sdk-extension-aws
+        - opentelemetry-instrumentation-openai-v2
         description: 'Package to be released'
         required: true
 jobs:

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

@@ -8,6 +8,7 @@ on:
         - opentelemetry-propagator-aws-xray
         - opentelemetry-resource-detector-azure
         - opentelemetry-sdk-extension-aws
+        - opentelemetry-instrumentation-openai-v2
         description: 'Package to be released'
         required: true
 

.github/workflows/package-release.yml

@@ -8,6 +8,7 @@ on:
         - opentelemetry-propagator-aws-xray
         - opentelemetry-resource-detector-azure
         - opentelemetry-sdk-extension-aws
+        - opentelemetry-instrumentation-openai-v2
         description: 'Package to be released'
         required: true
 jobs:
@@ -101,9 +102,9 @@ jobs:
       - name: Publish to PyPI
         env:
           TWINE_USERNAME: '__token__'
-          TWINE_PASSWORD: ${{ secrets.test_pypi_token }}
+          TWINE_PASSWORD: ${{ secrets.pypi_password }}
         run: |
-          twine upload --repository testpypi --skip-existing --verbose dist/*
+          twine upload --skip-existing --verbose dist/*
 
       - name: Generate release notes
         env:

.github/workflows/release.yml

@@ -81,14 +81,13 @@ jobs:
       # rejected by pypi (e.g "3 - Beta"). This would cause a failure during the
       # middle of the package upload causing the action to fail, and certain packages
       # might have already been updated, this would be bad.
-      # EDIT: 5/31/2024 - TestPypi now requires a verified email. Commenting out as a temporary measure
-      # until we found TestPypi credentials.
-      # - name: Publish to TestPyPI
-      #   env:
-      #     TWINE_USERNAME: '__token__'
-      #     TWINE_PASSWORD: ${{ secrets.test_pypi_token }}
-      #   run: |
-      #     twine upload --repository testpypi --skip-existing --verbose dist/*
+
+      - name: Publish to TestPyPI
+        env:
+          TWINE_USERNAME: '__token__'
+          TWINE_PASSWORD: ${{ secrets.test_pypi_token }}
+        run: |
+          twine upload --repository testpypi --skip-existing --verbose dist/*
 
       - name: Publish to PyPI
         env: