Skip to content

Commit f391cd7

Browse files
NathanielRNNathanielRN
committed
Upate reference version of OTel
1 parent 01b26e2 commit f391cd7

File tree

3 files changed

+56
-41
lines changed

3 files changed

+56
-41
lines changed

‎sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ package_dir=
3939
=src
4040
packages=find_namespace:
4141
install_requires =
42-
opentelemetry-api == 0.15.dev0
42+
opentelemetry-api == 0.15.b0
4343

4444
[options.entry_points]
4545
opentelemetry_propagator =
4646
aws_xray = opentelemetry.sdk.extension.aws.trace.propagation.aws_xray_format:AwsXRayFormat
4747

4848
[options.extras_require]
4949
test =
50-
opentelemetry-test == 0.14.b0
50+
opentelemetry-test == 0.15.b0
5151

5252
[options.packages.find]
5353
where = src

‎sdk-extension/opentelemetry-sdk-extension-aws/tests/trace/propagation/test_aws_xray_format.py

+52-37
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,14 @@
2424
)
2525
import opentelemetry.trace as trace_api
2626
from opentelemetry.trace import (
27-
DEFAULT_TRACE_OPTIONS,
28-
DEFAULT_TRACE_STATE,
29-
INVALID_SPAN_CONTEXT,
30-
SpanContext,
31-
TraceFlags,
32-
set_span_in_context,
27+
DEFAULT_TRACE_OPTIONS,
28+
DEFAULT_TRACE_STATE,
29+
INVALID_SPAN_CONTEXT,
30+
SpanContext,
31+
TraceFlags,
32+
set_span_in_context,
3333
TraceState
3434
)
35-
from opentelemetry.trace.propagation.textmap import (
36-
Getter,
37-
Setter,
38-
TextMapPropagatorT,
39-
)
4035
from opentelemetry.trace.span import INVALID_TRACE_ID
4136

4237
TRACE_ID_BASE16 = "8a3c60f7d188f8fa79d48a391a778fa6"
@@ -71,17 +66,37 @@ def build_test_context(
7166
)
7267

7368
def build_dict_with_xray_trace_header(
74-
trace_id=f"{AwsXRayFormat.TRACE_ID_VERSION}{AwsXRayFormat.TRACE_ID_DELIMITER}{TRACE_ID_BASE16[:AwsXRayFormat.TRACE_ID_FIRST_PART_LENGTH]}{AwsXRayFormat.TRACE_ID_DELIMITER}{TRACE_ID_BASE16[AwsXRayFormat.TRACE_ID_FIRST_PART_LENGTH:]}",
69+
trace_id="{}{}{}{}{}".format(
70+
AwsXRayFormat.TRACE_ID_VERSION,
71+
AwsXRayFormat.TRACE_ID_DELIMITER,
72+
TRACE_ID_BASE16[:AwsXRayFormat.TRACE_ID_FIRST_PART_LENGTH],
73+
AwsXRayFormat.TRACE_ID_DELIMITER,
74+
TRACE_ID_BASE16[AwsXRayFormat.TRACE_ID_FIRST_PART_LENGTH:],
75+
),
7576
span_id=SPAN_ID_BASE16,
7677
sampled="0",
7778
):
7879
carrier = CaseInsensitiveDict()
79-
80-
carrier[AwsXRayFormat.TRACE_HEADER_KEY] = (
81-
f"{AwsXRayFormat.TRACE_ID_KEY}{AwsXRayFormat.KEY_AND_VALUE_DELIMITER}{trace_id}{AwsXRayFormat.KV_PAIR_DELIMITER}"
82-
f"{AwsXRayFormat.PARENT_ID_KEY}{AwsXRayFormat.KEY_AND_VALUE_DELIMITER}{span_id}{AwsXRayFormat.KV_PAIR_DELIMITER}"
83-
f"{AwsXRayFormat.SAMPLED_FLAG_KEY}{AwsXRayFormat.KEY_AND_VALUE_DELIMITER}{sampled}"
84-
)
80+
81+
carrier[AwsXRayFormat.TRACE_HEADER_KEY] = ''.join([
82+
"{}{}{}{}".format(
83+
AwsXRayFormat.TRACE_ID_KEY,
84+
AwsXRayFormat.KEY_AND_VALUE_DELIMITER,
85+
trace_id,
86+
AwsXRayFormat.KV_PAIR_DELIMITER,
87+
),
88+
"{}{}{}{}".format(
89+
AwsXRayFormat.PARENT_ID_KEY,
90+
AwsXRayFormat.KEY_AND_VALUE_DELIMITER,
91+
span_id,
92+
AwsXRayFormat.KV_PAIR_DELIMITER,
93+
),
94+
"{}{}{}".format(
95+
AwsXRayFormat.SAMPLED_FLAG_KEY,
96+
AwsXRayFormat.KEY_AND_VALUE_DELIMITER,
97+
sampled,
98+
)
99+
])
85100

