Skip to content

fix schema url in instrumentation tests #2730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 23, 2024
Merged

fix schema url in instrumentation tests #2730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5481d3d
fix schema url in instrumentation tests
emdneto Jul 23, 2024
98cb0f8
change core repo sha for test
emdneto Jul 23, 2024
2d82d1f
Update CORE_REPO_SHA
ocelotl Jul 23, 2024
438fd96
Try removing cache
ocelotl Jul 23, 2024
f478b30
Clear cache here as well
ocelotl Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/instrumentations_0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'release/*'
pull_request:
env:
CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e
CORE_REPO_SHA: main

jobs:
instrumentations-0:
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/instrumentations_1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'release/*'
pull_request:
env:
CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e
CORE_REPO_SHA: main

jobs:
instrumentations-1:
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'release/*'
pull_request:
env:
CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e
CORE_REPO_SHA: main

jobs:
lint-3_12:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'release/*'
pull_request:
env:
CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e
CORE_REPO_SHA: main

jobs:
misc:
Expand Down
4 changes: 2 additions & 2 deletions ...ion/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -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()

Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-urllib3/tests/test_urllib3_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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):
Expand Down