Merge remote-tracking branch 'refs/remotes/origin/bid-ranking' into functional-tests/bid-ranking

Author: osulzhenko

.github/workflows/scripts/codepath-notification

@@ -21,3 +21,4 @@ appnexus|Appnexus: prebid@microsoft.com
 pubmatic|Pubmatic: header-bidding@pubmatic.com
 openx|OpenX: prebid@openx.com
 medianet|Medianet: prebid@media.net
+thetradedesk|TheTradeDesk: Prebid-Maintainers@thetradedesk.com

.mvn/wrapper/maven-wrapper.jar

@@ -6,13 +6,14 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#   https://www.apache.org/licenses/LICENSE-2.0
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

.mvn/wrapper/maven-wrapper.properties

@@ -277,8 +277,8 @@ The general idea is that you'll place all the account-specific settings in a sep
 ```yaml
 settings:
   s3:
-      accessKeyId: <S3 access key>
-      secretAccessKey: <S3 access key>
+      accessKeyId: <S3 access key> # optional
+      secretAccessKey: <S3 access key> #optional
       endpoint: <endpoint> # http://s3.storage.com
       bucket: <bucket name> # prebid-application-settings
       region: <region name> # if not provided AWS_GLOBAL will be used. Example value: 'eu-central-1'
@@ -298,6 +298,14 @@ settings:
           timeout: 5000
 ```
 
+If `accessKeyId` and `secretAccessKey` are not specified in the Prebid Server configuration  then AWS credentials will be looked up in this order:
+- Java System Properties - `aws.accessKeyId` and `aws.secretAccessKey`
+- Environment Variables - `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`
+- Web Identity Token credentials from system properties or environment variables
+- Credential profiles file at the default location (`~/.aws/credentials`) shared by all AWS SDKs and the AWS CLI
+- Credentials delivered through the Amazon EC2 container service if "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI" environment variable is set and security manager has permission to access the variable,
+- Instance profile credentials delivered through the Amazon EC2 metadata service
+
 ### File format
 
 We recommend using the `json` format for your account configuration. A minimal configuration may look like this.

docs/application-settings.md

@@ -96,6 +96,7 @@ Removes and downloads file again if depending service cant process probably corr
 - `auction.cache.expected-request-time-ms` - approximate value in milliseconds for Cache Service interacting.
 - `auction.cache.only-winning-bids` - if equals to `true` only the winning bids would be cached. Has lower priority than request-specific flags.
 - `auction.generate-bid-id` - whether to generate seatbid[].bid[].ext.prebid.bidid in the OpenRTB response.
+- `auction.enforce-random-bid-id` - whether to enforce generating a robust random seatbid[].bid[].id in the OpenRTB response if the initial value is less than 17 characters.
 - `auction.validations.banner-creative-max-size` - enables creative max size validation for banners. Possible values: `skip`, `enforce`, `warn`. Default is `skip`.
 - `auction.validations.secure-markup` - enables secure markup validation. Possible values: `skip`, `enforce`, `warn`. Default is `skip`.
 - `auction.host-schain-node` - defines global schain node that will be appended to `request.source.ext.schain.nodes` passed to bidders
@@ -390,8 +391,8 @@ contain 'WHERE last_updated > ?' for MySQL and 'WHERE last_updated > $1' for Pos
 
 For S3 storage configuration
 - `settings.in-memory-cache.s3-update.refresh-rate` - refresh period in ms for stored request updates in S3
-- `settings.s3.access-key-id` - an access key
-- `settings.s3.secret-access-key` - a secret access key
+- `settings.s3.access-key-id` - an access key (optional)
+- `settings.s3.secret-access-key` - a secret access key (optional)
 - `settings.s3.region` - a region, AWS_GLOBAL by default
 - `settings.s3.endpoint` - an endpoint
 - `settings.s3.bucket` - a bucket name
@@ -401,6 +402,15 @@ For S3 storage configuration
 - `settings.s3.stored-requests-dir` - a directory with stored requests
 - `settings.s3.stored-responses-dir` - a directory with stored responses
 
+If `settings.s3.access-key-id` and `settings.s3.secret-access-key` are not specified in the Prebid Server configuration then AWS credentials will be looked up in this order:
+- Java System Properties - `aws.accessKeyId` and `aws.secretAccessKey`
+- Environment Variables - `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`
+- Web Identity Token credentials from system properties or environment variables 
+- Credential profiles file at the default location (`~/.aws/credentials`) shared by all AWS SDKs and the AWS CLI
+- Credentials delivered through the Amazon EC2 container service if "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI" environment variable is set and security manager has permission to access the variable,
+- Instance profile credentials delivered through the Amazon EC2 metadata service
+
+
 For targeting available next options:
 - `settings.targeting.truncate-attr-chars` - set the max length for names of targeting keywords (0 means no truncation).
 

docs/config-app.md

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

extra/bundle/pom.xml

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

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

