For AI Guard, use usr.session_id as documented in the user SDK

tests/ai_guard/test_ai_guard_sdk.py

@@ -515,7 +515,7 @@ def validate(span: DataDogLibrarySpan):
             _assert_key(meta, "ai_guard.network.client.ip")
             _assert_key(meta, "ai_guard.http.useragent")
             _assert_key(meta, "ai_guard.usr.id", self.USER_ID)
-            _assert_key(meta, "ai_guard.session.id", self.SESSION_ID)
+            _assert_key(meta, "ai_guard.usr.session_id", self.SESSION_ID)
 
             # Values must match what is on the root span
             root_meta = root_span["meta"]
@@ -531,8 +531,8 @@ def validate(span: DataDogLibrarySpan):
             assert meta["ai_guard.usr.id"] == root_meta.get("usr.id"), (
                 f"ai_guard.usr.id mismatch: {meta['ai_guard.usr.id']} != {root_meta.get('usr.id')}"
             )
-            assert meta["ai_guard.session.id"] == root_meta.get("session.id"), (
-                f"ai_guard.session.id mismatch: {meta['ai_guard.session.id']} != {root_meta.get('session.id')}"
+            assert meta["ai_guard.usr.session_id"] == root_meta.get("usr.session_id"), (
+                f"ai_guard.usr.session_id mismatch: {meta['ai_guard.usr.session_id']} != {root_meta.get('usr.session_id')}"
             )
 
             return True

utils/build/docker/java/spring-boot/src/main/java/com/datadoghq/system_tests/springboot/ai_guard/AIGuardController.java

@@ -52,7 +52,7 @@ public ResponseEntity<?> evaluate(
                 rootSpan.setTag("usr.id", userId);
             }
             if (sessionId != null && !sessionId.isEmpty()) {
-                rootSpan.setTag("session.id", sessionId);
+                rootSpan.setTag("usr.session_id", sessionId);
             }
         }
         try {

utils/build/docker/nodejs/express/app.js

@@ -761,14 +761,8 @@ app.post('/ai_guard/evaluate', async (req, res) => {
   const messages = req.body
   const userId = req.headers['x-user-id']
   const sessionId = req.headers['x-session-id']
-  const rootSpan = tracer.scope().active()?.context()._trace.started[0]
-  if (rootSpan) {
-    if (userId) {
-      rootSpan.setTag('usr.id', userId)
-    }
-    if (sessionId) {
-      rootSpan.setTag('session.id', sessionId)
-    }
+  if (userId && sessionId) {
+    tracer.setUser({ id: userId, session_id: sessionId })
   }
   try {
     const evaluation = await tracer.aiguard.evaluate(messages, { block })

utils/build/docker/python/flask/app.py

@@ -2194,7 +2194,7 @@ def ai_guard_evaluate():
             if user_id:
                 root_span.set_tag("usr.id", user_id)
             if session_id:
-                root_span.set_tag("session.id", session_id)
+                root_span.set_tag("usr.session_id", session_id)
 
         client = new_ai_guard_client(endpoint=os.environ.get("DD_AI_GUARD_ENDPOINT"))
         evaluation = client.evaluate(messages, Options(block=should_block))

utils/build/docker/ruby/rails52/app/controllers/ai_guard_controller.rb

@@ -31,13 +31,9 @@ def evaluate
       end
     end
 
-    trace = Datadog::Tracing.active_trace
-    if trace
-      user_id = request.headers['X-User-Id']
-      session_id = request.headers['X-Session-Id']
-      trace.set_tag('usr.id', user_id) if user_id.present?
-      trace.set_tag('session.id', session_id) if session_id.present?
-    end
+    user_id = request.headers['X-User-Id']
+    session_id = request.headers['X-Session-Id']
+    Datadog::Kit::Identity.set_user(id: user_id, session_id: session_id) if user_id.present? && session_id.present?
 
     allow_raise = request.headers['X-AI-Guard-Block']&.downcase == 'true'
     result = Datadog::AIGuard.evaluate(*messages, allow_raise: allow_raise)

utils/build/docker/ruby/rails61/app/controllers/ai_guard_controller.rb

@@ -31,13 +31,9 @@ def evaluate
       end
     end
 
-    trace = Datadog::Tracing.active_trace
-    if trace
-      user_id = request.headers['X-User-Id']
-      session_id = request.headers['X-Session-Id']
-      trace.set_tag('usr.id', user_id) if user_id.present?
-      trace.set_tag('session.id', session_id) if session_id.present?
-    end
+    user_id = request.headers['X-User-Id']
+    session_id = request.headers['X-Session-Id']
+    Datadog::Kit::Identity.set_user(id: user_id, session_id: session_id) if user_id.present? && session_id.present?
 
     allow_raise = request.headers['X-AI-Guard-Block']&.downcase == 'true'
     result = Datadog::AIGuard.evaluate(*messages, allow_raise: allow_raise)

utils/build/docker/ruby/rails72/app/controllers/ai_guard_controller.rb

@@ -31,13 +31,9 @@ def evaluate
       end
     end
 
-    trace = Datadog::Tracing.active_trace
-    if trace
-      user_id = request.headers['X-User-Id']
-      session_id = request.headers['X-Session-Id']
-      trace.set_tag('usr.id', user_id) if user_id.present?
-      trace.set_tag('session.id', session_id) if session_id.present?
-    end
+    user_id = request.headers['X-User-Id']
+    session_id = request.headers['X-Session-Id']
+    Datadog::Kit::Identity.set_user(id: user_id, session_id: session_id) if user_id.present? && session_id.present?
 
     allow_raise = request.headers['X-AI-Guard-Block']&.downcase == 'true'
     result = Datadog::AIGuard.evaluate(*messages, allow_raise: allow_raise)

utils/build/docker/ruby/rails80/app/controllers/ai_guard_controller.rb

@@ -31,13 +31,9 @@ def evaluate
       end
     end
 
-    trace = Datadog::Tracing.active_trace
-    if trace
-      user_id = request.headers['X-User-Id']
-      session_id = request.headers['X-Session-Id']
-      trace.set_tag('usr.id', user_id) if user_id.present?
-      trace.set_tag('session.id', session_id) if session_id.present?
-    end
+    user_id = request.headers['X-User-Id']
+    session_id = request.headers['X-Session-Id']
+    Datadog::Kit::Identity.set_user(id: user_id, session_id: session_id) if user_id.present? && session_id.present?
 
     allow_raise = request.headers['X-AI-Guard-Block']&.downcase == 'true'
     result = Datadog::AIGuard.evaluate(*messages, allow_raise: allow_raise)