Merge pull request #10 from aws-solutions/release/v1.1.2

Changes for v1.1.2

Author: yq-yang-qin

.github/ISSUE_TEMPLATE/bug_report.md

@@ -25,7 +25,7 @@ To get the version of the solution, you can look at the description of the creat
     "Environment": {
       "Variables": {
         "SOLUTION_ID": "SO0248",
-        "SOLUTION_VERSION": "v1.1.1"
+        "SOLUTION_VERSION": "v1.1.2"
       }
     },
 ```
@@ -34,7 +34,7 @@ This information is also provided in `source/infrastructure/cdk.json`:
 
 ```json
     "SOLUTION_ID": "SO0248",
-    "SOLUTION_VERSION": "v1.1.1",
+    "SOLUTION_VERSION": "v1.1.2",
 ```
 
 

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.2] - 2025-05-22
+
+- Upgrade Prebid Server Java to v3.25.0
+- Upgrade Python dependencies
+- Fix anonymized metrics reporting Lambda
+
 ## [1.1.1] - 2025-03-07
 
 - Upgrade to Prebid Server v3.22 and underlying Docker base image

CONTRIBUTING.md

@@ -59,4 +59,4 @@ If you discover a potential security issue in this project we ask that you notif
 
 See the [LICENSE](https://github.com/aws-solutions/prebid-server-deployment-on-aws/blob/main/LICENSE.txt) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
 
-We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.
+We may ask you to sign a [Contributor License Agreement (CLA)](https://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.

NOTICE.txt

@@ -15,6 +15,7 @@ This software includes third party software subject to the following copyrights:
 
 alpinelinux/docker-alpine under the MIT license.
 github.com/prebid/prebid-server-java under the Apache-2.0 license.
+attrs under the MIT license.
 aws-cdk-asset-awscli-v1 under the Apache-2.0 license.
 aws-cdk-asset-kubectl-v20 under the Apache-2.0 license.
 aws-cdk-asset-node-proxy-agent-v6 under the Apache-2.0 license.

README.md

@@ -173,7 +173,7 @@ If you'd like to use a different container:
 * Build and host the solution assets for installation in your account using the process described above
 * Change to the `deployment/global-s3-assets` folder on the build workstation
 * Open the file `prebid-server-deployment-on-aws.template` in an editor
-* Find the line in the template under the Task Definition resource that is `"Image": "public.ecr.aws/aws-solutions/prebid-server:v1.1.1",`
+* Find the line in the template under the Task Definition resource that is `"Image": "public.ecr.aws/aws-solutions/prebid-server:v1.1.2",`
 * Update the Image property value with your container image URI
 * Create the stack by uploading the changed template to the CloudFormation console
 

deployment/build-s3-dist.sh

@@ -9,7 +9,7 @@
 # Paramenters:
 #  - source-bucket-base-name: Name for the S3 bucket location where the template will source the Lambda
 #    code from. The template will append '-[region_name]' to this bucket name.
-#    For example: ./build-s3-dist.sh solutions v1.1.1
+#    For example: ./build-s3-dist.sh solutions v1.1.2
 #    The template will then expect the source code to be located in the solutions-[region_name] bucket
 #
 #  - solution-name: name of the solution for consistency
@@ -21,7 +21,7 @@
 # Check to see if input has been provided:
 if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
     echo "Please provide the base source bucket name, trademark approved solution name and version where the lambda code will eventually reside."
-    echo "For example: ./build-s3-dist.sh solutions trademarked-solution-name v1.1.1"
+    echo "For example: ./build-s3-dist.sh solutions trademarked-solution-name v1.1.2"
     exit 1
 fi
 

deployment/ecr/prebid-server/.gitignore

@@ -4,3 +4,4 @@ bootstrap.log
 sample/configs/prebid-config.yaml
 .env
 nw-current-config/
+amt-bidder/

deployment/ecr/prebid-server/docker-build-config.json

@@ -1,5 +1,5 @@
 {
-  "GIT_TAG_VERSION": "3.22.0",
+  "GIT_TAG_VERSION": "3.25.0",
   "MVN_CLI_OPTIONS": "-Dmaven.test.skip"
 }
 

solution-manifest.yaml

@@ -1,6 +1,6 @@
 id: SO0248
 name: prebid-server-deployment-on-aws
-version: v1.1.1
+version: v1.1.2
 cloudformation_templates:
   - template: prebid-server-deployment-on-aws.template
     main_template: true

source/cdk_solution_helper_py/helpers_cdk/aws_solutions/cdk/scripts/build_s3_cdk_dist.py

@@ -187,7 +187,7 @@ def validate_version_code(ctx, param, value):
         return value
     else:
         raise click.BadParameter(
-            "please specifiy major, minor and patch versions, e.g. v1.1.1"
+            "please specifiy major, minor and patch versions, e.g. v1.1.2"
         )
 
 

source/infrastructure/cdk.json

@@ -30,7 +30,7 @@
         "@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy": true,
         "SOLUTION_NAME": "Prebid Server Deployment on AWS",
         "SOLUTION_ID": "SO0248",
-        "SOLUTION_VERSION": "v1.1.1",
+        "SOLUTION_VERSION": "v1.1.2",
         "METRICS_NAMESPACE": "prebid-server-deployment-on-aws-metrics",
         "BUCKET_NAME": "BUCKET_NAME"
     }

source/infrastructure/custom_resources/cloudwatch_metrics/cloudwatch_metrics_report.py

@@ -116,14 +116,16 @@ def get_generic_metrics(self, metrics_to_sum, metric_tag=""):
                     statistics=self.statistics,
                     dimensions=[{"Name": "stack-name", "Value": STACK_NAME}],
                 )
-                data["Data"].update(
-                    self.prepare_metric_data(
+                metric_data = self.prepare_metric_data(
                         response=lambda_stat_response,
                         metric_name=metric_name,
                         metric_tag=metric_tag,
                         sum_all_datapoints=False,
                     )
-                )
+                if not metric_data:
+                    raise ValueError(f"No metric data found for metric {metric_name}")
+
+                data["Data"].update(metric_data)
             except Exception as e:
                 logger.info(f"Fail to prepare metrics data for {metric_name}. Error: {e}")
                 continue
@@ -164,16 +166,19 @@ def get_cloudfront_metrics(self):
                     statistics=self.statistics,
                     dimensions=cf_cw_metric["Dimensions"],
                 )
-                data["Data"].update(
-                    self.prepare_metric_data(
-                        response=cf_response,
-                        metric_name=cf_cw_metric_name,
-                        metric_tag=metric_tag,
-                    )
+
+                metric_data = self.prepare_metric_data(
+                    response=cf_response,
+                    metric_name=cf_cw_metric_name,
+                    metric_tag=metric_tag,
                 )
+                if not metric_data:
+                    raise ValueError(f"No metric data found for metric {metric_tag}-{cf_cw_metric_name}")
+
+                data["Data"].update(metric_data)
+
                 metric = f"{metric_tag}-{cf_cw_metric_name}"
-                if not data["MetricData"].get(metric):
-                    data["MetricData"][metric] = {}
+                data["MetricData"].setdefault(metric, {})
                 data["MetricData"][metric].update(
                     {
                         "value": data["Data"][metric],
@@ -228,17 +233,18 @@ def get_nat_gateway_metrics(self):
                         statistics=self.statistics,
                         dimensions=nat_metric["Dimensions"],
                     )
-
-                    data["Data"].update(
-                        self.prepare_metric_data(
-                            response=nat_cw_stat_response,
-                            metric_name=nat_metric_name,
-                            metric_tag=metric_tag,
-                        )
+                    metric_data = self.prepare_metric_data(
+                        response=nat_cw_stat_response,
+                        metric_name=nat_metric_name,
+                        metric_tag=metric_tag,
                     )
+                    if not metric_data:
+                        raise ValueError(f"No metric data found for metric {metric_tag}-{nat_metric_name}")
+
+                    data["Data"].update(metric_data)
+
                     metric = f"{metric_tag}-{nat_metric_name}"
-                    if not data["MetricData"].get(metric):
-                        data["MetricData"][metric] = {}
+                    data["MetricData"].setdefault(metric, {})
                     data["MetricData"][metric].update(
                         {
                             "value": data["Data"][metric],
@@ -272,16 +278,18 @@ def get_application_elb_metrics(self):
                     statistics=["SampleCount", "Average", *self.statistics],
                     dimensions=elb_metric["Dimensions"],
                 )
-                data["Data"].update(
-                    self.prepare_metric_data(
-                        response=elb_stat_response,
-                        metric_name=elb_metric_name,
-                        metric_tag=metric_tag,
-                    )
+                metric_data = self.prepare_metric_data(
+                    response=elb_stat_response,
+                    metric_name=elb_metric_name,
+                    metric_tag=metric_tag,
                 )
+                if not metric_data:
+                    raise ValueError(f"No metric data found for metric {metric_tag}-{elb_metric_name}")
+
+                data["Data"].update(metric_data)
+
                 metric = f"{metric_tag}-{elb_metric_name}"
-                if not data["MetricData"].get(metric):
-                    data["MetricData"][metric] = {}
+                data["MetricData"].setdefault(metric, {})
                 data["MetricData"][metric].update(
                     {
                         "value": data["Data"][metric],
@@ -333,25 +341,29 @@ def get_metrics_report(self):
 
     def put_metric_data(self, metric_data):
         for metric_name, metric_data_value in metric_data.items():
-            self.cloudwatch_client.put_metric_data(
-                Namespace=METRICS_NAMESPACE,
-                MetricData=[
-                    {
-                        "MetricName": metric_name,
-                        "Dimensions": metric_data_value["dimensions"],
-                        "Unit": metric_data_value["datapoints"]["Unit"],
-                        "Timestamp": metric_data_value["datapoints"]["Timestamp"],
-                        "StatisticValues": {
-                            "SampleCount": metric_data_value["datapoints"][
-                                "SampleCount"
-                            ],
-                            "Sum": metric_data_value["datapoints"]["Sum"],
-                            "Minimum": metric_data_value["datapoints"]["Minimum"],
-                            "Maximum": metric_data_value["datapoints"]["Maximum"],
-                        },
-                    }
-                ],
-            )
+            try:
+                self.cloudwatch_client.put_metric_data(
+                    Namespace=METRICS_NAMESPACE,
+                    MetricData=[
+                        {
+                            "MetricName": metric_name,
+                            "Dimensions": metric_data_value["dimensions"],
+                            "Unit": metric_data_value["datapoints"]["Unit"],
+                            "Timestamp": metric_data_value["datapoints"]["Timestamp"],
+                            "StatisticValues": {
+                                "SampleCount": metric_data_value["datapoints"][
+                                    "SampleCount"
+                                ],
+                                "Sum": metric_data_value["datapoints"]["Sum"],
+                                "Minimum": metric_data_value["datapoints"]["Minimum"],
+                                "Maximum": metric_data_value["datapoints"]["Maximum"],
+                            },
+                        }
+                    ],
+                )
+            except Exception as e:
+                logger.info(f"Fail to put metric data on CloudWatch for {metric_name}. Error: {e}")
+                continue
 
 
 def event_handler(event, context):

source/infrastructure/prebid_server/container_image_construct.py

@@ -10,7 +10,7 @@
 
 from .docker_configs_construct import DockerConfigsManager
 
-logging.basicConfig()
+logging.basicConfig() # NOSONAR
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 

source/infrastructure/prebid_server/efs_cleanup_lambda/container_stop_logs.py

@@ -59,7 +59,7 @@ def compress_log_file(log_folder_path: Path, log_file_name: str):
         / f"{log_file_name.split('.')[0]}.{utc_time.year}-{utc_time.month:02d}-{utc_time.day:02d}_{utc_time.hour:02d}.log.gz"
     )
 
-    with tarfile.open(file_to_compress, "w:gz") as tar:
+    with tarfile.open(file_to_compress, "w:gz") as tar: # NOSONAR
         tar.add(log_file_path)
 
     logger.info(f"Log file compressed: {file_to_compress}")

source/infrastructure/prebid_server/stack_constants.py

@@ -9,7 +9,7 @@
 
 PVT_SUBNET_NAME = "Prebid-Private"
 PUB_SUBNET_NAME = "Prebid-Public"
-VPC_CIDR = "10.8.0.0/16"
+VPC_CIDR = "10.8.0.0/16" # NOSONAR
 CIDR_MASK = 20
 MAX_AZS = 2
 NAT_GATEWAYS = 2