Skip to content

Commit 9b8646d

Browse files
authored
move tracing sdk setup from setUpClass to setUp (#2819)
* move tracing sdk setup from setUpClass to setUp * Update contrib SHA
1 parent a3346ae commit 9b8646d

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
# Otherwise, set variable to the commit of your branch on
1111
# opentelemetry-python-contrib which is compatible with these Core repo
1212
# changes.
13-
CONTRIB_REPO_SHA: 42ff80bef8a03ff214a54323a2631da06e6dc5e4
13+
CONTRIB_REPO_SHA: c37a77e2efa9b67d4b017a3aa6d5e5f0bc5433c9
1414
# This is needed because we do not clone the core repo in contrib builds anymore.
1515
# When running contrib builds as part of core builds, we use actions/checkout@v2 which
1616
# does not set an environment variable (simply just runs tox), which is different when

tests/opentelemetry-test-utils/src/opentelemetry/test/test_base.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,15 @@
3434
class TestBase(unittest.TestCase):
3535
# pylint: disable=C0103
3636

37-
@classmethod
38-
def setUpClass(cls):
39-
result = cls.create_tracer_provider()
40-
cls.tracer_provider, cls.memory_exporter = result
41-
# This is done because set_tracer_provider cannot override the
42-
# current tracer provider.
43-
reset_trace_globals()
44-
trace_api.set_tracer_provider(cls.tracer_provider)
45-
46-
@classmethod
47-
def tearDownClass(cls):
37+
def setUp(self):
38+
super().setUp()
39+
result = self.create_tracer_provider()
40+
self.tracer_provider, self.memory_exporter = result
4841
# This is done because set_tracer_provider cannot override the
4942
# current tracer provider.
5043
reset_trace_globals()
44+
trace_api.set_tracer_provider(self.tracer_provider)
5145

52-
def setUp(self):
5346
self.memory_exporter.clear()
5447
# This is done because set_meter_provider cannot override the
5548
# current meter provider.
@@ -60,6 +53,11 @@ def setUp(self):
6053
) = self.create_meter_provider()
6154
metrics_api.set_meter_provider(self.meter_provider)
6255

56+
def tearDown(self):
57+
super().tearDown()
58+
reset_trace_globals()
59+
reset_metrics_globals()
60+
6361
def get_finished_spans(self):
6462
return FinishedTestSpans(
6563
self, self.memory_exporter.get_finished_spans()

0 commit comments

Comments
 (0)