[pull] master from prebid:master

docs/config-app.md

@@ -52,7 +52,7 @@ This parameter exists to allow to change the location of the directory Vert.x wi
 - `http-client.circuit-breaker.opening-interval-ms` - time interval for opening the circuit breaker if failures count reached. (Must be a multiple of 1000)
 - `http-client.circuit-breaker.closing-interval-ms` - time spent in open state before attempting to re-try.
 - `http-client.circuit-breaker.idle-expire-hours` - idle time to clean the circuit breaker up.
-- `http-client.use-compression` - if equals to `true` httpclient compression is enabled for requests (see [also](https://vertx.io/docs/apidocs/io/vertx/core/http/HttpClientOptions.html#setTryUseCompression-boolean-))
+- `http-client.use-decompression` - if equals to `true` httpclient compression is enabled for requests (see [also](https://vertx.io/docs/apidocs/io/vertx/core/http/HttpClientOptions.html#setDecompressionSupported(boolean)))
 - `http-client.max-redirects` - set the maximum amount of HTTP redirections to follow. A value of 0 (the default) prevents redirections from being followed.
 - `http-client.ssl` - enable SSL/TLS support.
 - `http-client.jks-path` - path to the java keystore (if ssl is enabled).
@@ -457,6 +457,9 @@ If not defined in config all other Health Checkers would be disabled and endpoin
 - `gdpr.special-features.sfN.vendor-exceptions[]` - bidder names that will be treated opposite to `sfN.enforce` value.
 - `gdpr.purpose-one-treatment-interpretation` - option that allows to skip the Purpose one enforcement workflow.
 - `gdpr.vendorlist.default-timeout-ms` - default operation timeout for obtaining new vendor list.
+- `gdpr.vendorlist.live.url` - URL of the latest TCF GVL used to detect vendors with a past `deletedDate`. Default `https://vendor-list.consensu.org/v3/vendor-list.json`.
+- `gdpr.vendorlist.live.refresh-period-ms` - how often to refresh the live GVL deleted-vendor set, in milliseconds. Default `86400000` (24 hours).
+- `gdpr.vendorlist.live.startup-cache-dir` - directory for local storage vendor list cache. At startup server will attempt to read latest GVL from this location.
 - `gdpr.vendorlist.v2.http-endpoint-template` - template string for vendor list url version 2.
 - `gdpr.vendorlist.v2.refresh-missing-list-period-ms` - time to wait between attempts to fetch vendor list version that previously was reported to be missing by origin. Default `3600000` (one hour).
 - `gdpr.vendorlist.v2.fallback-vendor-list-path` - location on the file system of the fallback vendor list that will be used in place of missing vendor list versions. Optional.

docs/metrics.md

@@ -131,6 +131,7 @@ Following metrics are collected and submitted if account is configured with `det
 - `privacy.tcf.(v1,v2).in-geo` - number of requests received from TCF-concerned geo region with consent string of particular version 
 - `privacy.tcf.(v1,v2).out-geo` - number of requests received outside of TCF-concerned geo region with consent string of particular version
 - `privacy.tcf.(v1,v2).vendorlist.(missing|ok|err|fallback)` - number of processed vendor lists of particular version
+- `privacy.tcf.vendorlist.live.(ok|err)` - number of successful or failed refreshes of the live GVL used for deleted-vendor detection
 - `privacy.usp.specified` - number of requests with a valid US Privacy string (CCPA)
 - `privacy.usp.opt-out` - number of requests that required privacy enforcement according to CCPA rules
 - `privacy.lmt` - number of requests that required privacy enforcement according to LMT flag

extra/bundle/pom.xml

@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>org.prebid.server.hooks.modules</groupId>
-            <artifactId>ortb2-blocking</artifactId>
+            <artifactId>pb-ortb2-blocking</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

extra/modules/fiftyone-devicedetection/README.md

@@ -178,4 +178,4 @@ curl http://localhost:8080/openrtb2/auction --data @extra/modules/fiftyone-devic
 
 Any suggestions or questions can be directed to [support@51degrees.com](support@51degrees.com) e-mail.
 
-Or just open new [issue](https://github.com/prebid/prebid-server-java/issues/new) or [pull request](https://github.com/prebid/prebid-server-java/pulls) in this repository.
+Or just open new [issue](https://github.com/prebid/prebid-server-java/issues/new) or [pull request](https://github.com/prebid/prebid-server-java/pulls) in this repository.

extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHook.java

@@ -53,7 +53,7 @@
 public class GreenbidsRealTimeDataProcessedAuctionRequestHook implements ProcessedAuctionRequestHook {
 
     private static final String BID_REQUEST_ANALYTICS_EXTENSION_NAME = "greenbids-rtd";
-    private static final String CODE = "greenbids-real-time-data-processed-auction-request";
+    private static final String CODE = "greenbids-real-time-data-processed-auction-request-hook";
     private static final String ACTIVITY = "greenbids-filter";
     private static final String SUCCESS_STATUS = "success";
 

extra/modules/live-intent-omni-channel-identity/README.md

@@ -29,7 +29,7 @@ hooks:
                       "hook-sequence": [
                         {
                           "module-code": "liveintent-omni-channel-identity",
-                          "hook-impl-code": "liveintent-omni-channel-identity-enrichment-hook"
+                          "hook-impl-code": "liveintent-omni-channel-identity-processed-auction-request-hook"
                         }
                       ]
                     }

extra/modules/live-intent-omni-channel-identity/src/main/java/org/prebid/server/hooks/modules/liveintent/omni/channel/identity/v1/hooks/LiveIntentOmniChannelIdentityProcessedAuctionRequestHook.java

@@ -55,7 +55,7 @@ public class LiveIntentOmniChannelIdentityProcessedAuctionRequestHook implements
     private static final ConditionalLogger conditionalLogger = new ConditionalLogger(LoggerFactory.getLogger(
             LiveIntentOmniChannelIdentityProcessedAuctionRequestHook.class));
 
-    private static final String CODE = "liveintent-omni-channel-identity-enrichment-hook";
+    private static final String CODE = "liveintent-omni-channel-identity-processed-auction-request-hook";
 
     private static final String INSERTER = "s2s.liveintent.com";
 

extra/modules/ortb2-blocking/pom.xml → extra/modules/pb-ortb2-blocking/pom.xml

@@ -8,8 +8,8 @@
         <version>3.44.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>ortb2-blocking</artifactId>
+    <artifactId>pb-ortb2-blocking</artifactId>
 
-    <name>ortb2-blocking</name>
+    <name>pb-ortb2-blocking</name>
     <description>OpenRTB2 Blocking module</description>
 </project>

extra/modules/ortb2-blocking/src/main/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingBidderRequestHook.java → extra/modules/pb-ortb2-blocking/src/main/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingBidderRequestHook.java

@@ -26,7 +26,7 @@
 
 public class Ortb2BlockingBidderRequestHook implements BidderRequestHook {
 
-    private static final String CODE = "ortb2-blocking-bidder-request";
+    private static final String CODE = "pb-ortb2-blocking-bidder-request-hook";
 
     private final BidderCatalog bidderCatalog;
 

extra/modules/ortb2-blocking/src/main/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingModule.java → extra/modules/pb-ortb2-blocking/src/main/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingModule.java

@@ -12,7 +12,7 @@
 
 public class Ortb2BlockingModule implements Module {
 
-    public static final String CODE = "ortb2-blocking";
+    public static final String CODE = "pb-ortb2-blocking";
 
     private final List<? extends Hook<?, ? extends InvocationContext>> hooks;
 

extra/modules/ortb2-blocking/src/main/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingRawBidderResponseHook.java → extra/modules/pb-ortb2-blocking/src/main/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingRawBidderResponseHook.java

@@ -34,7 +34,7 @@
 
 public class Ortb2BlockingRawBidderResponseHook implements RawBidderResponseHook {
 
-    private static final String CODE = "ortb2-blocking-raw-bidder-response";
+    private static final String CODE = "pb-ortb2-blocking-raw-bidder-response-hook";
 
     private static final String ENFORCE_BLOCKING_ACTIVITY = "enforce-blocking";
     private static final String SUCCESS_STATUS = "success";

extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/model/BidderInvocationContextImpl.java → extra/modules/pb-ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/model/BidderInvocationContextImpl.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.iab.openrtb.request.BidRequest;
+import io.vertx.core.http.HttpMethod;
 import lombok.Builder;
 import lombok.Value;
 import lombok.experimental.Accessors;
@@ -21,6 +22,8 @@ public class BidderInvocationContextImpl implements BidderInvocationContext {
 
     Timeout timeout;
 
+    HttpMethod httpMethod;
+
     Endpoint endpoint;
 
     AuctionContext auctionContext;

extra/modules/pb-request-correction/src/main/java/org/prebid/server/hooks/modules/pb/request/correction/v1/RequestCorrectionProcessedAuctionHook.java

@@ -23,7 +23,7 @@
 
 public class RequestCorrectionProcessedAuctionHook implements ProcessedAuctionRequestHook {
 
-    private static final String CODE = "pb-request-correction-processed-auction-request";
+    private static final String CODE = "pb-request-correction-processed-auction-request-hook";
 
     private final RequestCorrectionProvider requestCorrectionProvider;
     private final ObjectMapper mapper;

extra/modules/pb-response-correction/src/main/java/org/prebid/server/hooks/modules/pb/response/correction/v1/ResponseCorrectionAllProcessedBidResponsesHook.java

@@ -24,7 +24,7 @@
 
 public class ResponseCorrectionAllProcessedBidResponsesHook implements AllProcessedBidResponsesHook {
 
-    private static final String CODE = "pb-response-correction-all-processed-bid-responses";
+    private static final String CODE = "pb-response-correction-all-processed-bid-responses-hook";
 
     private final ResponseCorrectionProvider responseCorrectionProvider;
     private final ObjectMapper mapper;

extra/modules/pb-rule-engine/src/main/java/org/prebid/server/hooks/modules/rule/engine/v1/PbRuleEngineProcessedAuctionRequestHook.java

@@ -30,7 +30,7 @@
 
 public class PbRuleEngineProcessedAuctionRequestHook implements ProcessedAuctionRequestHook {
 
-    private static final String CODE = "pb-rule-engine-processed-auction-request";
+    private static final String CODE = "pb-rule-engine-processed-auction-request-hook";
 
     private final RuleParser ruleParser;
     private final String datacenter;

extra/modules/pom.xml

@@ -17,17 +17,18 @@
     <description>Umbrellas all PBS modules</description>
 
     <modules>
-        <module>ortb2-blocking</module>
-        <module>confiant-ad-quality</module>
+        <module>pb-ortb2-blocking</module>
         <module>pb-richmedia-filter</module>
-        <module>fiftyone-devicedetection</module>
         <module>pb-response-correction</module>
-        <module>greenbids-real-time-data</module>
         <module>pb-request-correction</module>
+        <module>pb-rule-engine</module>
+
+        <module>confiant-ad-quality</module>
+        <module>fiftyone-devicedetection</module>
+        <module>greenbids-real-time-data</module>
         <module>optable-targeting</module>
         <module>wurfl-devicedetection</module>
         <module>live-intent-omni-channel-identity</module>
-        <module>pb-rule-engine</module>
     </modules>
 
     <dependencyManagement>

sample/001_banner/configs/config.yaml

@@ -25,6 +25,8 @@ gdpr:
       cache-dir: /var/tmp/vendor2
     v3:
       cache-dir: /var/tmp/vendor3
+    live:
+      startup-cache-dir: /var/tmp/vendor3
 admin-endpoints:
   logging-changelevel:
     enabled: true

sample/configs/localdev-config.yaml

@@ -24,3 +24,5 @@ gdpr:
       cache-dir: /var/tmp/vendor2
     v3:
       cache-dir: /var/tmp/vendor3
+    live:
+      startup-cache-dir: /var/tmp/vendor3

sample/configs/prebid-config-db.yaml

@@ -43,6 +43,8 @@ gdpr:
       cache-dir: /var/tmp/vendor2
     v3:
       cache-dir: /var/tmp/vendor3
+    live:
+      startup-cache-dir: /var/tmp/vendor3
 admin-endpoints:
   logging-changelevel:
     enabled: true

sample/configs/prebid-config-s3.yaml

@@ -51,6 +51,8 @@ gdpr:
       cache-dir: /var/tmp/vendor2
     v3:
       cache-dir: /var/tmp/vendor3
+    live:
+      startup-cache-dir: /var/tmp/vendor3
 
 admin-endpoints:
   logging-changelevel:

sample/configs/prebid-config-with-51d-dd.yaml

@@ -33,6 +33,8 @@ gdpr:
       cache-dir: /var/tmp/vendor2
     v3:
       cache-dir: /var/tmp/vendor3
+    live:
+      startup-cache-dir: /var/tmp/vendor3
 admin-endpoints:
   logging-changelevel:
     enabled: true

sample/configs/prebid-config-with-module.yaml

@@ -33,6 +33,8 @@ gdpr:
       cache-dir: /var/tmp/vendor2
     v3:
       cache-dir: /var/tmp/vendor3
+    live:
+      startup-cache-dir: /var/tmp/vendor3
 admin-endpoints:
   logging-changelevel:
     enabled: true

sample/configs/prebid-config-with-optable.yaml

@@ -39,6 +39,8 @@ gdpr:
       cache-dir: /var/tmp/vendor2
     v3:
       cache-dir: /var/tmp/vendor3
+    live:
+      startup-cache-dir: /var/tmp/vendor3
 admin-endpoints:
   logging-changelevel:
     enabled: true

sample/configs/prebid-config-with-wurfl.yaml

@@ -34,6 +34,8 @@ gdpr:
       cache-dir: /var/tmp/vendor2
     v3:
       cache-dir: /var/tmp/vendor3
+    live:
+      startup-cache-dir: /var/tmp/vendor3
 admin-endpoints:
   logging-changelevel:
     enabled: true

sample/configs/prebid-config.yaml

@@ -34,6 +34,8 @@ gdpr:
       cache-dir: /var/tmp/vendor2
     v3:
       cache-dir: /var/tmp/vendor3
+    live:
+      startup-cache-dir: /var/tmp/vendor3
 admin-endpoints:
   logging-changelevel:
     enabled: true

src/main/docker/application.yaml

@@ -4,3 +4,5 @@ gdpr:
       cache-dir: /app/prebid-server/data/vendorlist-v2
     v3:
       cache-dir: /app/prebid-server/data/vendorlist-v3
+    live:
+      startup-cache-dir: /app/prebid-server/data/vendorlist-v3

src/main/java/org/prebid/server/analytics/reporter/liveintent/LiveIntentAnalyticsReporter.java

@@ -34,7 +34,7 @@
 
 public class LiveIntentAnalyticsReporter implements AnalyticsReporter {
 
-    private static final String LIVEINTENT_HOOK_ID = "liveintent-omni-channel-identity-enrichment-hook";
+    private static final String LIVEINTENT_HOOK_ID = "liveintent-omni-channel-identity-processed-auction-request-hook";
 
     private final HttpClient httpClient;
     private final LiveIntentAnalyticsProperties properties;