Remove user identity propagation

Author: manuel-alvarez-alvarez

dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/user/AppSecEventTrackerSpecification.groovy

@@ -133,26 +133,16 @@ class AppSecEventTrackerSpecification extends DDSpecification {
 
   def 'test track user (SDK)'() {
     when:
-    setUser(USER_ID, ['key1': 'value1', 'key2': 'value2'], propagated)
+    setUser(USER_ID, ['key1': 'value1', 'key2': 'value2'])
 
     then:
     1 * traceSegment.setTagTop('usr.id', USER_ID)
     1 * traceSegment.setTagTop('usr', ['key1':'value1', 'key2':'value2'])
     1 * traceSegment.setTagTop('_dd.appsec.user.collection_mode', SDK.fullName())
     1 * traceSegment.setTagTop('asm.keep', true)
     1 * traceSegment.setTagTop('_dd.p.ts', ProductTraceSource.ASM)
-    if (propagated) {
-      1 * traceSegment.setTagTop('_dd.p.usr.id', USER_ID.bytes.encodeBase64().toString())
-    } else {
-      0 * traceSegment.setTagTop('_dd.p.usr.id', _)
-    }
     1 * user.apply(_ as RequestContext, USER_ID) >> NoopFlow.INSTANCE
     0 * _
-
-    where:
-    propagated | _
-    true       | _
-    false      | _
   }
 
   def 'test wrong event argument validation (SDK)'() {

dd-trace-api/src/main/java/datadog/appsec/api/user/User.java

@@ -23,18 +23,6 @@ public static void setUserService(final UserService service) {
    * @param metadata custom metadata data represented as key/value map
    */
   public static void setUser(final String id, final Map<String, String> metadata) {
-    setUser(id, metadata, false);
-  }
-
-  /**
-   * Sets the user monitoring tags on the root span using the prefix {@code usr}
-   *
-   * @param id identifier of the user
-   * @param metadata custom metadata data represented as key/value map
-   * @param propagated propagate the id to downstream services
-   */
-  public static void setUser(
-      final String id, final Map<String, String> metadata, final boolean propagated) {
-    SERVICE.trackUserEvent(id, metadata, propagated);
+    SERVICE.trackUserEvent(id, metadata);
   }
 }

dd-trace-api/src/main/java/datadog/appsec/api/user/UserService.java

@@ -7,9 +7,8 @@ public interface UserService {
   UserService NO_OP =
       new UserService() {
         @Override
-        public void trackUserEvent(
-            final String userId, final Map<String, String> metadata, final boolean propagated) {}
+        public void trackUserEvent(final String userId, final Map<String, String> metadata) {}
       };
 
-  void trackUserEvent(String userId, Map<String, String> metadata, boolean propagated);
+  void trackUserEvent(String userId, Map<String, String> metadata);
 }

internal-api/src/main/java/datadog/trace/api/appsec/AppSecEventTracker.java

@@ -75,12 +75,11 @@ public final void trackCustomEvent(String eventName, Map<String, String> metadat
   }
 
   @Override
-  public void trackUserEvent(
-      final String userId, final Map<String, String> metadata, final boolean propagated) {
+  public void trackUserEvent(final String userId, final Map<String, String> metadata) {
     if (userId == null || userId.isEmpty()) {
       throw new IllegalArgumentException("UserId is null or empty");
     }
-    onUserEvent(SDK, userId, metadata, propagated);
+    onUserEvent(SDK, userId, metadata);
   }
 
   public void onUserNotFound(final UserIdCollectionMode mode) {
@@ -103,14 +102,11 @@ public void onUserNotFound(final UserIdCollectionMode mode) {
   }
 
   public void onUserEvent(final UserIdCollectionMode mode, final String userId) {
-    onUserEvent(mode, userId, emptyMap(), false);
+    onUserEvent(mode, userId, emptyMap());
   }
 
   public void onUserEvent(
-      final UserIdCollectionMode mode,
-      final String userId,
-      final Map<String, String> metadata,
-      final boolean propagated) {
+      final UserIdCollectionMode mode, final String userId, final Map<String, String> metadata) {
     if (!isEnabled(mode)) {
       return;
     }
@@ -128,9 +124,6 @@ public void onUserEvent(
     }
     if (mode != SDK) {
       segment.setTagTop("_dd.appsec.usr.id", finalUserId);
-    } else if (propagated) {
-      // only the SDK can propagate usr.id
-      segment.setTagTop("_dd.p.usr.id", encodeBase64(finalUserId));
     }
     if (isNewUser(mode, segment)) {
       segment.setTagTop("usr.id", finalUserId);