[ENH]: add tenant, database, and collection IDs to trace when available

chromadb/server/fastapi/__init__.py

@@ -70,6 +70,7 @@
 from chromadb.telemetry.opentelemetry import (
     OpenTelemetryClient,
     OpenTelemetryGranularity,
+    add_attributes_to_current_span,
     trace_method,
 )
 from chromadb.types import Collection as CollectionModel
@@ -383,6 +384,13 @@ def auth_and_get_tenant_and_database_for_request(
         - The user has access to a single tenant and/or single database.
         """
         if not self.authn_provider:
+            add_attributes_to_current_span(
+                {
+                    "tenant": tenant,
+                    "database": database,
+                    "collection": collection,
+                }
+            )
             return (tenant, database)
 
         user_identity = self.authn_provider.authenticate_or_raise(dict(headers))
@@ -407,6 +415,13 @@ def auth_and_get_tenant_and_database_for_request(
         )
 
         self.authz_provider.authorize_or_raise(user_identity, action, authz_resource)
+        add_attributes_to_current_span(
+            {
+                "tenant": tenant,
+                "database": database,
+                "collection": collection,
+            }
+        )
         return (tenant, database)
 
     @trace_method("FastAPI.create_database", OpenTelemetryGranularity.OPERATION)

chromadb/telemetry/opentelemetry/__init__.py

@@ -166,6 +166,7 @@ def add_attributes_to_current_span(
             Sequence[bool],
             Sequence[float],
             Sequence[int],
+            None,
         ],
     ]
 ) -> None:
@@ -176,4 +177,4 @@ def add_attributes_to_current_span(
     if not tracer:
         return
     span = trace.get_current_span()
-    span.set_attributes(attributes)
+    span.set_attributes({k: v for k, v in attributes.items() if v is not None})