opentelemetry-instrumentation-crewai 0.37.1__py3-none-any.whl → 0.38.0__py3-none-any.whl

opentelemetry/instrumentation/crewai/instrumentation.py

@@ -1,10 +1,15 @@
+import os
+import time
 from typing import Collection
+
 from wrapt import wrap_function_wrapper
-from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
-from opentelemetry.trace import SpanKind, get_tracer
+from opentelemetry.trace import SpanKind, get_tracer, Tracer
 from opentelemetry.trace.status import Status, StatusCode
+from opentelemetry.metrics import Histogram, Meter, get_meter
+from opentelemetry.instrumentation.utils import unwrap
+from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.crewai.version import __version__
-from opentelemetry.semconv_ai import SpanAttributes, TraceloopSpanKindValues
+from opentelemetry.semconv_ai import SpanAttributes, TraceloopSpanKindValues, Meters
 from .crewai_span_attributes import CrewAISpanAttributes, set_span_attribute
 
 _instruments = ("crewai >= 0.70.0",)
@@ -19,31 +24,54 @@ class CrewAIInstrumentor(BaseInstrumentor):
         tracer_provider = kwargs.get("tracer_provider")
         tracer = get_tracer(__name__, __version__, tracer_provider)
 
-        wrap_function_wrapper("crewai.crew", "Crew.kickoff", wrap_kickoff(tracer))
-        wrap_function_wrapper("crewai.agent", "Agent.execute_task", wrap_agent_execute_task(tracer))
-        wrap_function_wrapper("crewai.task", "Task.execute_sync", wrap_task_execute(tracer))
-        wrap_function_wrapper("crewai.llm", "LLM.call", wrap_llm_call(tracer))
+        meter_provider = kwargs.get("meter_provider")
+        meter = get_meter(__name__, __version__, meter_provider)
+
+        if is_metrics_enabled():
+            (
+                token_histogram,
+                duration_histogram,
+            ) = _create_metrics(meter)
+        else:
+            (
+                token_histogram,
+                duration_histogram,
+            ) = (None, None, None, None)
+
+        wrap_function_wrapper("crewai.crew", "Crew.kickoff",
+                              wrap_kickoff(tracer, duration_histogram, token_histogram))
+        wrap_function_wrapper("crewai.agent", "Agent.execute_task",
+                              wrap_agent_execute_task(tracer, duration_histogram, token_histogram))
+        wrap_function_wrapper("crewai.task", "Task.execute_sync",
+                              wrap_task_execute(tracer, duration_histogram, token_histogram))
+        wrap_function_wrapper("crewai.llm", "LLM.call",
+                              wrap_llm_call(tracer, duration_histogram, token_histogram))
 
     def _uninstrument(self, **kwargs):
-        pass
+        unwrap("crewai.crew.Crew", "kickoff")
+        unwrap("crewai.agent.Agent", "execute_task")
+        unwrap("crewai.task.Task", "execute_sync")
+        unwrap("crewai.llm.LLM", "call")
 
 
 def with_tracer_wrapper(func):
     """Helper for providing tracer for wrapper functions."""
 
-    def _with_tracer(tracer):
+    def _with_tracer(tracer, duration_histogram, token_histogram):
         def wrapper(wrapped, instance, args, kwargs):
-            return func(tracer, wrapped, instance, args, kwargs)
+            return func(tracer, duration_histogram, token_histogram, wrapped, instance, args, kwargs)
         return wrapper
     return _with_tracer
 
 
 @with_tracer_wrapper
-def wrap_kickoff(tracer, wrapped, instance, args, kwargs):
+def wrap_kickoff(tracer: Tracer, duration_histogram: Histogram, token_histogram: Histogram,
+                 wrapped, instance, args, kwargs):
     with tracer.start_as_current_span(
         "crewai.workflow",
         kind=SpanKind.INTERNAL,
         attributes={
+            SpanAttributes.LLM_SYSTEM: "crewai",
         }
     ) as span:
         try:
@@ -64,7 +92,7 @@ def wrap_kickoff(tracer, wrapped, instance, args, kwargs):
 
 
 @with_tracer_wrapper
