Add new request type names and fix NPE for setuid and cookiesync (#992)

prebid · Nov 3, 2020 · f5fce4c · f5fce4c
1 parent 03bd910
commit f5fce4c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/org/prebid/server/auction/PrivacyEnforcementService.java b/src/main/java/org/prebid/server/auction/PrivacyEnforcementService.java
@@ -131,7 +131,7 @@ public Future<PrivacyContext> contextFromSetuidRequest(
         final String ipAddress = HttpUtil.ipFrom(httpRequest);
         final AccountGdprConfig accountGdpr = account.getGdpr();
         final String accountId = account.getId();
-        final RequestLogInfo requestLogInfo = requestLogInfo(null, null, accountId);
+        final RequestLogInfo requestLogInfo = requestLogInfo(MetricName.setuid, null, accountId);
 
         return tcfDefinerService.resolveTcfContext(privacy, ipAddress, accountGdpr, requestLogInfo, timeout)
                 .map(tcfContext -> PrivacyContext.of(privacy, tcfContext));
@@ -144,7 +144,7 @@ public Future<PrivacyContext> contextFromCookieSyncRequest(
         final String ipAddress = HttpUtil.ipFrom(httpRequest);
         final AccountGdprConfig accountGdpr = account.getGdpr();
         final String accountId = account.getId();
-        final RequestLogInfo requestLogInfo = requestLogInfo(null, null, accountId);
+        final RequestLogInfo requestLogInfo = requestLogInfo(MetricName.cookiesync, null, accountId);
 
         return tcfDefinerService.resolveTcfContext(privacy, ipAddress, accountGdpr, requestLogInfo, timeout)
                 .map(tcfContext -> PrivacyContext.of(privacy, tcfContext));

diff --git a/src/main/java/org/prebid/server/metric/MetricName.java b/src/main/java/org/prebid/server/metric/MetricName.java
@@ -44,6 +44,9 @@ public enum MetricName {
     amp,
     video,
     legacy,
+    cookiesync,
+    setuid,
+
 
     // request and adapter statuses
     ok,

diff --git a/src/main/java/org/prebid/server/privacy/gdpr/TcfDefinerService.java b/src/main/java/org/prebid/server/privacy/gdpr/TcfDefinerService.java
@@ -411,7 +411,7 @@ private TCString decodeTcString(String consentString, RequestLogInfo requestLogI
     }
 
     private static void logWarn(String consent, String message, RequestLogInfo requestLogInfo) {
-        if (requestLogInfo == null) {
+        if (requestLogInfo == null || requestLogInfo.getRequestType() == null) {
             final String exceptionMessage = String.format("Parsing consent string:\"%s\" failed for undefined type "
                     + "with exception %s", consent, message);
             UNDEFINED_CORRUPT_CONSENT_LOGGER.info(exceptionMessage, 100);
@@ -436,6 +436,8 @@ private static void logWarn(String consent, String message, RequestLogInfo reque
                         logMessage(consent, MetricName.legacy.toString(), requestLogInfo, message), 100);
                 break;
             case video:
+            case cookiesync:
+            case setuid:
             default:
                 UNDEFINED_CORRUPT_CONSENT_LOGGER.info(
                         logMessage(consent, "video or sync or setuid", requestLogInfo, message), 100);

diff --git a/src/test/java/org/prebid/server/auction/PrivacyEnforcementServiceTest.java b/src/test/java/org/prebid/server/auction/PrivacyEnforcementServiceTest.java
@@ -281,7 +281,7 @@ public void contextFromSetuidRequestShouldReturnContext() {
         final Privacy privacy = Privacy.of("1", "consent", Ccpa.EMPTY, 0);
         FutureAssertion.assertThat(privacyContext).succeededWith(PrivacyContext.of(privacy, tcfContext));
 
-        final RequestLogInfo expectedRequestLogInfo = RequestLogInfo.of(null, null, accountId);
+        final RequestLogInfo expectedRequestLogInfo = RequestLogInfo.of(MetricName.setuid, null, accountId);
         verify(tcfDefinerService)
                 .resolveTcfContext(eq(privacy), eq("ip"), isNull(), eq(expectedRequestLogInfo), isNull());
     }
@@ -317,7 +317,7 @@ public void contextFromCookieSyncRequestShouldReturnContext() {
         final Privacy privacy = Privacy.of("1", "consent", Ccpa.of("1YYY"), 0);
         FutureAssertion.assertThat(privacyContext).succeededWith(PrivacyContext.of(privacy, tcfContext));
 
-        final RequestLogInfo expectedRequestLogInfo = RequestLogInfo.of(null, null, accountId);
+        final RequestLogInfo expectedRequestLogInfo = RequestLogInfo.of(MetricName.cookiesync, null, accountId);
         verify(tcfDefinerService)
                 .resolveTcfContext(eq(privacy), eq("ip"), isNull(), eq(expectedRequestLogInfo), isNull());
     }