Merge branch 'main' into mob/scrollable-products

Author: oliverabrahams

.github/workflows/cicd.yml

@@ -2,9 +2,6 @@ name: DCR CICD
 
 on:
   push:
-    paths-ignore:
-      - 'ab-testing/**'
-      - '!ab-testing/config/abTests.ts'
 
 jobs:
   container:

ab-testing/cdk/lib/__snapshots__/abTestingConfig.test.ts.snap

@@ -4,6 +4,12 @@ exports[`The ID5 Baton Lambda stack > matches the CODE snapshot 1`] = `
     "gu:cdk:constructs": [],
     "gu:cdk:version": "62.0.1"
   },
+  "Parameters": {
+    "BuildId": {
+      "Type": "String",
+      "Description": "The riff-raff build id, automatically generated and provided by riff-raff"
+    }
+  },
   "Resources": {
     "InvokeDictionaryDeployLambda": {
       "Type": "Custom::FastlyEdgeDictionaryDeploy",
@@ -24,7 +30,10 @@ exports[`The ID5 Baton Lambda stack > matches the CODE snapshot 1`] = `
             ]
           ]
         },
-        "ServiceTimeout": "300"
+        "ServiceTimeout": "300",
+        "BuildId": {
+          "Ref": "BuildId"
+        }
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete"
@@ -39,6 +48,12 @@ exports[`The ID5 Baton Lambda stack > matches the PROD snapshot 1`] = `
     "gu:cdk:constructs": [],
     "gu:cdk:version": "62.0.1"
   },
+  "Parameters": {
+    "BuildId": {
+      "Type": "String",
+      "Description": "The riff-raff build id, automatically generated and provided by riff-raff"
+    }
+  },
   "Resources": {
     "InvokeDictionaryDeployLambda": {
       "Type": "Custom::FastlyEdgeDictionaryDeploy",
@@ -59,7 +74,10 @@ exports[`The ID5 Baton Lambda stack > matches the PROD snapshot 1`] = `
             ]
           ]
         },
-        "ServiceTimeout": "300"
+        "ServiceTimeout": "300",
+        "BuildId": {
+          "Ref": "BuildId"
+        }
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete"

ab-testing/cdk/lib/abTestingConfig.ts

@@ -1,7 +1,7 @@
 import type { GuStackProps } from "@guardian/cdk/lib/constructs/core/stack.js";
 import { GuStack } from "@guardian/cdk/lib/constructs/core/stack.js";
 import type { App } from "aws-cdk-lib";
-import { CustomResource, Duration } from "aws-cdk-lib";
+import { CfnParameter, CustomResource, Duration } from "aws-cdk-lib";
 import { Function } from "aws-cdk-lib/aws-lambda";
 import { lambdaFunctionName } from "./deploymentLambda.ts";
 
@@ -15,11 +15,21 @@ export class AbTestingConfig extends GuStack {
 			`${lambdaFunctionName}-${this.stage}`,
 		);
 
+		const buildId = new CfnParameter(this, "BuildId", {
+			type: "String",
+			description:
+				"The riff-raff build id, automatically generated and provided by riff-raff",
+		});
+
 		// Trigger the Lambda to run upon deployment
 		new CustomResource(this, "InvokeDictionaryDeployLambda", {
 			serviceToken: lambda.functionArn,
 			serviceTimeout: Duration.minutes(5),
 			resourceType: "Custom::FastlyEdgeDictionaryDeploy",
+			properties: {
+				/** Ensures the custom resource is invoked on every deploy */
+				BuildId: buildId.valueAsString,
+			},
 		});
 	}
 }

ab-testing/config/scripts/validation/validExpiration.test.ts

@@ -6,10 +6,10 @@ export function allExpirationsValid(tests: ABTest[]): boolean {
 		const now = new Date();
 
 		if (expires < now) {
-			throw new Error(
+			console.warn(
 				`${
 					test.name
-				} has an expiration date in the past: ${expires.toISOString()}, has it expired? If it doesn't belong to you or your team, you can set the status to OFF for now.`,
+				} has an expiration date in the past: ${expires.toISOString()}, has it expired?`,
 			);
 		}
 	});

ab-testing/config/scripts/validation/validExpiration.ts

@@ -68,8 +68,8 @@ new RenderingCDKStack(cdkApp, 'FaciaRendering-PROD', {
 	stage: 'PROD',
 	domainName: 'facia-rendering.guardianapis.com',
 	scaling: {
-		minimumInstances: 48,
-		maximumInstances: 240,
+		minimumInstances: 21,
+		maximumInstances: 210,
 		policies: {
 			step: {
 				cpu: cpuScalingSteps,

dotcom-rendering/cdk/bin/cdk.ts

@@ -34,7 +34,7 @@ describe('Enable Sentry when it passes loading conditions', () => {
 			}),
 		).toEqual(true);
 	});
-	it('does enable Sentry for 0.1% of users', () => {
+	it('does enable Sentry for 1% of users', () => {
 		expect(
 			isSentryEnabled({
 				isDev: false,
@@ -56,7 +56,7 @@ describe('Enable Sentry when it passes loading conditions', () => {
 				isDev: false,
 				enableSentryReporting: true,
 				isInBrowserVariantTest: false,
-				random: 99.9001 / 100,
+				random: 99.0001 / 100,
 			}),
 		).toEqual(true);
 		expect(

dotcom-rendering/src/client/sentryLoader/sentryLoader.test.ts

@@ -24,11 +24,11 @@ const isSentryEnabled = ({
 	if (isInBrowserVariantTest) return true;
 	// Sentry lets you configure sampleRate to reduce the volume of events sent
 	// but this filter only happens _after_ the library is loaded. The Guardian
-	// measures page views in the billions so we only want to log 0.1% of errors that
+	// measures page views in the billions so we only want to log 1% of errors that
 	// happen but if we used sampleRate to do this we'd be needlessly downloading
-	// Sentry 99.9% of the time. So instead we just do some math here and use that
+	// Sentry 99% of the time. So instead we just do some math here and use that
 	// to prevent the Sentry script from ever loading.
-	if (random <= 999 / 1000) return false;
+	if (random <= 99 / 100) return false;
 	return true;
 };