Skip to content

[Core][Defect] Validate carrier before using it #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wu-sheng merged 1 commit into from
Jul 1, 2020
Merged

[Core][Defect] Validate carrier before using it #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions skywalking/trace/carrier/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def __init__(self):
super(Carrier, self).__init__(key='sw8')
self.trace_id = '' # type: str
self.segment_id = '' # type: str
self.span_id = -1 # type: int
self.span_id = '' # type: str
self.service = '' # type: str
self.service_instance = '' # type: str
self.endpoint = '' # type: str
Expand All @@ -61,7 +61,7 @@ def val(self) -> str:
'1',
b64encode(self.trace_id),
b64encode(self.segment_id),
str(self.span_id),
self.span_id,
b64encode(self.service),
b64encode(self.service_instance),
b64encode(self.endpoint),
Expand All @@ -74,14 +74,27 @@ def val(self, val: str):
if not val:
return
parts = val.split('-')
if len(parts) != 8:
return
self.trace_id = b64decode(parts[1])
self.segment_id = b64decode(parts[2])
self.span_id = int(parts[3])
self.span_id = parts[3]
self.service = b64decode(parts[4])
self.service_instance = b64decode(parts[5])
self.endpoint = b64decode(parts[6])
self.client_address = b64decode(parts[7])

@property
def is_valid(self):
# type: () -> bool
return len(self.trace_id) > 0 and \
len(self.segment_id) > 0 and \
len(self.service) > 0 and \
len(self.service_instance) > 0 and \
len(self.endpoint) > 0 and \
len(self.client_address) > 0 and \
self.span_id.isnumeric()

def __iter__(self):
self.__iter_index = 0
return self
Expand Down
2 changes: 1 addition & 1 deletion skywalking/trace/context/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def new_entry_span(self, op: str, carrier: 'Carrier' = None) -> Span:
)
span.op = op

if carrier is not None:
if carrier is not None and carrier.is_valid:
span.extract(carrier=carrier)

return span
Expand Down
2 changes: 1 addition & 1 deletion skywalking/trace/segment/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def __init__(self, carrier: 'Carrier'):
self.ref_type = 'CrossProcess' # type: str
self.trace_id = carrier.trace_id # type: str
self.segment_id = carrier.segment_id # type: str
self.span_id = carrier.span_id # type: int
self.span_id = int(carrier.span_id) # type: int
self.service = carrier.service # type: str
self.service_instance = carrier.service_instance # type: str
self.endpoint = carrier.endpoint # type: str
Expand Down
4 changes: 2 additions & 2 deletions skywalking/trace/span/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def start(self):
def extract(self, carrier: 'Carrier') -> 'Span':
Span.extract(self, carrier)

if carrier is None:
if carrier is None or not carrier.is_valid:
return self

ref = SegmentRef(carrier=carrier)
Expand Down Expand Up @@ -203,7 +203,7 @@ def __init__(
def inject(self, carrier: 'Carrier') -> 'Span':
carrier.trace_id = str(self.context.segment.related_traces[0])
carrier.segment_id = str(self.context.segment.segment_id)
carrier.span_id = self.sid
carrier.span_id = str(self.sid)
carrier.service = config.service_name
carrier.service_instance = config.service_instance
carrier.endpoint = self.op
Expand Down