Merge branch 'refs/heads/master' into support-gpp-usnat-v2

Author: osulzhenko

.github/workflows/code-path-changes.yml

@@ -1,7 +1,7 @@
 name: Notify Code Path Changes
 
 on:
-  pull_request:
+  pull_request_target:
     types: [opened, synchronize]
     paths:
       - '**'
@@ -14,6 +14,9 @@ env:
   GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+permissions:
+  contents: read
+
 jobs:
   notify:
     runs-on: ubuntu-latest

docs/config-app.md

@@ -120,6 +120,7 @@ Removes and downloads file again if depending service cant process probably corr
 
 ## Setuid
 - `setuid.default-timeout-ms` - default operation timeout for requests to `/setuid` endpoint.
+- `setuid.number-of-uid-cookies` - specifies the maximum number of UID cookies that can be returned in the `/setuid` endpoint response. If it's not specified `1` will be taken as the default value.
 
 ## Cookie Sync
 - `cookie-sync.default-timeout-ms` - default operation timeout for requests to `/cookie_sync` endpoint.

extra/bundle/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid</groupId>
         <artifactId>prebid-server-aggregator</artifactId>
-        <version>3.19.0-SNAPSHOT</version>
+        <version>3.21.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.19.0-SNAPSHOT</version>
+        <version>3.21.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.19.0-SNAPSHOT</version>
+        <version>3.21.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.19.0-SNAPSHOT</version>
+        <version>3.21.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>greenbids-real-time-data</artifactId>

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

@@ -115,7 +115,7 @@ private List<ThrottlingMessage> extractMessagesForImp(
     private static String getCountryNameFromAlpha2(String isoCode) {
         return StringUtils.isBlank(isoCode)
                 ? StringUtils.EMPTY
-                : new Locale(StringUtils.EMPTY, isoCode).getDisplayCountry();
+                : Locale.forLanguageTag("und-" + isoCode).getDisplayCountry(Locale.ENGLISH);
     }
 
     private String getCountry(String ip) {

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

@@ -7,7 +7,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.prebid.server.analytics.reporter.greenbids.model.ExplorationResult;
 import org.prebid.server.analytics.reporter.greenbids.model.Ortb2ImpExtResult;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.Partner;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.GreenbidsConfig;
 import org.prebid.server.hooks.modules.greenbids.real.time.data.model.result.AnalyticsResult;
 import org.prebid.server.hooks.modules.greenbids.real.time.data.model.result.GreenbidsInvocationResult;
 import org.prebid.server.hooks.v1.InvocationAction;
@@ -22,13 +22,15 @@ public class GreenbidsInvocationService {
 
     private static final int RANGE_16_BIT_INTEGER_DIVISION_BASIS = 0x10000;
 
+    private static final double DEFAULT_EXPLORATION_RATE = 1.0;
+
     public GreenbidsInvocationResult createGreenbidsInvocationResult(
-            Partner partner,
+            GreenbidsConfig greenbidsConfig,
             BidRequest bidRequest,
             Map<String, Map<String, Boolean>> impsBiddersFilterMap) {
 
         final String greenbidsId = UUID.randomUUID().toString();
-        final boolean isExploration = isExploration(partner, greenbidsId);
+        final boolean isExploration = isExploration(greenbidsConfig, greenbidsId);
 
         final BidRequest updatedBidRequest = isExploration
                 ? bidRequest
@@ -49,10 +51,12 @@ public GreenbidsInvocationResult createGreenbidsInvocationResult(
         return GreenbidsInvocationResult.of(updatedBidRequest, invocationAction, analyticsResult);
     }
 
-    private Boolean isExploration(Partner partner, String greenbidsId) {
+    private Boolean isExploration(GreenbidsConfig greenbidsConfig, String greenbidsId) {
+        final double explorationRate = Optional.ofNullable(greenbidsConfig.getExplorationRate())
+                .orElse(DEFAULT_EXPLORATION_RATE);
         final int hashInt = Integer.parseInt(
                 greenbidsId.substring(greenbidsId.length() - 4), 16);
-        return hashInt < partner.getExplorationRate() * RANGE_16_BIT_INTEGER_DIVISION_BASIS;
+        return hashInt < explorationRate * RANGE_16_BIT_INTEGER_DIVISION_BASIS;
     }
 
     private List<Imp> updateImps(BidRequest bidRequest, Map<String, Map<String, Boolean>> impsBiddersFilterMap) {

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

@@ -1,7 +1,7 @@
 package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
 
 import io.vertx.core.Future;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.Partner;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.GreenbidsConfig;
 
 import java.util.Objects;
 
@@ -18,14 +18,14 @@ public OnnxModelRunnerWithThresholds(
         this.thresholdCache = Objects.requireNonNull(thresholdCache);
     }
 
-    public Future<OnnxModelRunner> retrieveOnnxModelRunner(Partner partner) {
-        final String onnxModelPath = "models_pbuid=" + partner.getPbuid() + ".onnx";
-        return modelCache.get(onnxModelPath, partner.getPbuid());
+    public Future<OnnxModelRunner> retrieveOnnxModelRunner(GreenbidsConfig greenbidsConfig) {
+        final String onnxModelPath = "models_pbuid=" + greenbidsConfig.getPbuid() + ".onnx";
+        return modelCache.get(onnxModelPath, greenbidsConfig.getPbuid());
     }
 
-    public Future<Double> retrieveThreshold(Partner partner) {
-        final String thresholdJsonPath = "thresholds_pbuid=" + partner.getPbuid() + ".json";
-        return thresholdCache.get(thresholdJsonPath, partner.getPbuid())
-                .map(partner::getThreshold);
+    public Future<Double> retrieveThreshold(GreenbidsConfig greenbidsConfig) {
+        final String thresholdJsonPath = "thresholds_pbuid=" + greenbidsConfig.getPbuid() + ".json";
+        return thresholdCache.get(thresholdJsonPath, greenbidsConfig.getPbuid())
+                .map(greenbidsConfig::getThreshold);
     }
 }

…s/real/time/data/model/data/Partner.java …ime/data/model/data/GreenbidsConfig.javaextra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/model/data/Partner.java renamed to extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/model/data/GreenbidsConfig.java extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/model/data/Partner.java renamed to extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/model/data/GreenbidsConfig.java

@@ -6,27 +6,31 @@
 
 import java.util.Comparator;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.IntStream;
 
 @Value(staticConstructor = "of")
-public class Partner {
+public class GreenbidsConfig {
+
+    private static final double DEFAULT_TPR = 1.0;
 
     String pbuid;
 
-    @JsonProperty("targetTpr")
+    @JsonProperty("target-tpr")
     Double targetTpr;
 
-    @JsonProperty("explorationRate")
+    @JsonProperty("exploration-rate")
     Double explorationRate;
 
     public Double getThreshold(ThrottlingThresholds throttlingThresholds) {
+        final double safeTargetTpr = targetTpr != null ? targetTpr : DEFAULT_TPR;
         final List<Double> truePositiveRates = throttlingThresholds.getTpr();
         final List<Double> thresholds = throttlingThresholds.getThresholds();
 
         final int minSize = Math.min(truePositiveRates.size(), thresholds.size());
 
         return IntStream.range(0, minSize)
-                .filter(i -> truePositiveRates.get(i) >= targetTpr)
+                .filter(i -> truePositiveRates.get(i) >= safeTargetTpr)
                 .mapToObj(thresholds::get)
                 .max(Comparator.naturalOrder())
                 .orElse(0.0);