diff --git a/scripts/examples/python/XenAPI/XenAPI.py b/scripts/examples/python/XenAPI/XenAPI.py
index 6c97f499b5d..197be890c6b 100644
--- a/scripts/examples/python/XenAPI/XenAPI.py
+++ b/scripts/examples/python/XenAPI/XenAPI.py
@@ -58,6 +58,7 @@
 import os
 import socket
 import sys
+import types
 
 if sys.version_info[0] == 2:
     import httplib as httplib
@@ -70,12 +71,42 @@
 try:
     if os.environ["OTEL_SDK_DISABLED"] == "false":
         from opentelemetry import propagate
-        from opentelemetry.trace.propagation import set_span_in_context, get_current_span
+        from opentelemetry.trace.propagation import (
+            set_span_in_context,
+            get_current_span
+        )
         otel = True
 
 except Exception:
     pass
 
+def patch_transport(transport):
+    if otel and transport:
+        try:
+            original_make_connection = transport.make_connection
+
+            def with_tracecontext(self):
+                headers = {}
+                # pylint: disable=possibly-used-before-assignment
+                ctx = set_span_in_context(get_current_span())
+                # pylint: disable=possibly-used-before-assignment
+                propagators = propagate.get_global_textmap()
+                propagators.inject(headers, ctx)
+                self._extra_headers = []
+                for k, v in headers.items():
+                    self._extra_headers += [(k, v)]
+
+            def make_connection_with_tracecontext(self, host):
+                with_tracecontext(self)
+                return original_make_connection(host)
+
+            transport.make_connection = types.MethodType(
+                make_connection_with_tracecontext, transport
+                )
+
+        except Exception:
+            pass
+
 translation = gettext.translation('xen-xm', fallback = True)
 
 API_VERSION_1_1 = '1.1'
@@ -97,7 +128,6 @@ def _details_map(self):
         return dict([(str(i), self.details[i])
                      for i in range(len(self.details))])
 
-
 # Just a "constant" that we use to decide whether to retry the RPC
 _RECONNECT_AND_RETRY = object()
 
@@ -110,25 +140,13 @@ def connect(self):
 
 class UDSTransport(xmlrpclib.Transport):
     def add_extra_header(self, key, value):
-        self._extra_headers += [ (key,value) ]
-    def with_tracecontext(self):
-        if otel:
-            headers = {}
-            # pylint: disable=possibly-used-before-assignment
-            ctx = set_span_in_context(get_current_span())
-            # pylint: disable=possibly-used-before-assignment
-            propagators = propagate.get_global_textmap()
-            propagators.inject(headers, ctx)
-            self._extra_headers = []
-            for k, v in headers.items():
-                self.add_extra_header(k, v)
+        self._extra_headers += [(key, value)]
     def make_connection(self, host):
         # compatibility with parent xmlrpclib.Transport HTTP/1.1 support
         if self._connection and host == self._connection[0]:
             return self._connection[1]
 
         self._connection = host, UDSHTTPConnection(host)
-        self.with_tracecontext()
         return self._connection[1]
 
 def notimplemented(name, *args, **kwargs):
@@ -165,6 +183,8 @@ def __init__(self, uri, transport=None, encoding=None, verbose=0,
         else:
             xmlrpclib.ServerProxy.__init__(self, uri, transport, encoding,
                                            verbose, allow_none)
+        #patch the transport created by xmlrpclib.ServerProxy
+        patch_transport(self._ServerProxy__transport)
         self.transport = transport
         self._session = None
         self.last_login_method = None