Simplify logic in varmap (#1594)

Author: basepi

elasticapm/utils/__init__.py

@@ -63,17 +63,15 @@ def varmap(func, var, context=None, name=None, **kwargs):
     if objid in context:
         return func(name, "<...>", **kwargs)
     context.add(objid)
-    if isinstance(var, dict):
-        # Apply func() before recursion, so that `shorten()` doesn't have to iterate over all the trimmed values
-        ret = func(name, var, **kwargs)
+
+    # Apply func() before recursion, so that `shorten()` doesn't have to iterate over all the trimmed values
+    ret = func(name, var, **kwargs)
+    if isinstance(ret, dict):
         # iterate over a copy of the dictionary to avoid "dictionary changed size during iteration" issues
         ret = dict((k, varmap(func, v, context, k, **kwargs)) for k, v in ret.copy().items())
-    elif isinstance(var, (list, tuple)):
+    elif isinstance(ret, (list, tuple)):
         # Apply func() before recursion, so that `shorten()` doesn't have to iterate over all the trimmed values
-        ret = func(name, var, **kwargs)
         ret = [varmap(func, f, context, name, **kwargs) for f in ret]
-    else:
-        ret = func(name, var, **kwargs)
     context.remove(objid)
     return ret