Merge branch 'main' into fix-issue-2485-instrumentation-scope-name-2

Author: sfc-gh-jopel

.github/workflows/lint_0.yml

@@ -34,8 +34,8 @@ jobs:
       - name: Run tests
         run: tox -e lint-opentelemetry-api
 
-  lint-opentelemetry-proto:
-    name: opentelemetry-proto
+  lint-opentelemetry-proto-protobuf5:
+    name: opentelemetry-proto-protobuf5
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
@@ -50,7 +50,7 @@ jobs:
         run: pip install tox
 
       - name: Run tests
-        run: tox -e lint-opentelemetry-proto
+        run: tox -e lint-opentelemetry-proto-protobuf5
 
   lint-opentelemetry-sdk:
     name: opentelemetry-sdk

.github/workflows/misc_0.yml

@@ -124,8 +124,8 @@ jobs:
       - name: Run tests
         run: tox -e docs
 
-  docker-tests-proto3:
-    name: docker-tests-proto3
+  docker-tests-otlpexporter:
+    name: docker-tests-otlpexporter
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
@@ -140,10 +140,10 @@ jobs:
         run: pip install tox
 
       - name: Run tests
-        run: tox -e docker-tests-proto3
+        run: tox -e docker-tests-otlpexporter
 
-  docker-tests-proto4:
-    name: docker-tests-proto4
+  docker-tests-opencensus:
+    name: docker-tests-opencensus
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
@@ -158,7 +158,7 @@ jobs:
         run: pip install tox
 
       - name: Run tests
-        run: tox -e docker-tests-proto4
+        run: tox -e docker-tests-opencensus
 
   public-symbols-check:
     name: public-symbols-check