From 75d489f2f3b40c0f1d3b9d5db4137201f3e5be5d Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriks@matrix.org>
Date: Tue, 16 Jul 2019 11:20:20 +0100
Subject: [PATCH] Better args wrapper

---
 synapse/logging/opentracing.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/synapse/logging/opentracing.py b/synapse/logging/opentracing.py
index ae5ec31669..9552f81c4e 100644
--- a/synapse/logging/opentracing.py
+++ b/synapse/logging/opentracing.py
@@ -36,6 +36,7 @@ except ImportError:
     LogContextScopeManager = None
 
 import contextlib
+import inspect
 import logging
 import re
 from functools import wraps
@@ -467,7 +468,10 @@ def trace_using_operation_name(operation_name):
 def tag_args(func):
     @wraps(func)
     def _tag_args_inner(self, *args, **kwargs):
-        set_tag("args", args)
+        argspec = inspect.getargspec(func)
+        for i, arg in enumerate(argspec.args[1:]):
+            set_tag("ARG_" + arg, args[i])
+        set_tag("args", args[len(argspec.args) :])
         set_tag("kwargs", kwargs)
         return func(self, *args, **kwargs)