Merge branch 'main' into issue_2598

open-telemetry · Jul 23, 2024 · 377bfa4 · 377bfa4
2 parents 3b5c993 + e799a74
commit 377bfa4
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/instrumentations_0.yml b/.github/workflows/instrumentations_0.yml
@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e
+  CORE_REPO_SHA: main
 
 jobs:
   instrumentations-0:
@@ -114,6 +114,6 @@ jobs:
           path: |
             .tox
             ~/.cache/pip
-          key: v7-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
+          key: v7-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('gen-requirements.txt', 'dev-requirements.txt') }}
       - name: run tox
         run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra
diff --git a/.github/workflows/instrumentations_1.yml b/.github/workflows/instrumentations_1.yml
@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e
+  CORE_REPO_SHA: main
 
 jobs:
   instrumentations-1:
@@ -59,6 +59,6 @@ jobs:
           path: |
             .tox
             ~/.cache/pip
-          key: v7-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
+          key: v7-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('gen-requirements.txt', 'dev-requirements.txt') }}
       - name: run tox
         run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e
+  CORE_REPO_SHA: main
 
 jobs:
   lint-3_12:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e
+  CORE_REPO_SHA: main
 
 jobs:
   misc:

diff --git a/...ion/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py b/...ion/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py
@@ -223,7 +223,7 @@ def test_schema_url_new_semconv(self):
             span = self.memory_exporter.get_finished_spans()[0]
             self.assertEqual(
                 span.instrumentation_info.schema_url,
-                "https://opentelemetry.io/schemas/v1.21.0",
+                "https://opentelemetry.io/schemas/1.21.0",
             )
             self.memory_exporter.clear()
 
@@ -240,7 +240,7 @@ def test_schema_url_both_semconv(self):
             span = self.memory_exporter.get_finished_spans()[0]
             self.assertEqual(
                 span.instrumentation_info.schema_url,
-                "https://opentelemetry.io/schemas/v1.21.0",
+                "https://opentelemetry.io/schemas/1.21.0",
             )
             self.memory_exporter.clear()
 

diff --git a/instrumentation/opentelemetry-instrumentation-urllib3/tests/test_urllib3_integration.py b/instrumentation/opentelemetry-instrumentation-urllib3/tests/test_urllib3_integration.py
@@ -239,7 +239,7 @@ def test_schema_url_new_semconv(self):
         span = self.assert_span()
         self.assertEqual(
             span.instrumentation_scope.schema_url,
-            "https://opentelemetry.io/schemas/v1.21.0",
+            "https://opentelemetry.io/schemas/1.21.0",
         )
 
     def test_schema_url_both_semconv(self):
@@ -250,7 +250,7 @@ def test_schema_url_both_semconv(self):
         span = self.assert_span()
         self.assertEqual(
             span.instrumentation_scope.schema_url,
-            "https://opentelemetry.io/schemas/v1.21.0",
+            "https://opentelemetry.io/schemas/1.21.0",
         )
 
     def test_basic_not_found(self):