Merge remote-tracking branch 'origin/master' into bidder-configs-fixes

# Conflicts:
#	src/main/java/org/prebid/server/bidder/mobkoi/MobkoiBidder.java
#	src/test/java/org/prebid/server/bidder/yandex/YandexBidderTest.java
#	src/test/java/org/prebid/server/cache/BasicPbcStorageServiceTest.java
#	src/test/java/org/prebid/server/cache/CoreCacheServiceTest.java
#	src/test/resources/org/prebid/server/it/test-application.properties

Author: AntoxaAntoxic

.github/workflows/scripts/codepath-notification

@@ -23,3 +23,4 @@ openx|OpenX: prebid@openx.com
 medianet|Medianet: prebid@media.net
 thetradedesk|TheTradeDesk: Prebid-Maintainers@thetradedesk.com
 gumgum|GumGum: prebid@gumgum.com
+kargo|Kargo: kraken@kargo.com

extra/bundle/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid</groupId>
         <artifactId>prebid-server-aggregator</artifactId>
-        <version>3.33.0-SNAPSHOT</version>
+        <version>3.35.0-SNAPSHOT</version>
         <relativePath>../../extra/pom.xml</relativePath>
     </parent>
 

extra/modules/confiant-ad-quality/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>3.33.0-SNAPSHOT</version>
+        <version>3.35.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>confiant-ad-quality</artifactId>

extra/modules/fiftyone-devicedetection/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>3.33.0-SNAPSHOT</version>
+        <version>3.35.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>fiftyone-devicedetection</artifactId>

extra/modules/greenbids-real-time-data/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>3.33.0-SNAPSHOT</version>
+        <version>3.35.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>greenbids-real-time-data</artifactId>

extra/modules/live-intent-omni-channel-identity/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>3.33.0-SNAPSHOT</version>
+        <version>3.35.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>live-intent-omni-channel-identity</artifactId>

extra/modules/optable-targeting/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>3.33.0-SNAPSHOT</version>
+        <version>3.35.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>optable-targeting</artifactId>

extra/modules/optable-targeting/src/main/java/org/prebid/server/hooks/modules/optable/targeting/model/OptableAttributes.java

@@ -20,5 +20,7 @@ public class OptableAttributes {
 
     List<String> ips;
 
+    String userAgent;
+
     Long timeout;
 }

extra/modules/optable-targeting/src/main/java/org/prebid/server/hooks/modules/optable/targeting/model/config/OptableTargetingProperties.java

@@ -5,6 +5,7 @@
 import lombok.NoArgsConstructor;
 
 import java.util.Map;
+import java.util.Set;
 
 @Data
 @NoArgsConstructor
@@ -31,5 +32,14 @@ public final class OptableTargetingProperties {
     @JsonProperty("id-prefix-order")
     String idPrefixOrder;
 
+    @JsonProperty("optable-inserter-eids-merge")
+    Set<String> optableInserterEidsMerge = Set.of();
+
+    @JsonProperty("optable-inserter-eids-replace")
+    Set<String> optableInserterEidsReplace = Set.of();
+
+    @JsonProperty("optable-inserter-eids-ignore")
+    Set<String> optableInserterEidsIgnore = Set.of();
+
     CacheProperties cache = new CacheProperties();
 }

extra/modules/optable-targeting/src/main/java/org/prebid/server/hooks/modules/optable/targeting/v1/OptableTargetingProcessedAuctionRequestHook.java

@@ -89,7 +89,7 @@ public Future<InvocationResult<AuctionRequestPayload>> call(AuctionRequestPayloa
                 .compose(targetingResult -> {
                     moduleContext.setOptableTargetingExecutionTime(
                             System.currentTimeMillis() - callTargetingAPITimestamp);
-                    return enrichedPayload(targetingResult, moduleContext);
+                    return enrichedPayload(targetingResult, moduleContext, properties);
                 })
                 .recover(throwable -> {
                     moduleContext.setOptableTargetingExecutionTime(
@@ -143,13 +143,14 @@ private Timeout getHookTimeout(AuctionInvocationContext invocationContext) {
     }
 
     private Future<InvocationResult<AuctionRequestPayload>> enrichedPayload(TargetingResult targetingResult,
-                                                                            ModuleContext moduleContext) {
+                                                                            ModuleContext moduleContext,
+                                                                            OptableTargetingProperties properties) {
 
         moduleContext.setTargeting(targetingResult.getAudience());
         moduleContext.setEnrichRequestStatus(EnrichmentStatus.success());
         return update(
                 BidRequestCleaner.instance()
-                        .andThen(BidRequestEnricher.of(targetingResult))
+                        .andThen(BidRequestEnricher.of(targetingResult, properties))
                         ::apply,
                 moduleContext);
     }