Skip to content
This repository was archived by the owner on Jul 11, 2022. It is now read-only.

Commit 7ebd5e0

Browse files
authored
Change default for one_span_per_rpc to False (#105)
1 parent c4908a4 commit 7ebd5e0

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

jaeger_client/tracer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def __init__(self, service_name, reporter, sampler, metrics=None,
4646
trace_id_header=constants.TRACE_ID_HEADER,
4747
baggage_header_prefix=constants.BAGGAGE_HEADER_PREFIX,
4848
debug_id_header=constants.DEBUG_ID_HEADER_KEY,
49-
one_span_per_rpc=True, extra_codecs=None,
49+
one_span_per_rpc=False, extra_codecs=None,
5050
tags=None):
5151
self.service_name = service_name
5252
self.reporter = reporter

tests/test_tracer.py

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def test_forced_sampling(tracer):
6868
assert span.is_debug()
6969

7070

71-
@pytest.mark.parametrize('mode', ['arg', 'ref'])
71+
@pytest.mark.parametrize('mode,', ['arg', 'ref'])
7272
def test_start_child(tracer, mode):
7373
root = tracer.start_span("test")
7474
if mode == 'arg':
@@ -90,6 +90,21 @@ def test_start_child(tracer, mode):
9090
tracer.reporter.assert_called_once()
9191
tracer.close()
9292

93+
@pytest.mark.parametrize('one_span_per_rpc,', [True, False])
94+
def test_one_span_per_rpc(tracer, one_span_per_rpc):
95+
tracer.one_span_per_rpc = one_span_per_rpc
96+
span = tracer.start_span("client")
97+
span.set_tag(ext_tags.SPAN_KIND, ext_tags.SPAN_KIND_RPC_CLIENT)
98+
child = tracer.start_span(
99+
"server",
100+
references=child_of(span.context),
101+
tags={ext_tags.SPAN_KIND: ext_tags.SPAN_KIND_RPC_SERVER},
102+
)
103+
assert span.trace_id == child.trace_id, "Must have the same trace ids"
104+
if one_span_per_rpc:
105+
assert span.span_id == child.span_id, "Must have the same span ids"
106+
else:
107+
assert span.span_id != child.span_id, "Must have different span ids"
93108

94109
def test_child_span(tracer):
95110
span = tracer.start_span("test")

0 commit comments

Comments
 (0)