Skip to content

Commit 142ba3a

Browse files
nikhilmantri0902nikhilmantri0902
committed
fix: tox lint errors
1 parent 92a8960 commit 142ba3a

File tree

2 files changed

+57
-25
lines changed

2 files changed

+57
-25
lines changed

‎exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/_internal/trace_encoder/__init__.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ def _encode_resource_spans(
105105
return pb2_resource_spans
106106

107107

108-
def _span_flags(child_trace_flags: int, parent_span_context: Optional[SpanContext]) -> int:
108+
def _span_flags(
109+
child_trace_flags: int, parent_span_context: Optional[SpanContext]
110+
) -> int:
109111
# Lower 8 bits: W3C TraceFlags
110112
flags = child_trace_flags & PB2SpanFlags.SPAN_FLAGS_TRACE_FLAGS_MASK
111113
# Always indicate whether parent remote information is known

‎exporter/opentelemetry-exporter-otlp-proto-common/tests/test_trace_encoder.py‎

Lines changed: 54 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
)
2424
from opentelemetry.exporter.otlp.proto.common._internal.trace_encoder import (
2525
_SPAN_KIND_MAP,
26-
_encode_status,
27-
_encode_span,
2826
_encode_links,
27+
_encode_span,
28+
_encode_status,
2929
)
3030
from opentelemetry.exporter.otlp.proto.common.trace_encoder import encode_spans
3131
from opentelemetry.proto.collector.trace.v1.trace_service_pb2 import (
@@ -44,15 +44,8 @@
4444
)
4545
from opentelemetry.proto.trace.v1.trace_pb2 import ScopeSpans as PB2ScopeSpans
4646
from opentelemetry.proto.trace.v1.trace_pb2 import Span as PB2SPan
47-
from opentelemetry.proto.trace.v1.trace_pb2 import Status as PB2Status
4847
from opentelemetry.proto.trace.v1.trace_pb2 import SpanFlags as PB2SpanFlags
49-
50-
# Mask for all currently-defined span flag bits (0-9): lower 8 trace flags + has/is remote bits
51-
ALL_SPAN_FLAGS_MASK = (
52-
PB2SpanFlags.SPAN_FLAGS_TRACE_FLAGS_MASK
53-
| PB2SpanFlags.SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK
54-
| PB2SpanFlags.SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK
55-
)
48+
from opentelemetry.proto.trace.v1.trace_pb2 import Status as PB2Status
5649
from opentelemetry.sdk.trace import Event as SDKEvent
5750
from opentelemetry.sdk.trace import Resource as SDKResource
5851
from opentelemetry.sdk.trace import SpanContext as SDKSpanContext
@@ -66,6 +59,13 @@
6659
from opentelemetry.trace.status import Status as SDKStatus
6760
from opentelemetry.trace.status import StatusCode as SDKStatusCode
6861

62+
# Mask for all currently-defined span flag bits (0-9): lower 8 trace flags + has/is remote bits
63+
ALL_SPAN_FLAGS_MASK = (
64+
PB2SpanFlags.SPAN_FLAGS_TRACE_FLAGS_MASK
65+
| PB2SpanFlags.SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK
66+
| PB2SpanFlags.SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK
67+
)
68+
6969

7070
class TestOTLPTraceEncoder(unittest.TestCase):
7171
def test_encode_spans(self):
@@ -515,44 +515,74 @@ def test_encode_status_code_translations(self):
515515

516516
class TestSpanFlagsEncoding(unittest.TestCase):
517517
def test_span_flags_root_unsampled(self):
518-
span_context = SDKSpanContext(0x1, 0x2, is_remote=False, trace_flags=0x00)
518+
span_context = SDKSpanContext(
519+
0x1, 0x2, is_remote=False, trace_flags=0x00
520+
)
519521
span = SDKSpan(name="root", context=span_context, parent=None)
520522
pb = _encode_span(span)
521523
assert (pb.flags & PB2SpanFlags.SPAN_FLAGS_TRACE_FLAGS_MASK) == 0x00
522-
assert (pb.flags & PB2SpanFlags.SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK) != 0
524+
assert (
525+
pb.flags & PB2SpanFlags.SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK
526+
) != 0
523527
assert (pb.flags & PB2SpanFlags.SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK) == 0
524528
assert (pb.flags & ~ALL_SPAN_FLAGS_MASK) == 0
525529

