From e799a74bbe62b103bdb5649e4c5849fc977ee35f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Em=C3=ADdio=20Neto?= <9735060+emdneto@users.noreply.github.com> Date: Tue, 23 Jul 2024 20:09:30 -0300 Subject: [PATCH] fix schema url in instrumentation tests (#2730) * fix schema url in instrumentation tests * change core repo sha for test * Update CORE_REPO_SHA * Try removing cache * Clear cache here as well --------- Co-authored-by: Diego Hurtado --- .github/workflows/instrumentations_0.yml | 4 ++-- .github/workflows/instrumentations_1.yml | 4 ++-- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 2 +- .../tests/test_aiohttp_client_integration.py | 4 ++-- .../tests/test_urllib3_integration.py | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/instrumentations_0.yml b/.github/workflows/instrumentations_0.yml index 69c07bfacc..382284d204 100644 --- 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 index a658796ef8..f3e63116f8 100644 --- 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 index 29cd5cac16..b9f7a41c17 100644 --- 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 index ee66efac64..2714942c21 100644 --- 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/instrumentation/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py b/instrumentation/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py index 3873a6f094..adf54c295b 100644 --- a/instrumentation/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py +++ b/instrumentation/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 index 7dc899691f..5ad4e40ca3 100644 --- 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):