-def wrap_agent_execute_task(tracer, wrapped, instance, args, kwargs):
+def wrap_agent_execute_task(tracer, duration_histogram, token_histogram, wrapped, instance, args, kwargs):
     agent_name = instance.role if hasattr(instance, "role") else "agent"
     with tracer.start_as_current_span(
         f"{agent_name}.agent",
@@ -76,7 +104,26 @@ def wrap_agent_execute_task(tracer, wrapped, instance, args, kwargs):
         try:
             CrewAISpanAttributes(span=span, instance=instance)
             result = wrapped(*args, **kwargs)
+            if token_histogram:
+                token_histogram.record(
+                    instance._token_process.get_summary().prompt_tokens,
+                    attributes={
+                        SpanAttributes.LLM_SYSTEM: "crewai",
+                        SpanAttributes.LLM_TOKEN_TYPE: "input",
+                        SpanAttributes.LLM_RESPONSE_MODEL: str(instance.llm.model),
+                    }
+                )
+                token_histogram.record(
+                    instance._token_process.get_summary().completion_tokens,
+                    attributes={
+                        SpanAttributes.LLM_SYSTEM: "crewai",
+                        SpanAttributes.LLM_TOKEN_TYPE: "output",
+                        SpanAttributes.LLM_RESPONSE_MODEL: str(instance.llm.model),
+                    },
+                )
+
             set_span_attribute(span, SpanAttributes.LLM_REQUEST_MODEL, str(instance.llm.model))
+            set_span_attribute(span, SpanAttributes.LLM_RESPONSE_MODEL, str(instance.llm.model))
             span.set_status(Status(StatusCode.OK))
             return result
         except Exception as ex:
@@ -85,7 +132,7 @@ def wrap_agent_execute_task(tracer, wrapped, instance, args, kwargs):
 
 
 @with_tracer_wrapper
-def wrap_task_execute(tracer, wrapped, instance, args, kwargs):
+def wrap_task_execute(tracer, duration_histogram, token_histogram, wrapped, instance, args, kwargs):
     task_name = instance.description if hasattr(instance, "description") else "task"
 
     with tracer.start_as_current_span(
@@ -107,7 +154,7 @@ def wrap_task_execute(tracer, wrapped, instance, args, kwargs):
 
 
 @with_tracer_wrapper
-def wrap_llm_call(tracer, wrapped, instance, args, kwargs):
+def wrap_llm_call(tracer, duration_histogram, token_histogram, wrapped, instance, args, kwargs):
     llm = instance.model if hasattr(instance, "model") else "llm"
     with tracer.start_as_current_span(
         f"{llm}.llm",
@@ -115,13 +162,43 @@ def wrap_llm_call(tracer, wrapped, instance, args, kwargs):
         attributes={
         }
     ) as span:
+        start_time = time.time()
         try:
             CrewAISpanAttributes(span=span, instance=instance)
             result = wrapped(*args, **kwargs)
-            set_span_attribute(span, SpanAttributes.LLM_SYSTEM, "crewai")
-            set_span_attribute(span, SpanAttributes.LLM_REQUEST_MODEL, str(instance.model))
+
+            if duration_histogram:
+                duration = time.time() - start_time
+                duration_histogram.record(
+                    duration,
+                    attributes={
+                     SpanAttributes.LLM_SYSTEM: "crewai",
+                     SpanAttributes.LLM_RESPONSE_MODEL: str(instance.model)
+                    },
+                )
+
             span.set_status(Status(StatusCode.OK))
             return result
         except Exception as ex:
             span.set_status(Status(StatusCode.ERROR, str(ex)))
             raise
+
+
+def is_metrics_enabled() -> bool:
+    return (os.getenv("TRACELOOP_METRICS_ENABLED") or "true").lower() == "true"
+
+
+def _create_metrics(meter: Meter):
+    token_histogram = meter.create_histogram(
+        name=Meters.LLM_TOKEN_USAGE,
+        unit="token",
+        description="Measures number of input and output tokens used",
+    )
+
+    duration_histogram = meter.create_histogram(
+        name=Meters.LLM_OPERATION_DURATION,
+        unit="s",
+        description="GenAI operation duration",
+    )
+
+    return token_histogram, duration_histogram

{opentelemetry_instrumentation_crewai-0.37.1.dist-info → opentelemetry_instrumentation_crewai-0.38.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: opentelemetry-instrumentation-crewai
-Version: 0.37.1
+Version: 0.38.0
 Summary: OpenTelemetry crewAI instrumentation
 License: Apache-2.0
 Author: Gal Kleinman

{opentelemetry_instrumentation_crewai-0.37.1.dist-info → opentelemetry_instrumentation_crewai-0.38.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 opentelemetry/instrumentation/crewai/__init__.py,sha256=zdNyWV62d5IaueXR9clUD_c9F32MF39AIchZf66XI2c,245
 opentelemetry/instrumentation/crewai/crewai_span_attributes.py,sha256=9ax6fn0IT4dqH2iaRG8VIZ0SWTkxQrMTiF7DWUdwfy0,4945
-opentelemetry/instrumentation/crewai/instrumentation.py,sha256=_Y8dmgwYoSRkDAYSoR9zNkgQYAk1aqSTkDoQIsjV5DI,4867
+opentelemetry/instrumentation/crewai/instrumentation.py,sha256=AhQpPgpgtx9DKdnRDcrCKXn4AIuErdfznxfLlfs9OTc,7913
 opentelemetry/instrumentation/crewai/version.py,sha256=ITH8IVCEQOekRajZpPo6sKNlMBNDRQRnzipIN0dqXoc,23
-opentelemetry_instrumentation_crewai-0.37.1.dist-info/METADATA,sha256=PcZhRSwQOheSdDPd2h8Ef2XkC9goD-cuwleLkDul4lc,2098
-opentelemetry_instrumentation_crewai-0.37.1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-opentelemetry_instrumentation_crewai-0.37.1.dist-info/entry_points.txt,sha256=4Zs98MjB2HIaX8fk8evs41x1J1xBNfztvPN428bf_b8,93
-opentelemetry_instrumentation_crewai-0.37.1.dist-info/RECORD,,
+opentelemetry_instrumentation_crewai-0.38.0.dist-info/METADATA,sha256=KPAaEX4E4viDPTDRDFqdoywMGSysXXjQq2JqND3Q0Ds,2098
+opentelemetry_instrumentation_crewai-0.38.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+opentelemetry_instrumentation_crewai-0.38.0.dist-info/entry_points.txt,sha256=4Zs98MjB2HIaX8fk8evs41x1J1xBNfztvPN428bf_b8,93
+opentelemetry_instrumentation_crewai-0.38.0.dist-info/RECORD,,