refactor: raise error on wrong unwrap (#2864)

The current `unwrap` function hides error on calling `unwrap` on wrong object.

This has two bad side effects:
1. It hides existing error. There are integrations that do their unpatch
   uncorrectly and this hides it.
2. It makes it difficult for contribution author to catch their errors. If they
   ever write a wrong unpatch() function which is used in testing, it can have
   wrong side effects by not unpatching correctly.

This makes sure that if unwrap() is wrongly called, it raises an error rather
than hiding it.

Author: Julien Danjou

ddtrace/contrib/algoliasearch/patch.py

@@ -55,14 +55,14 @@ def unpatch():
     if getattr(algoliasearch, DD_PATCH_ATTR, False):
         setattr(algoliasearch, DD_PATCH_ATTR, False)
 
-    if algoliasearch_version < (2, 0) and algoliasearch_version >= (1, 0):
-        _u(algoliasearch.index.Index, "search")
-    elif algoliasearch_version >= (2, 0) and algoliasearch_version < (3, 0):
-        from algoliasearch import search_index
-
-        _u(search_index.SearchIndex, "search")
-    else:
-        return
+        if algoliasearch_version < (2, 0) and algoliasearch_version >= (1, 0):
+            _u(algoliasearch.index.Index, "search")
+        elif algoliasearch_version >= (2, 0) and algoliasearch_version < (3, 0):
+            from algoliasearch import search_index
+
+            _u(search_index.SearchIndex, "search")
+        else:
+            return
 
 
 # DEV: this maps serves the dual purpose of enumerating the algoliasearch.search() query_args that

ddtrace/contrib/asyncio/patch.py

@@ -31,10 +31,10 @@ def unpatch():
     if getattr(asyncio, "_datadog_patch", False):
         setattr(asyncio, "_datadog_patch", False)
 
-    if sys.version_info < (3, 7, 0):
-        _u(asyncio.BaseEventLoop, "create_task")
+        if sys.version_info < (3, 7, 0):
+            _u(asyncio.BaseEventLoop, "create_task")
 
-        # also unpatch event loop if not inheriting the already unwrapped create_task from BaseEventLoop
-        loop = asyncio.get_event_loop()
-        if isinstance(loop.create_task, ObjectProxy):
-            _u(loop, "create_task")
+            # also unpatch event loop if not inheriting the already unwrapped create_task from BaseEventLoop
+            loop = asyncio.get_event_loop()
+            if isinstance(loop.create_task, ObjectProxy):
+                _u(loop, "create_task")

ddtrace/contrib/molten/patch.py

@@ -62,7 +62,6 @@ def unpatch():
 
         _u(molten.BaseApp, "__init__")
         _u(molten.App, "__call__")
-        _u(molten.Router, "add_route")
 
 
 def patch_app_call(wrapped, instance, args, kwargs):

ddtrace/contrib/tornado/patch.py

@@ -67,7 +67,6 @@ def unpatch():
     _u(tornado.web.RequestHandler, "on_finish")
     _u(tornado.web.RequestHandler, "log_exception")
     _u(tornado.web.Application, "__init__")
-    _u(tornado.concurrent, "run_on_executor")
     _u(tornado.template.Template, "generate")
 
     # unpatch `futures`

ddtrace/utils/wrappers.py

@@ -27,9 +27,8 @@ def iswrapped(obj, attr=None):
 
 def unwrap(obj, attr):
     # type: (Any, str) -> None
-    f = getattr(obj, attr, None)
-    if f and isinstance(f, wrapt.ObjectProxy) and hasattr(f, "__wrapped__"):
-        setattr(obj, attr, f.__wrapped__)
+    f = getattr(obj, attr)
+    setattr(obj, attr, f.__wrapped__)
 
 
 @deprecated("`wrapt` library is used instead", version="1.0.0")

releasenotes/notes/fix-unwrap-silent-error-2de7513089b6ccfe.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    The ``ddtrace.utils.wrappers.unwrap`` function now raises an error if
+    trying to unwrap a non-wrapped object.