From 6917f376e44809275348bda17a281e97058759ae Mon Sep 17 00:00:00 2001
From: Dinesh Yeduguru <yvdinesh@gmail.com>
Date: Wed, 12 Mar 2025 14:52:34 -0700
Subject: [PATCH] revert back changes to EventCommon

---
 llama_stack/apis/telemetry/telemetry.py              |  8 ++++----
 .../inline/telemetry/meta_reference/telemetry.py     | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/llama_stack/apis/telemetry/telemetry.py b/llama_stack/apis/telemetry/telemetry.py
index 9b9061025..cbea57e79 100644
--- a/llama_stack/apis/telemetry/telemetry.py
+++ b/llama_stack/apis/telemetry/telemetry.py
@@ -75,9 +75,9 @@ class LogSeverity(Enum):
 
 
 class EventCommon(BaseModel):
-    trace_id: Optional[str] = None
-    span_id: Optional[str] = None
-    timestamp: Optional[datetime] = None
+    trace_id: str
+    span_id: str
+    timestamp: datetime
     attributes: Optional[Dict[str, Primitive]] = Field(default_factory=dict)
 
 
@@ -93,7 +93,7 @@ class MetricEvent(EventCommon):
     type: Literal[EventType.METRIC.value] = EventType.METRIC.value
     metric: str  # this would be an enum
     value: Union[int, float]
-    unit: Optional[str] = None
+    unit: str
 
 
 @json_schema_type
diff --git a/llama_stack/providers/inline/telemetry/meta_reference/telemetry.py b/llama_stack/providers/inline/telemetry/meta_reference/telemetry.py
index 12faf80b3..4cdb420b2 100644
--- a/llama_stack/providers/inline/telemetry/meta_reference/telemetry.py
+++ b/llama_stack/providers/inline/telemetry/meta_reference/telemetry.py
@@ -153,20 +153,20 @@ class TelemetryAdapter(TelemetryDatasetMixin, Telemetry):
             else:
                 print(f"Warning: No active span found for span_id {span_id}. Dropping event: {event}")
 
-    def _get_or_create_counter(self, name: str, unit: Optional[str] = None) -> metrics.Counter:
+    def _get_or_create_counter(self, name: str, unit: str) -> metrics.Counter:
         if name not in _GLOBAL_STORAGE["counters"]:
             _GLOBAL_STORAGE["counters"][name] = self.meter.create_counter(
                 name=name,
-                unit=unit or "",
+                unit=unit,
                 description=f"Counter for {name}",
             )
         return _GLOBAL_STORAGE["counters"][name]
 
-    def _get_or_create_gauge(self, name: str, unit: Optional[str] = None) -> metrics.ObservableGauge:
+    def _get_or_create_gauge(self, name: str, unit: str) -> metrics.ObservableGauge:
         if name not in _GLOBAL_STORAGE["gauges"]:
             _GLOBAL_STORAGE["gauges"][name] = self.meter.create_gauge(
                 name=name,
-                unit=unit or "",
+                unit=unit,
                 description=f"Gauge for {name}",
             )
         return _GLOBAL_STORAGE["gauges"][name]
@@ -181,11 +181,11 @@ class TelemetryAdapter(TelemetryDatasetMixin, Telemetry):
             up_down_counter = self._get_or_create_up_down_counter(event.metric, event.unit)
             up_down_counter.add(event.value, attributes=event.attributes)
 
-    def _get_or_create_up_down_counter(self, name: str, unit: Optional[str] = None) -> metrics.UpDownCounter:
+    def _get_or_create_up_down_counter(self, name: str, unit: str) -> metrics.UpDownCounter:
         if name not in _GLOBAL_STORAGE["up_down_counters"]:
             _GLOBAL_STORAGE["up_down_counters"][name] = self.meter.create_up_down_counter(
                 name=name,
-                unit=unit or "",
+                unit=unit,
                 description=f"UpDownCounter for {name}",
             )
         return _GLOBAL_STORAGE["up_down_counters"][name]