Skip to content

Updated contrib SHA #2342

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
ocelotl merged 1 commit into from
Dec 25, 2021
Merged

Updated contrib SHA #2342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
# Otherwise, set variable to the commit of your branch on
# opentelemetry-python-contrib which is compatible with these Core repo
# changes.
CONTRIB_REPO_SHA: b8d67dbc2f06e54dbbacd41fec085a3c0c180c71
CONTRIB_REPO_SHA: 30d0c2ea90dffa7d958a28a699a9021ecb04aa71
# This is needed because we do not clone the core repo in contrib builds anymore.
# When running contrib builds as part of core builds, we use actions/checkout@v2 which
# does not set an environment variable (simply just runs tox), which is different when
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
path: |
.tox
~/.cache/pip
key: v2-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-core
key: v3-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-core
# tox fails on windows and Python3.6 when tox dir is reused between builds so we remove it
- name: fix for windows + py3.6
if: ${{ matrix.os == 'windows-2019' && matrix.python-version == 'py36' }}
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
path: |
.tox
~/.cache/pip
key: v2-tox-cache-${{ matrix.tox-environment }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-core
key: v3-tox-cache-${{ matrix.tox-environment }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-core
- name: run tox
run: tox -e ${{ matrix.tox-environment }}

Expand Down Expand Up @@ -152,6 +152,6 @@ jobs:
path: |
.tox
~/.cache/pip
key: v2-tox-cache-${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-contrib
key: v3-tox-cache-${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-contrib
- name: run tox
run: tox -f ${{ matrix.python-version }}-${{ matrix.package }}
8 changes: 6 additions & 2 deletions opentelemetry-sdk/tests/logs/test_export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
from opentelemetry.trace import TraceFlags
from opentelemetry.trace.span import INVALID_SPAN_CONTEXT

is_pypy = hasattr(sys, "pypy_version_info")
supports_register_at_fork = hasattr(os, "fork") and sys.version_info >= (3, 7)


class TestSimpleLogProcessor(unittest.TestCase):
def test_simple_log_processor_default_level(self):
Expand Down Expand Up @@ -272,8 +275,9 @@ def bulk_log_and_flush(num_logs):
finished_logs = exporter.get_finished_logs()
self.assertEqual(len(finished_logs), 2415)

@unittest.skipUnless(
hasattr(os, "fork") and sys.version_info >= (3, 7),
# TODO: fix https://github.com/open-telemetry/opentelemetry-python/issues/2346
@unittest.skipIf(
is_pypy or not supports_register_at_fork,
"needs *nix and minor version 7 or later",
)
def test_batch_log_processor_fork(self):
Expand Down