Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry

Conflicts:
	docs/usage/configuration/config_documentation.md
	synapse/logging/opentracing.py

Got changes from:

 - https://github.com/matrix-org/synapse/pull/13362/files

1 files changed, 2 insertions, 2 deletions

diff --git a/synapse/logging/tracing.py b/synapse/logging/tracing.py

index 0057422db2..f8b35d2660 100644
--- a/synapse/logging/tracing.py
+++ b/synapse/logging/tracing.py
@@ -878,8 +878,8 @@ def tag_args(func: Callable[P, R]) -> Callable[P, R]:
     def _tag_args_inner(*args: P.args, **kwargs: P.kwargs) -> R:
         argspec = inspect.getfullargspec(func)
         for i, arg in enumerate(argspec.args[1:]):
-            set_attribute("ARG_" + arg, args[i])  # type: ignore[index]
-        set_attribute("args", args[len(argspec.args) :])  # type: ignore[index]
+            set_attribute("ARG_" + arg, str(args[i]))  # type: ignore[index]
+        set_attribute("args", str(args[len(argspec.args) :]))  # type: ignore[index]
         set_attribute("kwargs", str(kwargs))
         return func(*args, **kwargs)