diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 14440b0953..73a8448f75 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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: 71b0ca7d80a2c717bdee12c11ede6d803ac980df + CONTRIB_REPO_SHA: 2319247930d8aed1c67a10c72fe3c1d0481fdbc6 jobs: build: diff --git a/shim/opentelemetry-opentracing-shim/tests/testbed/test_common_request_handler/test_threads.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_common_request_handler/test_threads.py index cdba704c15..36c0a8b841 100644 --- a/shim/opentelemetry-opentracing-shim/tests/testbed/test_common_request_handler/test_threads.py +++ b/shim/opentelemetry-opentracing-shim/tests/testbed/test_common_request_handler/test_threads.py @@ -115,8 +115,7 @@ def test_bad_solution_to_set_parent(self): parent_span = get_one_by_operation_name(spans, "parent") self.assertIsNotNone(parent_span) - spans = [s for s in spans if s.name == "send"] + spans = [s for s in spans if s != parent_span] + self.assertEqual(len(spans), 2) for span in spans: - if span == parent_span: - continue self.assertIsChildOf(span, parent_span)