fix(ollama): pre-imported funcs instrumentation failure

Author: minimAluminiumalism

packages/opentelemetry-instrumentation-ollama/opentelemetry/instrumentation/ollama/__init__.py

@@ -4,6 +4,9 @@
 import os
 import json
 import time
+import sys
+import inspect
+import functools
 from typing import Collection
 from opentelemetry.instrumentation.ollama.config import Config
 from opentelemetry.instrumentation.ollama.utils import dont_throw
@@ -431,6 +434,22 @@ def is_metrics_collection_enabled() -> bool:
     return (os.getenv("TRACELOOP_METRICS_ENABLED") or "true").lower() == "true"
 
 
+# Proxy class to dynamically call the latest ollama function implementations
+class InstrumentedFunction:
+    """Proxy function that always invokes the latest ollama function implementation"""
+    def __init__(self, func_name):
+        self.func_name = func_name
+        import ollama
+        original = getattr(ollama, func_name)
+        functools.update_wrapper(self, original)
+        self.__wrapped__ = original
+
+    def __call__(self, *args, **kwargs):
+        import ollama
+        actual_func = getattr(ollama, self.func_name)
+        return actual_func(*args, **kwargs)
+
+
 class OllamaInstrumentor(BaseInstrumentor):
     """An instrumentor for Ollama's client library."""
 
@@ -477,6 +496,27 @@ def _instrument(self, **kwargs):
                 _wrap(tracer, token_histogram, duration_histogram, wrapped_method),
             )
 
+        # replace imported ollama functions in other modules
+        try:
+            # Iterate through all loaded modules to find modules that reference imported ollama functions
+            for module_name, module in list(sys.modules.items()):
+                if module_name != "ollama" and hasattr(module, "__dict__"):
+                    for attr_name, attr_value in list(module.__dict__.items()):
+                        for wrapped_method in WRAPPED_METHODS:
+                            method_name = wrapped_method.get("method")
+                            if (
+                                attr_name == method_name
+                                and (
+                                    inspect.isfunction(attr_value)
+                                    or inspect.ismethod(attr_value)
+                                )
+                                and attr_value.__module__.startswith("ollama")
+                            ):
+                                module.__dict__[attr_name] = InstrumentedFunction(method_name)
+                                logger.debug(f"Replaced {method_name} in module {module_name}")
+        except Exception as e:
+            logger.warning(f"Error instrumenting imported ollama methods: {e}")
+
     def _uninstrument(self, **kwargs):
         for wrapped_method in WRAPPED_METHODS:
             unwrap(

packages/sample-app/sample_app/ollama_streaming.py

@@ -5,6 +5,7 @@
 
 base_model = "gemma3:1b"
 
+
 def ollama_chat():
     stream_response = chat(
         model=base_model,
@@ -30,4 +31,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()