Merge pull request #28324 from guardian/cloudwatch-aws-sdk-v2

Upgrade to Cloudwatch AWS SDK v2

Author: ioannakok

admin/app/model/AdminLifecycle.scala

@@ -1,20 +1,17 @@
 package model
 
 import java.util.TimeZone
-import java.nio.file.Files.deleteIfExists
-
 import app.LifecycleComponent
 import common._
 import conf.Configuration
 import conf.switches.Switches._
 import _root_.jobs._
 import play.api.inject.ApplicationLifecycle
 import services.EmailService
-import tools.{AssetMetricsCache, CloudWatch, LoadBalancer}
+import tools.{CloudWatch, LoadBalancer}
 
 import scala.concurrent.duration._
 import scala.concurrent.{ExecutionContext, Future}
-import conf.AdminConfiguration
 
 class AdminLifecycle(
     appLifecycle: ApplicationLifecycle,
@@ -30,7 +27,7 @@ class AdminLifecycle(
   appLifecycle.addStopHook { () =>
     Future {
       descheduleJobs()
-      CloudWatch.shutdown()
+      CloudWatch.close()
       emailService.shutdown()
     }
   }
@@ -87,11 +84,6 @@ class AdminLifecycle(
       log.info("Starting ExpiringSwitchesAfternoonEmailJob")
       ExpiringSwitchesEmailJob(emailService).runReminder()
     }
-
-    jobs.scheduleEveryNMinutes("AssetMetricsCache", 60 * 6) {
-      AssetMetricsCache.run()
-    }
-
   }
 
   private def descheduleJobs(): Unit = {
@@ -114,7 +106,6 @@ class AdminLifecycle(
 
     pekkoAsync.after1s {
       rebuildIndexJob.run()
-      AssetMetricsCache.run()
       LoadBalancer.refresh()
     }
   }

admin/app/model/abtests/AbTestJob.scala

@@ -14,8 +14,10 @@ object AbTestJob extends GuLogging {
 
     CloudWatch.AbMetricNames() map { result =>
       // Group variant names by test name
-      val tests = result.getMetrics.asScala
-        .map(_.getMetricName.split("-").toList)
+      val tests = result
+        .metrics()
+        .asScala
+        .map(_.metricName().split("-").toList)
         .collect { case test :: variant =>
           (test, variant.mkString("-"))
         }

admin/app/model/abtests/AbTests.scala

@@ -1,44 +1,11 @@
 package model.abtests
 
-import tools.{ABDataChart, ChartFormat, CloudWatch}
-import com.amazonaws.services.cloudwatch.model.GetMetricStatisticsRequest
-import org.joda.time.DateTime
-
-import scala.concurrent.{ExecutionContext, Future}
-import awswrappers.cloudwatch._
 import common.Box
 
 object AbTests {
   private val abTests = Box[Map[String, Seq[String]]](Map.empty)
 
-  def getTests(): Map[String, Seq[String]] = {
-    abTests.get()
-  }
-
   def update(testVariants: Map[String, Seq[String]]): Unit = {
     abTests.send(testVariants)
   }
-
-  case class AbChart(testId: String, variants: Seq[String])
-
-  def getAbCharts()(implicit executionContext: ExecutionContext): Future[Seq[ABDataChart]] = {
-    Future.traverse(getTests().keys.toSeq) { abTest =>
-      val variants: Seq[String] = getTests()(abTest)
-
-      for {
-        cloudWatchResults <- Future.traverse(variants) { variant =>
-          CloudWatch.euWestClient.getMetricStatisticsFuture(
-            new GetMetricStatisticsRequest()
-              .withStartTime(new DateTime().minusHours(6).toDate)
-              .withEndTime(new DateTime().toDate)
-              .withPeriod(360)
-              .withStatistics("Average")
-              .withNamespace("AbTests")
-              .withMetricName(s"$abTest-$variant")
-              .withDimensions(CloudWatch.stage),
-          )
-        }
-      } yield new ABDataChart(abTest, Seq("Time") ++ variants, ChartFormat.MultiLine, cloudWatchResults: _*)
-    }
-  }
 }

admin/app/services/CloudWatchStats.scala

@@ -1,37 +1,39 @@
 package tools
 
-import awswrappers.cloudwatch._
-import com.amazonaws.services.cloudwatch.{
-  AmazonCloudWatchAsync,
-  AmazonCloudWatchAsyncClient,
-  AmazonCloudWatchAsyncClientBuilder,
-}
-import com.amazonaws.services.cloudwatch.model._
 import common.GuLogging
-import conf.Configuration
 import conf.Configuration._
+import software.amazon.awssdk.regions.Region
+import software.amazon.awssdk.services.cloudwatch.{CloudWatchAsyncClient, CloudWatchAsyncClientBuilder}
+import software.amazon.awssdk.services.cloudwatch.model.{
+  Dimension,
+  DimensionFilter,
+  ListMetricsRequest,
+  ListMetricsResponse,
+}
+import utils.AWSv2
+import scala.jdk.FutureConverters._
 
 import scala.concurrent.{ExecutionContext, Future}
 
 object CloudWatch extends GuLogging {
-  def shutdown(): Unit = {
-    euWestClient.shutdown()
-    defaultClient.shutdown()
+
+  def close(): Unit = {
+    euWestClient.close()
+    defaultClient.close()
   }
 
-  val stage = new Dimension().withName("Stage").withValue(environment.stage)
-  val stageFilter = new DimensionFilter().withName("Stage").withValue(environment.stage)
+  val stage = Dimension.builder().name("Stage").value(environment.stage).build()
+  val stageFilter = DimensionFilter.builder().name("Stage").value(environment.stage).build()
 
-  lazy val defaultClientBuilder: AmazonCloudWatchAsyncClientBuilder = AmazonCloudWatchAsyncClient
-    .asyncBuilder()
-    .withCredentials(Configuration.aws.mandatoryCredentials)
+  lazy val defaultClientBuilder: CloudWatchAsyncClientBuilder =
+    CloudWatchAsyncClient.builder().credentialsProvider(AWSv2.credentials)
 
-  lazy val euWestClient: AmazonCloudWatchAsync = defaultClientBuilder
-    .withRegion(conf.Configuration.aws.region)
+  lazy val euWestClient: CloudWatchAsyncClient = defaultClientBuilder
+    .region(Region.of(conf.Configuration.aws.region))
     .build()
 
   // some metrics are only available in the 'default' region
-  lazy val defaultClient: AmazonCloudWatchAsync = defaultClientBuilder.build()
+  lazy val defaultClient: CloudWatchAsyncClient = defaultClientBuilder.build()
 
   val v1LoadBalancerNamespace = "AWS/ELB"
   val v2LoadBalancerNamespace = "AWS/ApplicationELB"
@@ -63,13 +65,17 @@ object CloudWatch extends GuLogging {
     future
   }
 
-  def AbMetricNames()(implicit executionContext: ExecutionContext): Future[ListMetricsResult] = {
+  def AbMetricNames()(implicit executionContext: ExecutionContext): Future[ListMetricsResponse] = {
     withErrorLogging(
-      euWestClient.listMetricsFuture(
-        new ListMetricsRequest()
-          .withNamespace("AbTests")
-          .withDimensions(stageFilter),
-      ),
+      euWestClient
+        .listMetrics(
+          ListMetricsRequest
+            .builder()
+            .namespace("AbTests")
+            .dimensions(stageFilter)
+            .build(),
+        )
+        .asScala,
     )
   }
 }