Skip to content

Separate V1/V2 custom events to validate metrics sent via telemetry #8640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Separate V1/V2 custom events to validate metrics sent via telemetry #8640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...ent/appsec/src/test/groovy/com/datadog/appsec/user/AppSecEventTrackerSpecification.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)'() {
Expand Down Expand Up @@ -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)'() {
Expand Down
5 changes: 3 additions & 2 deletions dd-trace-api/src/main/java/datadog/appsec/api/login/EventTrackerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
2 changes: 1 addition & 1 deletion dd-trace-api/src/main/java/datadog/appsec/api/login/EventTrackerV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
15 changes: 13 additions & 2 deletions internal-api/src/main/java/datadog/trace/api/appsec/AppSecEventTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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");
}
Expand Down