Merge branch 'refs/heads/master' into functional-tests/general-get-interface

Author: osulzhenko

.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.34.0-SNAPSHOT</version>
+        <version>3.36.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.34.0-SNAPSHOT</version>
+        <version>3.36.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.34.0-SNAPSHOT</version>
+        <version>3.36.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.34.0-SNAPSHOT</version>
+        <version>3.36.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.34.0-SNAPSHOT</version>
+        <version>3.36.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>live-intent-omni-channel-identity</artifactId>

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

@@ -17,6 +17,9 @@
 import org.prebid.server.auction.model.AuctionContext;
 import org.prebid.server.auction.privacy.enforcement.mask.UserFpdActivityMask;
 import org.prebid.server.hooks.execution.v1.InvocationResultImpl;
+import org.prebid.server.hooks.execution.v1.analytics.ActivityImpl;
+import org.prebid.server.hooks.execution.v1.analytics.ResultImpl;
+import org.prebid.server.hooks.execution.v1.analytics.TagsImpl;
 import org.prebid.server.hooks.execution.v1.auction.AuctionRequestPayloadImpl;
 import org.prebid.server.hooks.modules.liveintent.omni.channel.identity.model.IdResResponse;
 import org.prebid.server.hooks.modules.liveintent.omni.channel.identity.model.config.LiveIntentOmniChannelProperties;
@@ -163,6 +166,15 @@ private InvocationResultImpl<AuctionRequestPayload> update(IdResResponse resolut
                 .status(InvocationStatus.success)
                 .action(InvocationAction.update)
                 .payloadUpdate(payload -> updatedPayload(payload, resolutionResult.getEids()))
+                .analyticsTags(TagsImpl.of(List.of(
+                        ActivityImpl.of(
+                                "liveintent-enriched", "success",
+                                List.of(
+                                    ResultImpl.of(
+                                            "",
+                                            mapper.mapper().createObjectNode()
+                                                    .put("treatmentRate", config.getTreatmentRate()),
+                                            null))))))
                 .build();
     }
 

extra/modules/optable-targeting/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>3.34.0-SNAPSHOT</version>
+        <version>3.36.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();
 }