Parent is now always passed in via Context, intead of Span or SpanContext (#1146)

Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com>
This commit is contained in:
alrex
2020-10-08 08:39:04 -07:00
committed by alrex
parent eb7724f1ca
commit cbf2feb8e7

View File

@ -49,8 +49,8 @@ class TestJinja2Instrumentor(TestBase):
# pylint:disable=unbalanced-tuple-unpacking # pylint:disable=unbalanced-tuple-unpacking
render, template, root = spans[:3] render, template, root = spans[:3]
self.assertIs(render.parent, root.get_context()) self.assertIs(render.parent, root.get_span_context())
self.assertIs(template.parent, root.get_context()) self.assertIs(template.parent, root.get_span_context())
self.assertIsNone(root.parent) self.assertIsNone(root.parent)
def test_render_inline_template(self): def test_render_inline_template(self):
@ -88,8 +88,8 @@ class TestJinja2Instrumentor(TestBase):
# pylint:disable=unbalanced-tuple-unpacking # pylint:disable=unbalanced-tuple-unpacking
template, generate, root = spans template, generate, root = spans
self.assertIs(generate.parent, root.get_context()) self.assertIs(generate.parent, root.get_span_context())
self.assertIs(template.parent, root.get_context()) self.assertIs(template.parent, root.get_span_context())
self.assertIsNone(root.parent) self.assertIsNone(root.parent)
def test_generate_inline_template(self): def test_generate_inline_template(self):
@ -131,11 +131,11 @@ class TestJinja2Instrumentor(TestBase):
# pylint:disable=unbalanced-tuple-unpacking # pylint:disable=unbalanced-tuple-unpacking
compile2, load2, compile1, load1, render, root = spans compile2, load2, compile1, load1, render, root = spans
self.assertIs(compile2.parent, load2.get_context()) self.assertIs(compile2.parent, load2.get_span_context())
self.assertIs(load2.parent, root.get_context()) self.assertIs(load2.parent, root.get_span_context())
self.assertIs(compile1.parent, load1.get_context()) self.assertIs(compile1.parent, load1.get_span_context())
self.assertIs(load1.parent, render.get_context()) self.assertIs(load1.parent, render.get_span_context())
self.assertIs(render.parent, root.get_context()) self.assertIs(render.parent, root.get_span_context())
self.assertIsNone(root.parent) self.assertIsNone(root.parent)
def test_file_template(self): def test_file_template(self):