Skip to content

Fix entity reporting in spans. #26

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
pglombardo merged 2 commits into from
Sep 27, 2017
Merged

Fix entity reporting in spans. #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b662af4
Fix entity reporting in spans.
pglombardo Sep 27, 2017
1fef72b
Entity Id is agentUuid not hostId
pglombardo Sep 27, 2017
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
2 changes: 1 addition & 1 deletion instana/agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

class From(object):
pid = ""
hostId = ""
agentUuid = ""

def __init__(self, **kwds):
self.__dict__.update(kwds)
Expand Down
13 changes: 8 additions & 5 deletions instana/recorder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,17 @@ def build_registered_span(self, span):
baggage=span.context.baggage,
custom=sd.CustomData(tags=span.tags,
logs=self.collect_logs(span)))
entityFrom = { 'e': self.sensor.agent.from_.pid,
'h': self.sensor.agent.from_.agentUuid }

return sd.InstanaSpan(
n=span.operation_name,
t=span.context.trace_id,
p=span.parent_id,
s=span.context.span_id,
ts=int(round(span.start_time * 1000)),
d=int(round(span.duration * 1000)),
f=self.sensor.agent.from_,
f=entityFrom,
ec=self.get_tag(span, "ec"),
error=self.get_tag(span, "error"),
data=data)
Expand All @@ -110,9 +113,9 @@ def build_sdk_span(self, span):
)

sdk_data.Type = self.get_span_kind(span)

data = sd.Data(service=self.get_service_name(span),
sdk=sdk_data)
data = sd.Data(service=self.get_service_name(span), sdk=sdk_data)
entityFrom = { 'e': self.sensor.agent.from_.pid,
'h': self.sensor.agent.from_.agentUuid }

return sd.InstanaSpan(
t=span.context.trace_id,
Expand All @@ -121,7 +124,7 @@ def build_sdk_span(self, span):
ts=int(round(span.start_time * 1000)),
d=int(round(span.duration * 1000)),
n="sdk",
f=self.sensor.agent.from_,
f=entityFrom,
data=data)

def get_tag(self, span, tag):
Expand Down