opensource/opentelemetry-python-contrib
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-python-contrib.git synced 2025-07-28 12:43:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix schema url in instrumentation tests (#2730)

Browse Source 
* 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 <ocelotl@users.noreply.github.com>
This commit is contained in:
Emídio Neto
2024-07-23 20:09:30 -03:00
committed by GitHub
parent 92da527977
commit e799a74bbe
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/instrumentations_0.yml vendored
View File

@ -6,7 +6,7 @@ on:
- 'release/*' - 'release/*'
pull_request: pull_request:
env: env:
CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e CORE_REPO_SHA: main
jobs: jobs:
instrumentations-0: instrumentations-0:
@ -114,6 +114,6 @@ jobs:
path: | path: |
.tox .tox
~/.cache/pip ~/.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 - name: run tox
run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra

4
.github/workflows/instrumentations_1.yml vendored
View File

@ -6,7 +6,7 @@ on:
- 'release/*' - 'release/*'
pull_request: pull_request:
env: env:
CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e CORE_REPO_SHA: main
jobs: jobs:
instrumentations-1: instrumentations-1:
@ -59,6 +59,6 @@ jobs:
path: | path: |
.tox .tox
~/.cache/pip ~/.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 - name: run tox
run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra

2
.github/workflows/lint.yml vendored
View File

@ -6,7 +6,7 @@ on:
- 'release/*' - 'release/*'
pull_request: pull_request:
env: env:
CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e CORE_REPO_SHA: main
jobs: jobs:
lint-3_12: lint-3_12:

2
.github/workflows/test.yml vendored
View File

@ -6,7 +6,7 @@ on:
- 'release/*' - 'release/*'
pull_request: pull_request:
env: env:
CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e CORE_REPO_SHA: main
jobs: jobs:
misc: misc:

4
instrumentation/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py
View File

@ -223,7 +223,7 @@ class TestAioHttpIntegration(TestBase):
span = self.memory_exporter.get_finished_spans()[0] span = self.memory_exporter.get_finished_spans()[0]
self.assertEqual( self.assertEqual(
span.instrumentation_info.schema_url, span.instrumentation_info.schema_url,
"https://opentelemetry.io/schemas/v1.21.0", "https://opentelemetry.io/schemas/1.21.0",
) )
self.memory_exporter.clear() self.memory_exporter.clear()
@ -240,7 +240,7 @@ class TestAioHttpIntegration(TestBase):
span = self.memory_exporter.get_finished_spans()[0] span = self.memory_exporter.get_finished_spans()[0]
self.assertEqual( self.assertEqual(
span.instrumentation_info.schema_url, span.instrumentation_info.schema_url,
"https://opentelemetry.io/schemas/v1.21.0", "https://opentelemetry.io/schemas/1.21.0",
) )
self.memory_exporter.clear() self.memory_exporter.clear()

4
instrumentation/opentelemetry-instrumentation-urllib3/tests/test_urllib3_integration.py
View File

@ -239,7 +239,7 @@ class TestURLLib3Instrumentor(TestBase):
span = self.assert_span() span = self.assert_span()
self.assertEqual( self.assertEqual(
span.instrumentation_scope.schema_url, 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): def test_schema_url_both_semconv(self):
@ -250,7 +250,7 @@ class TestURLLib3Instrumentor(TestBase):
span = self.assert_span() span = self.assert_span()
self.assertEqual( self.assertEqual(
span.instrumentation_scope.schema_url, 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): def test_basic_not_found(self):