Merge pull request #28323 from guardian/delete-more-unused-code

Delete more unused / non-working code

Author: ioannakok

admin/app/AppLoader.scala

@@ -39,7 +39,6 @@ trait AdminServices extends I18nComponents {
   lazy val emailService = wire[EmailService]
   lazy val redirects = wire[RedirectService]
   lazy val r2PagePressJob = wire[R2PagePressJob]
-  lazy val analyticsSanityCheckJob = wire[AnalyticsSanityCheckJob]
   lazy val rebuildIndexJob = wire[RebuildIndexJob]
 
   lazy val blockingOperations: BlockingOperations = wire[BlockingOperations]

admin/app/jobs/AnalyticsSanityCheckJob.scala

@@ -22,7 +22,6 @@ class AdminLifecycle(
     pekkoAsync: PekkoAsync,
     emailService: EmailService,
     r2PagePressJob: R2PagePressJob,
-    analyticsSanityCheckJob: AnalyticsSanityCheckJob,
     rebuildIndexJob: RebuildIndexJob,
 )(implicit ec: ExecutionContext)
     extends LifecycleComponent
@@ -33,7 +32,6 @@ class AdminLifecycle(
       descheduleJobs()
       CloudWatch.shutdown()
       emailService.shutdown()
-      // deleteTmpFiles()
     }
   }
 
@@ -59,11 +57,6 @@ class AdminLifecycle(
       r2PagePressJob.run()
     }
 
-    // every 2, 17, 32, 47 minutes past the hour, on the 12th second past the minute (e.g 13:02:12, 13:17:12)
-    jobs.schedule("AnalyticsSanityCheckJob", "12 2/15 * * * ?") {
-      analyticsSanityCheckJob.run()
-    }
-
     jobs.scheduleEveryNMinutes("FrontPressJobHighFrequency", adminPressJobHighPushRateInMinutes) {
       if (FrontPressJobSwitch.isSwitchedOn) RefreshFrontsJob.runFrequency(pekkoAsync)(HighFrequency)
       Future.successful(())

admin/app/model/AdminLifecycle.scala

@@ -14,7 +14,7 @@ import play.api.http.{HttpErrorHandler, HttpRequestHandler}
 import play.api.libs.ws.WSClient
 import play.api.mvc.EssentialFilter
 import play.api.routing.Router
-import services.{ArchiveMetrics, RedirectService}
+import services.RedirectService
 import router.Routes
 
 class AppLoader extends FrontendApplicationLoader {
@@ -33,7 +33,6 @@ trait AppComponents extends FrontendComponents {
 
   override lazy val lifecycleComponents = List(
     wire[CloudWatchMetricsLifecycle],
-    wire[ArchiveMetrics],
     wire[SwitchboardLifecycle],
     wire[CachedHealthCheckLifeCycle],
   )

archive/app/AppLoader.scala

@@ -4,7 +4,7 @@ import commercial.campaigns.ShortCampaignCodes
 import common._
 import model.Cached.{CacheableResult, WithoutRevalidationResult}
 import play.api.mvc._
-import services.{GoogleBotMetric, RedirectService}
+import services.RedirectService
 import java.net.URLDecoder
 import javax.ws.rs.core.UriBuilder
 

archive/app/controllers/ArchiveController.scala

@@ -50,18 +50,6 @@ object SystemMetrics extends implicits.Numbers {
     get = () => bytesAsMb(ManagementFactory.getMemoryMXBean.getHeapMemoryUsage.getUsed),
   )
 
-  val MaxNonHeapMemoryMetric = GaugeMetric(
-    name = "max-non-heap-memory",
-    description = "Max non heap memory (MB)",
-    get = () => bytesAsMb(ManagementFactory.getMemoryMXBean.getNonHeapMemoryUsage.getMax),
-  )
-
-  val UsedNonHeapMemoryMetric = GaugeMetric(
-    name = "used-non-heap-memory",
-    description = "Used non heap memory (MB)",
-    get = () => bytesAsMb(ManagementFactory.getMemoryMXBean.getNonHeapMemoryUsage.getUsed),
-  )
-
   val FreeDiskSpaceMetric = GaugeMetric(
     name = "free-disk-space",
     description = "Free disk space (MB)",

archive/app/services/ArchiveMetrics.scala

@@ -42,27 +42,6 @@ final case class SimpleMetric(override val name: String, datapoint: SimpleDataPo
   override val isEmpty = false
 }
 
-// MetricUploader is a class to allow basic putting of metrics. Why does it exist? Because if we provide
-// access to cloudwatch directly, then we start to measure everything, and never remove unused metrics.
-// Also, MetricUploader will upload in batches.
-final case class MetricUploader(namespace: String) {
-
-  private val datapoints: Box[List[SimpleMetric]] = Box(List.empty)
-
-  def put(metrics: Map[String, Double]): Unit = {
-    val timedMetrics = metrics.map { case (key, value) =>
-      SimpleMetric(name = key, SimpleDataPoint(value, DateTime.now))
-    }
-    datapoints.send(_ ++ timedMetrics)
-  }
-
-  def upload(): Unit = {
-    val points = datapoints.get()
-    datapoints.alter(_.diff(points))
-    CloudWatch.putMetrics(namespace, points, List.empty)
-  }
-}
-
 case class TimingDataPoint(value: Double, time: Option[DateTime] = None) extends DataPoint
 
 final case class TimingMetric(override val name: String, description: String) extends FrontendMetric {