Skip to content

Initial RPC span type support #112

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
merged 1 commit into from
Nov 28, 2018
Merged

Initial RPC span type support #112

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
15 changes: 15 additions & 0 deletions instana/json_span.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class Data(object):
http = None
rabbitmq = None
redis = None
rpc = None
sdk = None
service = None
sqlalchemy = None
Expand Down Expand Up @@ -86,6 +87,20 @@ def __init__(self, **kwds):
self.__dict__.update(kwds)


class RPCData(object):
flavor = None
host = None
port = None
call = None
call_type = None
params = None
baggage = None
error = None

def __init__(self, **kwds):
self.__dict__.update(kwds)


class SQLAlchemyData(object):
sql = None
url = None
Expand Down
20 changes: 15 additions & 5 deletions instana/recorder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import instana.singletons

from .json_span import (CustomData, Data, HttpData, JsonSpan, MySQLData,
RabbitmqData, RedisData, SDKData, SoapData,
RabbitmqData, RedisData, RPCData, SDKData, SoapData,
SQLAlchemyData)
from .log import logger

Expand Down Expand Up @@ -124,6 +124,16 @@ def build_registered_span(self, span):
error=span.tags.pop('redis.error', None),
subCommands=span.tags.pop('subCommands', None))

if span.operation_name == "rpc-client" or span.operation_name == "rpc-server":
data.rpc = RPCData(flavor=span.tags.pop('rpc.flavor', None),
host=span.tags.pop('rpc.host', None),
port=span.tags.pop('rpc.port', None),
call=span.tags.pop('rpc.call', None),
call_type=span.tags.pop('rpc.call_type', None),
params=span.tags.pop('rpc.params', None),
baggage=span.tags.pop('rpc.baggage', None),
error=span.tags.pop('rpc.error', None))

if span.operation_name == "sqlalchemy":
data.sqlalchemy = SQLAlchemyData(sql=span.tags.pop('sqlalchemy.sql', None),
eng=span.tags.pop('sqlalchemy.eng', None),
Expand All @@ -142,7 +152,7 @@ def build_registered_span(self, span):
tskey = list(data.custom.logs.keys())[0]
data.mysql.error = data.custom.logs[tskey]['message']

entityFrom = {'e': instana.singletons.agent.from_.pid,
entity_from = {'e': instana.singletons.agent.from_.pid,
'h': instana.singletons.agent.from_.agentUuid}

json_span = JsonSpan(n=span.operation_name,
Expand All @@ -151,7 +161,7 @@ def build_registered_span(self, span):
s=span.context.span_id,
ts=int(round(span.start_time * 1000)),
d=int(round(span.duration * 1000)),
f=entityFrom,
f=entity_from,
data=data)

if span.stack:
Expand Down Expand Up @@ -182,7 +192,7 @@ def build_sdk_span(self, span):

sdk_data.Type = self.get_span_kind(span)
data = Data(service=self.get_service_name(span), sdk=sdk_data)
entityFrom = {'e': instana.singletons.agent.from_.pid,
entity_from = {'e': instana.singletons.agent.from_.pid,
'h': instana.singletons.agent.from_.agentUuid}

json_span = JsonSpan(
Expand All @@ -192,7 +202,7 @@ def build_sdk_span(self, span):
ts=int(round(span.start_time * 1000)),
d=int(round(span.duration * 1000)),
n="sdk",
f=entityFrom,
f=entity_from,
data=data)

error = span.tags.pop("error", False)
Expand Down