added special handling for partials in get_name_from_func (#294)

fixes #293
closes #294

Author: beniwohli

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+
+ * fixed an issue with detecting names of wrapped functions that are partials (#294)
+
 ## v3.0.1
 
 [Check the diff](https://github.com/elastic/apm-agent-python/compare/v3.0.0...v3.0.1)

elasticapm/utils/__init__.py

@@ -9,9 +9,19 @@
 :license: BSD, see LICENSE for more details.
 """
 import os
+from functools import partial
 
 from elasticapm.utils import compat, encoding
 
+try:
+    from functools import partialmethod
+
+    partial_types = (partial, partialmethod)
+except ImportError:
+    # Python 2
+    partial_types = (partial,)
+
+
 default_ports = {"https": 433, "http": 80, "postgresql": 5432}
 
 
@@ -38,7 +48,12 @@ def varmap(func, var, context=None, name=None):
 
 
 def get_name_from_func(func):
-    # If no view was set we ignore the request
+    # partials don't have `__module__` or `__name__`, so we use the values from the "inner" function
+    if isinstance(func, partial_types):
+        return "partial({})".format(get_name_from_func(func.func))
+    elif hasattr(func, "_partialmethod") and hasattr(func._partialmethod, "func"):
+        return "partial({})".format(get_name_from_func(func._partialmethod.func))
+
     module = func.__module__
 
     if hasattr(func, "__name__"):

tests/utils/tests.py

@@ -1,6 +1,16 @@
-from elasticapm.utils import get_url_dict
+from functools import partial
+
+import pytest
+
+from elasticapm.utils import get_name_from_func, get_url_dict
 from elasticapm.utils.deprecation import deprecated
 
+try:
+    from functools import partialmethod
+except ImportError:
+    # Python 2
+    partialmethod = None
+
 
 @deprecated("alternative")
 def deprecated_function():
@@ -51,3 +61,53 @@ def test_get_url_dict():
     }
     for url, expected in data.items():
         assert get_url_dict(url) == expected
+
+
+def test_get_name_from_func():
+    def x():
+        pass
+
+    assert "tests.utils.tests.x" == get_name_from_func(x)
+
+
+def test_get_name_from_func_class():
+    class X(object):
+        def x(self):
+            pass
+
+    assert "tests.utils.tests.x" == get_name_from_func(X.x)
+    assert "tests.utils.tests.x" == get_name_from_func(X().x)
+
+
+def test_get_name_from_func_partial():
+    def x(x):
+        pass
+
+    p = partial(x, "x")
+    assert "partial(tests.utils.tests.x)" == get_name_from_func(p)
+
+
+@pytest.mark.skipif(partialmethod is None, reason="partialmethod not available on Python 2")
+def test_get_name_from_func_partialmethod_unbound():
+    class X(object):
+        def x(self, x):
+            pass
+
+        p = partialmethod(x, "x")
+
+    assert "partial(tests.utils.tests.x)" == get_name_from_func(X.p)
+
+
+@pytest.mark.skipif(partialmethod is None, reason="partialmethod not available on Python 2")
+def test_get_name_from_func_partialmethod_bound():
+    class X(object):
+        def x(self, x):
+            pass
+
+        p = partialmethod(x, "x")
+
+    assert "partial(tests.utils.tests.x)" == get_name_from_func(X().p)
+
+
+def test_get_name_from_func_lambda():
+    assert "tests.utils.tests.<lambda>" == get_name_from_func(lambda x: "x")