From 60789f4756c5e256b77d0e0c55bef989544651e6 Mon Sep 17 00:00:00 2001
From: simon-id <simon.id@datadoghq.com>
Date: Fri, 17 Jan 2025 16:50:16 +0100
Subject: [PATCH] don't put user tracking tag when calling login tracking

---
 packages/dd-trace/src/appsec/sdk/set_user.js      | 3 +--
 packages/dd-trace/src/appsec/sdk/user_blocking.js | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/dd-trace/src/appsec/sdk/set_user.js b/packages/dd-trace/src/appsec/sdk/set_user.js
index 5c8bc268ec7..ccae859d832 100644
--- a/packages/dd-trace/src/appsec/sdk/set_user.js
+++ b/packages/dd-trace/src/appsec/sdk/set_user.js
@@ -9,8 +9,6 @@ function setUserTags (user, rootSpan) {
   for (const k of Object.keys(user)) {
     rootSpan.setTag(`usr.${k}`, '' + user[k])
   }
-
-  rootSpan.setTag('_dd.appsec.user.collection_mode', 'sdk')
 }
 
 function setUser (tracer, user) {
@@ -26,6 +24,7 @@ function setUser (tracer, user) {
   }
 
   setUserTags(user, rootSpan)
+  rootSpan.setTag('_dd.appsec.user.collection_mode', 'sdk')
 
   const persistent = {}
 
diff --git a/packages/dd-trace/src/appsec/sdk/user_blocking.js b/packages/dd-trace/src/appsec/sdk/user_blocking.js
index 8af54ccbec1..162251b10c5 100644
--- a/packages/dd-trace/src/appsec/sdk/user_blocking.js
+++ b/packages/dd-trace/src/appsec/sdk/user_blocking.js
@@ -23,6 +23,7 @@ function checkUserAndSetUser (tracer, user) {
   if (rootSpan) {
     if (!rootSpan.context()._tags['usr.id']) {
       setUserTags(user, rootSpan)
+      rootSpan.setTag('_dd.appsec.user.collection_mode', 'sdk')
     }
   } else {
     log.warn('[ASM] Root span not available in isUserBlocked')