mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-07 03:21:58 +00:00
Don't assume there is a 'self' arg in @trace decorator
This commit is contained in:
parent
f7c873a643
commit
d8517da85b
@ -702,15 +702,15 @@ def trace(func=None, opname=None):
|
|||||||
_opname = opname if opname else func.__name__
|
_opname = opname if opname else func.__name__
|
||||||
|
|
||||||
@wraps(func)
|
@wraps(func)
|
||||||
def _trace_inner(self, *args, **kwargs):
|
def _trace_inner(*args, **kwargs):
|
||||||
if opentracing is None:
|
if opentracing is None:
|
||||||
return func(self, *args, **kwargs)
|
return func(*args, **kwargs)
|
||||||
|
|
||||||
scope = start_active_span(_opname)
|
scope = start_active_span(_opname)
|
||||||
scope.__enter__()
|
scope.__enter__()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
result = func(self, *args, **kwargs)
|
result = func(*args, **kwargs)
|
||||||
if isinstance(result, defer.Deferred):
|
if isinstance(result, defer.Deferred):
|
||||||
|
|
||||||
def call_back(result):
|
def call_back(result):
|
||||||
@ -750,13 +750,13 @@ def tag_args(func):
|
|||||||
return func
|
return func
|
||||||
|
|
||||||
@wraps(func)
|
@wraps(func)
|
||||||
def _tag_args_inner(self, *args, **kwargs):
|
def _tag_args_inner(*args, **kwargs):
|
||||||
argspec = inspect.getargspec(func)
|
argspec = inspect.getargspec(func)
|
||||||
for i, arg in enumerate(argspec.args[1:]):
|
for i, arg in enumerate(argspec.args[1:]):
|
||||||
set_tag("ARG_" + arg, args[i])
|
set_tag("ARG_" + arg, args[i])
|
||||||
set_tag("args", args[len(argspec.args) :])
|
set_tag("args", args[len(argspec.args) :])
|
||||||
set_tag("kwargs", kwargs)
|
set_tag("kwargs", kwargs)
|
||||||
return func(self, *args, **kwargs)
|
return func(*args, **kwargs)
|
||||||
|
|
||||||
return _tag_args_inner
|
return _tag_args_inner
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user