86101
return carrier
87102

@@ -93,15 +108,15 @@ def get_extracted_span_context(encompassing_context):
93108
).get_span_context()
94109

95110
class AwsXRayPropagatorTest(unittest.TestCase):
96-
carrier_setter: Setter[TextMapPropagatorT] = CaseInsensitiveDict.__setitem__
97-
carrier_getter: Getter[TextMapPropagatorT] = get_as_list
111+
carrier_setter = CaseInsensitiveDict.__setitem__
112+
carrier_getter = get_as_list
98113
XRAY_PROPAGATOR = AwsXRayFormat()
99-
114+
100115
# Inject Tests
101116

102117
def test_inject_into_non_sampled_context(self):
103118
carrier = CaseInsensitiveDict()
104-
119+
105120
AwsXRayPropagatorTest.XRAY_PROPAGATOR.inject(
106121
AwsXRayPropagatorTest.carrier_setter,
107122
carrier,
@@ -121,13 +136,13 @@ def test_inject_into_non_sampled_context(self):
121136

122137
def test_inject_into_sampled_context(self):
123138
carrier = CaseInsensitiveDict()
124-
139+
125140
AwsXRayPropagatorTest.XRAY_PROPAGATOR.inject(
126141
AwsXRayPropagatorTest.carrier_setter,
127142
carrier,
128143
build_test_context(trace_flags=TraceFlags(TraceFlags.SAMPLED))
129144
)
130-
145+
131146
self.assertTrue(
132147
set(
133148
carrier.items()
@@ -138,16 +153,16 @@ def test_inject_into_sampled_context(self):
138153
),
139154
'Failed to inject into context that was already sampled'
140155
)
141-
156+
142157
def test_inject_into_context_with_non_default_state(self):
143158
carrier = CaseInsensitiveDict()
144-
159+
145160
AwsXRayPropagatorTest.XRAY_PROPAGATOR.inject(
146161
AwsXRayPropagatorTest.carrier_setter,
147162
carrier,
148163
build_test_context(trace_state=TraceState({"foo" : "bar"}))
149164
)
150-
165+
151166
# TODO: (NathanielRN) Assert trace state when the propagator supports it
152167
self.assertTrue(
153168
set(
@@ -183,7 +198,7 @@ def test_extract_empty_carrier_from_invalid_context(self):
183198
get_extracted_span_context(actual_context_encompassing_extracted),
184199
INVALID_SPAN_CONTEXT
185200
)
186-
201+
187202
def test_extract_sampled_context(self):
188203
actual_context_encompassing_extracted = AwsXRayPropagatorTest.XRAY_PROPAGATOR.extract(
189204
AwsXRayPropagatorTest.carrier_getter,
@@ -223,7 +238,7 @@ def test_extract_different_order(self):
223238
get_extracted_span_context(actual_context_encompassing_extracted),
224239
get_extracted_span_context(build_test_context())
225240
)
226-
241+
227242
def test_extract_with_additional_fields(self):
228243
default_xray_trace_header_dict = build_dict_with_xray_trace_header()
229244
xray_trace_header_dict_with_extra_fields = CaseInsensitiveDict(
@@ -240,7 +255,7 @@ def test_extract_with_additional_fields(self):
240255
get_extracted_span_context(actual_context_encompassing_extracted),
241256
get_extracted_span_context(build_test_context())
242257
)
243-
258+
244259
def test_extract_invalid_xray_trace_header(self):
245260
actual_context_encompassing_extracted = AwsXRayPropagatorTest.XRAY_PROPAGATOR.extract(
246261
AwsXRayPropagatorTest.carrier_getter,
@@ -253,20 +268,20 @@ def test_extract_invalid_xray_trace_header(self):
253268
get_extracted_span_context(actual_context_encompassing_extracted),
254269
INVALID_SPAN_CONTEXT
255270
)
256-
271+
257272
def test_extract_invalid_trace_id(self):
258273
actual_context_encompassing_extracted = AwsXRayPropagatorTest.XRAY_PROPAGATOR.extract(
259274
AwsXRayPropagatorTest.carrier_getter,
260275
build_dict_with_xray_trace_header(
261-
trace_id="abcdefghijklmnopqrstuvwxyzabcdef"
276+
trace_id="abcdefghijklmnopqrstuvwxyz123456"
262277
),
263278
)
264279

265280
self.assertEqual(
266281
get_extracted_span_context(actual_context_encompassing_extracted),
267282
INVALID_SPAN_CONTEXT
268283
)
269-
284+
270285
def test_extract_invalid_trace_id_size(self):
271286
actual_context_encompassing_extracted = AwsXRayPropagatorTest.XRAY_PROPAGATOR.extract(
272287
AwsXRayPropagatorTest.carrier_getter,
@@ -292,7 +307,7 @@ def test_extract_invalid_span_id(self):
292307
get_extracted_span_context(actual_context_encompassing_extracted),
293308
INVALID_SPAN_CONTEXT
294309
)
295-
310+
296311
def test_extract_invalid_span_id_size(self):
297312
actual_context_encompassing_extracted = AwsXRayPropagatorTest.XRAY_PROPAGATOR.extract(
298313
AwsXRayPropagatorTest.carrier_getter,
@@ -305,7 +320,7 @@ def test_extract_invalid_span_id_size(self):
305320
get_extracted_span_context(actual_context_encompassing_extracted),
306321
INVALID_SPAN_CONTEXT
307322
)
308-
323+
309324
def test_extract_invalid_empty_sampled_flag(self):
310325
actual_context_encompassing_extracted = AwsXRayPropagatorTest.XRAY_PROPAGATOR.extract(
311326
AwsXRayPropagatorTest.carrier_getter,
@@ -318,7 +333,7 @@ def test_extract_invalid_empty_sampled_flag(self):
318333
get_extracted_span_context(actual_context_encompassing_extracted),
319334
INVALID_SPAN_CONTEXT
320335
)
321-
336+
322337
def test_extract_invalid_sampled_flag_size(self):
323338
actual_context_encompassing_extracted = AwsXRayPropagatorTest.XRAY_PROPAGATOR.extract(
324339
AwsXRayPropagatorTest.carrier_getter,
@@ -331,7 +346,7 @@ def test_extract_invalid_sampled_flag_size(self):
331346
get_extracted_span_context(actual_context_encompassing_extracted),
332347
INVALID_SPAN_CONTEXT
333348
)
334-
349+
335350
def test_extract_invalid_non_numeric_sampled_flag(self):
336351
actual_context_encompassing_extracted = AwsXRayPropagatorTest.XRAY_PROPAGATOR.extract(
337352
AwsXRayPropagatorTest.carrier_getter,

‎sdk-extension/opentelemetry-sdk-extension-aws/tests/trace/test_aws_xray_ids_generator.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
class AwsXRayIdsGeneratorTest(unittest.TestCase):
2626
def test_ids_are_valid(self):
2727
ids_generator = AwsXRayIdsGenerator()
28-
for _ in range(1_000):
28+
for _ in range(1000):
2929
trace_id = ids_generator.generate_trace_id()
3030
self.assertTrue(trace_id != INVALID_TRACE_ID)
3131
span_id = ids_generator.generate_span_id()
3232
self.assertTrue(span_id != INVALID_TRACE_ID)
3333

3434
def test_id_timestamps_are_acceptable_for_xray(self):
3535
ids_generator = AwsXRayIdsGenerator()
36-
for _ in range(1_000):
36+
for _ in range(1000):
3737
trace_id = ids_generator.generate_trace_id()
3838
trace_id_time = trace_id >> 96
3939
current_time = int(datetime.datetime.utcnow().timestamp())

0 commit comments

Comments
 (0)