Separate V1/V2 custom events

Author: manuel-alvarez-alvarez

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

@@ -143,7 +143,7 @@ class AppSecEventTrackerSpecification extends DDSpecification {
     1 * traceSegment.setTagTop('_dd.p.ts', ProductTraceSource.ASM)
     0 * _
 
-    assertAppSecSdkEvent(CUSTOM, V2)
+    assertAppSecSdkEvent(CUSTOM, V1)
   }
 
   def 'test track login success event V2 (SDK)'() {
@@ -198,6 +198,8 @@ class AppSecEventTrackerSpecification extends DDSpecification {
     1 * traceSegment.setTagTop('asm.keep', true)
     1 * traceSegment.setTagTop('_dd.p.ts', ProductTraceSource.ASM)
     0 * _
+
+    assertAppSecSdkEvent(CUSTOM, V2)
   }
 
   def 'test track user (SDK)'() {

dd-trace-api/src/main/java/datadog/appsec/api/login/EventTrackerService.java

@@ -15,12 +15,13 @@ public void trackUserLoginFailure(
             final String login, final boolean exists, final Map<String, String> metadata) {}
 
         @Override
-        public void trackCustomEvent(final String eventName, final Map<String, String> metadata) {}
+        public void trackCustomEventV2(
+            final String eventName, final Map<String, String> metadata) {}
       };
 
   void trackUserLoginSuccess(String login, String userId, Map<String, String> metadata);
 
   void trackUserLoginFailure(String login, boolean exists, Map<String, String> metadata);
 
-  void trackCustomEvent(String eventName, Map<String, String> metadata);
+  void trackCustomEventV2(String eventName, Map<String, String> metadata);
 }

dd-trace-api/src/main/java/datadog/appsec/api/login/EventTrackerV2.java

@@ -47,6 +47,6 @@ public static void trackUserLoginFailure(
    * @param metadata custom metadata data represented as key/value map
    */
   public static void trackCustomEvent(String eventName, Map<String, String> metadata) {
-    SERVICE.trackCustomEvent(eventName, metadata);
+    SERVICE.trackCustomEventV2(eventName, metadata);
   }
 }

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

@@ -92,6 +92,18 @@ public final void trackLoginFailureEvent(
     }
   }
 
+  @SuppressWarnings("deprecation")
+  @Override
+  public final void trackCustomEvent(String eventName, Map<String, String> metadata) {
+    if (eventName == null || eventName.isEmpty()) {
+      throw new IllegalArgumentException("eventName is null or empty");
+    }
+    WafMetricCollector.get().appSecSdkEvent(CUSTOM, V1);
+    if (handleLoginEvent(V1, eventName, SDK, null, null, null, metadata)) {
+      throw new BlockingException("Blocked request (for custom event)");
+    }
+  }
+
   @Override
   public void trackUserLoginSuccess(
       final String login, final String userId, final Map<String, String> metadata) {
@@ -116,9 +128,8 @@ public void trackUserLoginFailure(
     }
   }
 
-  @SuppressWarnings("deprecation")
   @Override
-  public final void trackCustomEvent(String eventName, Map<String, String> metadata) {
+  public final void trackCustomEventV2(final String eventName, final Map<String, String> metadata) {
     if (eventName == null || eventName.isEmpty()) {
       throw new IllegalArgumentException("eventName is null or empty");
     }