diff --git a/ddtrace/contrib/internal/dd_trace_api/patch.py b/ddtrace/contrib/internal/dd_trace_api/patch.py
index c4b82bfa6b..f54a7d270b 100644
--- a/ddtrace/contrib/internal/dd_trace_api/patch.py
+++ b/ddtrace/contrib/internal/dd_trace_api/patch.py
@@ -1,20 +1,63 @@
+import inspect
 from sys import addaudithook
 from typing import Any
 from typing import Dict
 from typing import List
 from typing import Optional
 from typing import Tuple
+from typing import TypeVar
 import weakref
 
 import dd_trace_api
+from wrapt.importer import when_imported
 
 import ddtrace
+from ddtrace.internal.logger import get_logger
+from ddtrace.internal.wrapping.context import WrappingContext
 
 
 _DD_HOOK_NAME = "dd.hook"
 _TRACER_KEY = "Tracer"
 _STUB_TO_REAL = weakref.WeakKeyDictionary()
 _STUB_TO_REAL[dd_trace_api.tracer] = ddtrace.tracer
+log = get_logger(__name__)
+T = TypeVar("T")
+
+
+class DDTraceAPIWrappingContextBase(WrappingContext):
+    def _handle_return(self) -> None:
+        _call_on_real_instance(
+            self.get_local("self"),
+            self.__frame__.f_code.co_name,
+            self.get_local("retval"),
+            **{
+                param: self.get_local(param)
+                for param in inspect.signature(self.__wrapped__).parameters.keys()
+                if param != "self"
+            }
+        )
+
+    def _handle_enter(self) -> None:
+        pass
+
+    def __enter__(self) -> "DDTraceAPIWrappingContextBase":
+        super().__enter__()
+
+        try:
+            self._handle_enter()
+        except Exception:  # noqa: E722
+            log.debug("Error handling dd_trace_api instrumentation enter", exc_info=True)
+
+        return self
+
+    def __return__(self, value: T) -> T:
+        """Always return the original value no matter what our instrumentation does"""
+        try:
+            self._handle_return()
+        except Exception:  # noqa: E722
+            log.debug("Error handling instrumentation return", exc_info=True)
+
+        return value
 
 
 def _proxy_span_arguments(args: List, kwargs: Dict) -> Tuple[List, Dict]:
@@ -57,15 +100,44 @@ def get_version() -> str:
 def patch(tracer=None):
     if getattr(dd_trace_api, "__datadog_patch", False):
         return
-    dd_trace_api.__datadog_patch = True
     _STUB_TO_REAL[dd_trace_api.tracer] = tracer
-    if not getattr(dd_trace_api, "__dd_has_audit_hook", False):
+    if False and not getattr(dd_trace_api, "__dd_has_audit_hook", False):
         addaudithook(_hook)
     dd_trace_api.__dd_has_audit_hook = True
 
+    @when_imported("dd_trace_api")
+    def _(m):
+        DDTraceAPIWrappingContextBase(m.Tracer.start_span).wrap()
+        DDTraceAPIWrappingContextBase(m.Tracer.trace).wrap()
+        DDTraceAPIWrappingContextBase(m.Tracer.current_span).wrap()
+        DDTraceAPIWrappingContextBase(m.Tracer.current_root_span).wrap()
+        DDTraceAPIWrappingContextBase(m.Span.finish).wrap()
+        DDTraceAPIWrappingContextBase(m.Span.set_exc_info).wrap()
+        DDTraceAPIWrappingContextBase(m.Span.finish_with_ancestors).wrap()
+        DDTraceAPIWrappingContextBase(m.Span.set_tags).wrap()
+        DDTraceAPIWrappingContextBase(m.Span.set_traceback).wrap()
+        DDTraceAPIWrappingContextBase(m.Span.__enter__).wrap()
+        DDTraceAPIWrappingContextBase(m.Span.__exit__).wrap()
+
+    dd_trace_api.__datadog_patch = True
+
 
 def unpatch():
     if not getattr(dd_trace_api, "__datadog_patch", False):
         return
     dd_trace_api.__datadog_patch = False
     # NB sys.addaudithook's cannot be removed
+
+    DDTraceAPIWrappingContextBase.extract(dd_trace_api.Tracer.start_span).unwrap()
+    DDTraceAPIWrappingContextBase.extract(dd_trace_api.Tracer.trace).unwrap()
+    DDTraceAPIWrappingContextBase.extract(dd_trace_api.Tracer.current_span).unwrap()
+    DDTraceAPIWrappingContextBase.extract(dd_trace_api.Tracer.current_root_span).unwrap()
+    DDTraceAPIWrappingContextBase.extract(dd_trace_api.Span.finish).unwrap()
+    DDTraceAPIWrappingContextBase.extract(dd_trace_api.Span.set_exc_info).unwrap()
+    DDTraceAPIWrappingContextBase.extract(dd_trace_api.Span.finish_with_ancestors).unwrap()
+    DDTraceAPIWrappingContextBase.extract(dd_trace_api.Span.set_tags).unwrap()
+    DDTraceAPIWrappingContextBase.extract(dd_trace_api.Span.set_traceback).unwrap()
+    DDTraceAPIWrappingContextBase.extract(dd_trace_api.Span.__enter__).unwrap()
+    DDTraceAPIWrappingContextBase.extract(dd_trace_api.Span.__exit__).unwrap()
+
+    dd_trace_api.__datadog_patch = False