From 741f3118a9945ae15747dc9b162a8eca7d2ea515 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Wed, 9 Apr 2025 17:07:58 +0000
Subject: [PATCH] Revert telemetry implementation changes while keeping
 CREWAI_DISABLE_TELEMETRY functionality

Co-Authored-By: Joe Moura <joao@crewai.com>
---
 src/crewai/telemetry/telemetry.py | 40 +++++++++++++++----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/crewai/telemetry/telemetry.py b/src/crewai/telemetry/telemetry.py
index 539c4a7b5..6fec368b3 100644
--- a/src/crewai/telemetry/telemetry.py
+++ b/src/crewai/telemetry/telemetry.py
@@ -50,33 +50,31 @@ class Telemetry:
 
         if self._is_telemetry_disabled():
             return
-            
+
         try:
             telemetry_endpoint = "https://telemetry.crewai.com:4319"
-            
-            otlp_exporter = OTLPSpanExporter(
-                endpoint=f"{telemetry_endpoint}/v1/traces"
+            self.resource = Resource(
+                attributes={SERVICE_NAME: "crewAI-telemetry"},
             )
+            with suppress_warnings():
+                self.provider = TracerProvider(resource=self.resource)
 
-            span_processor = BatchSpanProcessor(otlp_exporter)
-
-            tracer_provider = TracerProvider(
-                resource=Resource.create(
-                    {
-                        "service.name": "crewai",
-                        "service.version": version("crewai"),
-                    }
+            processor = BatchSpanProcessor(
+                OTLPSpanExporter(
+                    endpoint=f"{telemetry_endpoint}/v1/traces",
+                    timeout=30,
                 )
             )
 
-            tracer_provider.add_span_processor(span_processor)
-
-            trace.set_tracer_provider(tracer_provider)
-
-            self.tracer = trace.get_tracer("crewai")
+            self.provider.add_span_processor(processor)
             self.ready = True
-        except Exception:
-            pass
+        except Exception as e:
+            if isinstance(
+                e,
+                (SystemExit, KeyboardInterrupt, GeneratorExit, asyncio.CancelledError),
+            ):
+                raise  # Re-raise the exception to not interfere with system signals
+            self.ready = False
             
     def _is_telemetry_disabled(self) -> bool:
         """Check if telemetry should be disabled based on environment variables."""
@@ -88,7 +86,9 @@ class Telemetry:
     def set_tracer(self):
         if self.ready and not self.trace_set:
             try:
-                self.trace_set = True
+                with suppress_warnings():
+                    trace.set_tracer_provider(self.provider)
+                    self.trace_set = True
             except Exception:
                 self.ready = False
                 self.trace_set = False