Skip to content

Commit 30f5eb0

Browse files
committed
Update tests to use new ids generator
1 parent bd7da0c commit 30f5eb0

File tree

3 files changed

+21
-11
lines changed

3 files changed

+21
-11
lines changed

docs/examples/opentelemetry-example-app/tests/test_flask_example.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import opentelemetry_example_app.flask_example as flask_example
2323
from opentelemetry import trace
24-
from opentelemetry.sdk import trace as trace_sdk
24+
from opentelemetry.sdk.trace.random_ids_generator import RandomIdsGenerator
2525

2626

2727
class TestFlaskExample(unittest.TestCase):
@@ -46,7 +46,8 @@ def tearDown(self):
4646
self.send_patcher.stop()
4747

4848
def test_full_path(self):
49-
trace_id = trace_sdk.generate_trace_id()
49+
ids_generator = RandomIdsGenerator()
50+
trace_id = ids_generator.generate_trace_id()
5051
# We need to use the Werkzeug test app because
5152
# The headers are injected at the wsgi layer.
5253
# The flask test app will not include these, and
@@ -58,7 +59,7 @@ def test_full_path(self):
5859
headers={
5960
"traceparent": "00-{:032x}-{:016x}-{:02x}".format(
6061
trace_id,
61-
trace_sdk.generate_span_id(),
62+
ids_generator.generate_span_id(),
6263
trace.TraceFlags.SAMPLED,
6364
)
6465
},

exporter/opentelemetry-exporter-datadog/tests/test_datadog_format.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
from opentelemetry import trace as trace_api
1818
from opentelemetry.exporter.datadog import constants, propagator
1919
from opentelemetry.sdk import trace
20+
from opentelemetry.sdk.trace.random_ids_generator import RandomIdsGenerator
2021
from opentelemetry.trace import get_current_span, set_span_in_context
2122

2223
FORMAT = propagator.DatadogFormat()
@@ -30,11 +31,12 @@ def get_as_list(dict_object, key):
3031
class TestDatadogFormat(unittest.TestCase):
3132
@classmethod
3233
def setUpClass(cls):
34+
ids_generator = RandomIdsGenerator()
3335
cls.serialized_trace_id = propagator.format_trace_id(
34-
trace.generate_trace_id()
36+
ids_generator.generate_trace_id()
3537
)
3638
cls.serialized_parent_id = propagator.format_span_id(
37-
trace.generate_span_id()
39+
ids_generator.generate_span_id()
3840
)
3941
cls.serialized_origin = "origin-service"
4042

@@ -103,11 +105,13 @@ def test_context_propagation(self):
103105
)
104106
self.assertTrue(parent_context.is_remote)
105107

108+
ids_generator = RandomIdsGenerator()
109+
106110
child = trace.Span(
107111
"child",
108112
trace_api.SpanContext(
109113
parent_context.trace_id,
110-
trace.generate_span_id(),
114+
ids_generator.generate_span_id(),
111115
is_remote=False,
112116
trace_flags=parent_context.trace_flags,
113117
trace_state=parent_context.trace_state,
@@ -148,11 +152,13 @@ def test_sampling_priority_auto_reject(self):
148152

149153
self.assertEqual(parent_context.trace_flags, constants.AUTO_REJECT)
150154

155+
ids_generator = RandomIdsGenerator()
156+
151157
child = trace.Span(
152158
"child",
153159
trace_api.SpanContext(
154160
parent_context.trace_id,
155-
trace.generate_span_id(),
161+
ids_generator.generate_span_id(),
156162
is_remote=False,
157163
trace_flags=parent_context.trace_flags,
158164
trace_state=parent_context.trace_state,

opentelemetry-sdk/tests/trace/propagation/test_b3_format.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import opentelemetry.sdk.trace as trace
1919
import opentelemetry.sdk.trace.propagation.b3_format as b3_format
20+
from opentelemetry.sdk.trace.random_ids_generator import RandomIdsGenerator
2021
import opentelemetry.trace as trace_api
2122
from opentelemetry.context import get_current
2223

@@ -34,11 +35,12 @@ def get_child_parent_new_carrier(old_carrier):
3435
parent_context = trace_api.get_current_span(ctx).get_context()
3536

3637
parent = trace.Span("parent", parent_context)
38+
ids_generator = RandomIdsGenerator()
3739
child = trace.Span(
3840
"child",
3941
trace_api.SpanContext(
4042
parent_context.trace_id,
41-
trace.generate_span_id(),
43+
ids_generator.generate_span_id(),
4244
is_remote=False,
4345
trace_flags=parent_context.trace_flags,
4446
trace_state=parent_context.trace_state,
@@ -56,14 +58,15 @@ def get_child_parent_new_carrier(old_carrier):
5658
class TestB3Format(unittest.TestCase):
5759
@classmethod
5860
def setUpClass(cls):
61+
ids_generator = RandomIdsGenerator()
5962
cls.serialized_trace_id = b3_format.format_trace_id(
60-
trace.generate_trace_id()
63+
ids_generator.generate_trace_id()
6164
)
6265
cls.serialized_span_id = b3_format.format_span_id(
63-
trace.generate_span_id()
66+
ids_generator.generate_span_id()
6467
)
6568
cls.serialized_parent_id = b3_format.format_span_id(
66-
trace.generate_span_id()
69+
ids_generator.generate_span_id()
6770
)
6871

6972
def test_extract_multi_header(self):

0 commit comments

Comments
 (0)