526530
def test_span_flags_root_sampled(self):
527-
span_context = SDKSpanContext(0x1, 0x2, is_remote=False, trace_flags=0x01)
531+
span_context = SDKSpanContext(
532+
0x1, 0x2, is_remote=False, trace_flags=0x01
533+
)
528534
span = SDKSpan(name="root", context=span_context, parent=None)
529535
pb = _encode_span(span)
530536
assert (pb.flags & PB2SpanFlags.SPAN_FLAGS_TRACE_FLAGS_MASK) == 0x01
531-
assert (pb.flags & PB2SpanFlags.SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK) != 0
537+
assert (
538+
pb.flags & PB2SpanFlags.SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK
539+
) != 0
532540
assert (pb.flags & PB2SpanFlags.SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK) == 0
533541
assert (pb.flags & ~ALL_SPAN_FLAGS_MASK) == 0
534542

535543
def test_span_flags_remote_parent_sampled(self):
536544
parent = SDKSpanContext(0x1, 0x9, is_remote=True)
537-
span_context = SDKSpanContext(0x1, 0x2, is_remote=False, trace_flags=0x01)
545+
span_context = SDKSpanContext(
546+
0x1, 0x2, is_remote=False, trace_flags=0x01
547+
)
538548
span = SDKSpan(name="child", context=span_context, parent=parent)
539549
pb = _encode_span(span)
540550
assert (pb.flags & PB2SpanFlags.SPAN_FLAGS_TRACE_FLAGS_MASK) == 0x01
541-
assert (pb.flags & PB2SpanFlags.SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK) != 0
551+
assert (
552+
pb.flags & PB2SpanFlags.SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK
553+
) != 0
542554
assert (pb.flags & PB2SpanFlags.SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK) != 0
543555
assert (pb.flags & ~ALL_SPAN_FLAGS_MASK) == 0
544556

545557
def test_link_flags_local_and_remote(self):
546558
# local sampled link
547-
l1 = SDKLink(SDKSpanContext(0x1, 0x2, is_remote=False, trace_flags=0x01))
559+
l1 = SDKLink(
560+
SDKSpanContext(0x1, 0x2, is_remote=False, trace_flags=0x01)
561+
)
548562
# remote sampled link
549-
l2 = SDKLink(SDKSpanContext(0x1, 0x3, is_remote=True, trace_flags=0x01))
563+
l2 = SDKLink(
564+
SDKSpanContext(0x1, 0x3, is_remote=True, trace_flags=0x01)
565+
)
550566
pb_links = _encode_links([l1, l2])
551-
assert (pb_links[0].flags & PB2SpanFlags.SPAN_FLAGS_TRACE_FLAGS_MASK) == 0x01
552-
assert (pb_links[0].flags & PB2SpanFlags.SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK) != 0
553-
assert (pb_links[0].flags & PB2SpanFlags.SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK) == 0
567+
assert (
568+
pb_links[0].flags & PB2SpanFlags.SPAN_FLAGS_TRACE_FLAGS_MASK
569+
) == 0x01
570+
assert (
571+
pb_links[0].flags
572+
& PB2SpanFlags.SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK
573+
) != 0
574+
assert (
575+
pb_links[0].flags & PB2SpanFlags.SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK
576+
) == 0
554577
assert (pb_links[0].flags & ~ALL_SPAN_FLAGS_MASK) == 0
555-
assert (pb_links[1].flags & PB2SpanFlags.SPAN_FLAGS_TRACE_FLAGS_MASK) == 0x01
556-
assert (pb_links[1].flags & PB2SpanFlags.SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK) != 0
557-
assert (pb_links[1].flags & PB2SpanFlags.SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK) != 0
578+
assert (
579+
pb_links[1].flags & PB2SpanFlags.SPAN_FLAGS_TRACE_FLAGS_MASK
580+
) == 0x01
581+
assert (
582+
pb_links[1].flags
583+
& PB2SpanFlags.SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK
584+
) != 0
585+
assert (
586+
pb_links[1].flags & PB2SpanFlags.SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK
587+
) != 0
558588
assert (pb_links[1].flags & ~ALL_SPAN_FLAGS_MASK) == 0

0 commit comments

Comments
 (0)