@@ -34,7 +34,8 @@ public class ConfiantAdQualityModuleConfiguration {
     ConfiantAdQualityModule confiantAdQualityModule(
             @Value("${hooks.modules.confiant-ad-quality.api-key}") String apiKey,
             @Value("${hooks.modules.confiant-ad-quality.scan-state-check-interval}") int scanStateCheckInterval,
-            @Value("${hooks.modules.confiant-ad-quality.bidders-to-exclude-from-scan}") List<String> biddersToExcludeFromScan,
+            @Value("${hooks.modules.confiant-ad-quality.bidders-to-exclude-from-scan}")
+            List<String> biddersToExcludeFromScan,
             RedisConfig redisConfig,
             RedisRetryConfig retryConfig,
             Vertx vertx,
@@ -43,13 +44,24 @@ ConfiantAdQualityModule confiantAdQualityModule(
 
         final RedisConnectionConfig writeNodeConfig = redisConfig.getWriteNode();
         final RedisClient writeRedisNode = new RedisClient(
-                vertx, writeNodeConfig.getHost(), writeNodeConfig.getPort(), writeNodeConfig.getPassword(), retryConfig, "write node");
+                vertx,
+                writeNodeConfig.getHost(),
+                writeNodeConfig.getPort(),
+                writeNodeConfig.getPassword(),
+                retryConfig,
+                "write node");
         final RedisConnectionConfig readNodeConfig = redisConfig.getReadNode();
         final RedisClient readRedisNode = new RedisClient(
-                vertx, readNodeConfig.getHost(), readNodeConfig.getPort(), readNodeConfig.getPassword(), retryConfig, "read node");
+                vertx,
+                readNodeConfig.getHost(),
+                readNodeConfig.getPort(),
+                readNodeConfig.getPassword(),
+                retryConfig,
+                "read node");
 
         final BidsScanner bidsScanner = new BidsScanner(writeRedisNode, readRedisNode, apiKey, objectMapper);
-        final RedisScanStateChecker redisScanStateChecker = new RedisScanStateChecker(bidsScanner, scanStateCheckInterval, vertx);
+        final RedisScanStateChecker redisScanStateChecker = new RedisScanStateChecker(
+                bidsScanner, scanStateCheckInterval, vertx);
 
         final Promise<Void> scannerPromise = Promise.promise();
         scannerPromise.future().onComplete(r -> redisScanStateChecker.run());

extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/config/ConfiantAdQualityModuleConfiguration.java

@@ -24,14 +24,20 @@ public class AnalyticsMapper {
     private static final String INSPECTED_HAS_ISSUE = "inspected-has-issue";
     private static final String INSPECTED_NO_ISSUES = "inspected-no-issues";
 
+    private AnalyticsMapper() {
+    }
+
     public static Tags toAnalyticsTags(List<BidderResponse> bidderResponsesWithIssues,
                                        List<BidderResponse> bidderResponsesWithoutIssues,
                                        List<BidderResponse> bidderResponsesNotScanned) {
 
         return TagsImpl.of(Collections.singletonList(ActivityImpl.of(
                 AD_QUALITY_SCAN,
                 SUCCESS_STATUS,
-                toActivityResults(bidderResponsesWithIssues, bidderResponsesWithoutIssues, bidderResponsesNotScanned))));
+                toActivityResults(
+                        bidderResponsesWithIssues,
+                        bidderResponsesWithoutIssues,
+                        bidderResponsesNotScanned))));
     }
 
     private static List<Result> toActivityResults(List<BidderResponse> bidderResponsesWithIssues,

extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/AnalyticsMapper.java

@@ -13,30 +13,32 @@
 
 public class BidsMapper {
 
-    public static RedisBidsData toRedisBidsFromBidResponses(
-            BidRequest bidRequest,
-            List<BidderResponse> bidderResponses) {
+    private BidsMapper() {
+    }
+
+    public static RedisBidsData toRedisBidsFromBidResponses(BidRequest bidRequest,
+                                                            List<BidderResponse> bidderResponses) {
 
-        final List<RedisBidResponseData> confiantBidResponses = bidderResponses
-                .stream().map(bidResponse -> RedisBidResponseData
+        final List<RedisBidResponseData> confiantBidResponses = bidderResponses.stream()
+                .map(bidResponse -> RedisBidResponseData
                         .builder()
                         .dspId(bidResponse.getBidder())
                         .bidresponse(toBidResponseFromBidderResponse(bidRequest, bidResponse))
-                        .build()).toList();
+                        .build())
+                .toList();
 
         return RedisBidsData.builder()
                 .breq(bidRequest)
                 .bresps(confiantBidResponses)
                 .build();
     }
 
-    private static BidResponse toBidResponseFromBidderResponse(
-            BidRequest bidRequest,
-            BidderResponse bidderResponse) {
+    private static BidResponse toBidResponseFromBidderResponse(BidRequest bidRequest,
+                                                               BidderResponse bidderResponse) {
 
         return BidResponse.builder()
                 .id(bidRequest.getId())
-                .cur(bidRequest.getCur().get(0))
+                .cur(bidRequest.getCur().getFirst())
                 .seatbid(Collections.singletonList(SeatBid.builder()
                         .bid(bidderResponse.getSeatBid().getBids().stream().map(BidderBid::getBid).toList())
                         .build()))