Skip to content

Commit 35630bc

Browse files
committed
fixed formatting
1 parent 4b3965e commit 35630bc

2 files changed

Lines changed: 28 additions & 13 deletions

File tree

propagator/opentelemetry-propagator-aws-xray/src/opentelemetry/propagators/aws/aws_xray_propagator.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,8 @@ def _is_valid_lineage(key):
318318

319319
is_hash_valid = (
320320
len(lineage_hash) == LINEAGE_HASH_LENGTH
321-
and AwsXRayPropagator._parse_natural_or_return_negative(lineage_hash, 16) != -1
321+
and AwsXRayPropagator._parse_natural_or_return_negative(lineage_hash, 16)
322+
!= -1
322323
)
323324
is_valid_loop_counter = (
324325
LINEAGE_MIN_LOOP_REQUEST_COUNTER <= loop_counter <= LINEAGE_MAX_LOOP_COUNTER

propagator/opentelemetry-propagator-aws-xray/tests/test_aws_xray_propagator.py

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def build_test_span_context(
9292
trace_state,
9393
)
9494

95-
95+
# pylint: disable=R0904
9696
class AwsXRayPropagatorTest(unittest.TestCase):
9797
XRAY_PROPAGATOR = AwsXRayPropagator()
9898

@@ -281,7 +281,9 @@ def test_extract_with_valid_lineage(self):
281281
),
282282
)
283283

284-
self.assertEqual(baggage.get_baggage(LINEAGE_KEY, context=context_with_extracted), lineage)
284+
self.assertEqual(
285+
baggage.get_baggage(LINEAGE_KEY, context=context_with_extracted), lineage
286+
)
285287

286288
self.assertEqual(
287289
get_nested_span_context(context_with_extracted),
@@ -417,14 +419,21 @@ def test_extract_inject_valid_lineage(self):
417419
}
418420
)
419421
setter_carrier = CaseInsensitiveDict()
420-
421-
extract_ctx = AwsXRayPropagatorTest.XRAY_PROPAGATOR.extract(getter_carrier, build_test_current_context())
422422

423-
self.assertEqual(baggage.get_baggage(LINEAGE_KEY, extract_ctx), "32767:e65a2c4d:255")
423+
extract_ctx = AwsXRayPropagatorTest.XRAY_PROPAGATOR.extract(
424+
getter_carrier, build_test_current_context()
425+
)
426+
427+
self.assertEqual(
428+
baggage.get_baggage(LINEAGE_KEY, extract_ctx), "32767:e65a2c4d:255"
429+
)
424430

425431
AwsXRayPropagatorTest.XRAY_PROPAGATOR.inject(setter_carrier, extract_ctx)
426-
427-
self.assertEqual(setter_carrier.get(TRACE_HEADER_KEY), 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=0;Lineage=32767:e65a2c4d:255')
432+
433+
self.assertEqual(
434+
setter_carrier.get(TRACE_HEADER_KEY),
435+
"Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=0;Lineage=32767:e65a2c4d:255",
436+
)
428437

429438
def test_extract_inject_invalid_lineage(self):
430439
getter_carrier = CaseInsensitiveDict(
@@ -433,15 +442,20 @@ def test_extract_inject_invalid_lineage(self):
433442
}
434443
)
435444
setter_carrier = CaseInsensitiveDict()
436-
437-
extract_ctx = AwsXRayPropagatorTest.XRAY_PROPAGATOR.extract(getter_carrier, build_test_current_context())
445+
446+
extract_ctx = AwsXRayPropagatorTest.XRAY_PROPAGATOR.extract(
447+
getter_carrier, build_test_current_context()
448+
)
438449

439450
self.assertEqual(baggage.get_baggage(LINEAGE_KEY, extract_ctx), None)
440451

441452
AwsXRayPropagatorTest.XRAY_PROPAGATOR.inject(setter_carrier, extract_ctx)
442-
443-
self.assertEqual(setter_carrier.get(TRACE_HEADER_KEY), 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=0')
444-
453+
454+
self.assertEqual(
455+
setter_carrier.get(TRACE_HEADER_KEY),
456+
"Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=0",
457+
)
458+
445459
@patch("opentelemetry.propagators.aws.aws_xray_propagator.trace")
446460
def test_fields(self, mock_trace):
447461
"""Make sure the fields attribute returns the fields used in inject"""

0 commit comments

Comments
 (0)