Rename common.Logging into common.GuLogging

guardian · Jan 8, 2021 · 6b1adee · 6b1adee
1 parent 3ce61a5
commit 6b1adee
Show file tree

Hide file tree

Showing 215 changed files with 384 additions and 381 deletions.
diff --git a/admin/app/controllers/AnalyticsController.scala b/admin/app/controllers/AnalyticsController.scala
@@ -1,14 +1,14 @@
 package controllers.admin
 
 import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
-import common.{ImplicitControllerExecutionContext, Logging}
+import common.{ImplicitControllerExecutionContext, GuLogging}
 import model.{ApplicationContext, NoCache}
 
 import scala.concurrent.Future
 
 class AnalyticsController(val controllerComponents: ControllerComponents)(implicit context: ApplicationContext)
     extends BaseController
-    with Logging
+    with GuLogging
     with ImplicitControllerExecutionContext {
   def abtests(): Action[AnyContent] =
     Action.async { implicit request =>

diff --git a/admin/app/controllers/AppConfigController.scala b/admin/app/controllers/AppConfigController.scala
@@ -1,6 +1,6 @@
 package controllers
 
-import common.{ImplicitControllerExecutionContext, Logging}
+import common.{ImplicitControllerExecutionContext, GuLogging}
 import model.{ApplicationContext, NoCache}
 import play.api.libs.json.Json
 import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
@@ -9,7 +9,7 @@ import services.ParameterStoreService
 class AppConfigController(val controllerComponents: ControllerComponents, parameterStoreService: ParameterStoreService)(
     implicit context: ApplicationContext,
 ) extends BaseController
-    with Logging
+    with GuLogging
     with ImplicitControllerExecutionContext {
 
   def renderAppConfig(): Action[AnyContent] =

diff --git a/admin/app/controllers/DeploysController.scala b/admin/app/controllers/DeploysController.scala
@@ -1,14 +1,14 @@
 package controllers.admin
 
-import common.{ImplicitControllerExecutionContext, Logging}
+import common.{ImplicitControllerExecutionContext, GuLogging}
 import implicits.Requests
 import model.NoCache
 import model.deploys.{ApiResults, RiffRaffService}
 import play.api.mvc._
 import model.deploys._
 import play.api.libs.ws.WSClient
 
-trait DeploysController extends BaseController with Logging with Requests with ImplicitControllerExecutionContext {
+trait DeploysController extends BaseController with GuLogging with Requests with ImplicitControllerExecutionContext {
 
   val riffRaff: RiffRaffService
 

diff --git a/admin/app/controllers/FrontPressController.scala b/admin/app/controllers/FrontPressController.scala
@@ -1,14 +1,14 @@
 package controllers
 
-import common.{AkkaAsync, ImplicitControllerExecutionContext, Logging}
+import common.{AkkaAsync, ImplicitControllerExecutionContext, GuLogging}
 import jobs.{HighFrequency, LowFrequency, RefreshFrontsJob, StandardFrequency}
 import model.ApplicationContext
 import play.api.mvc._
 
 class FrontPressController(akkaAsync: AkkaAsync, val controllerComponents: ControllerComponents)(implicit
     context: ApplicationContext,
 ) extends BaseController
-    with Logging
+    with GuLogging
     with ImplicitControllerExecutionContext {
 
   def press(): Action[AnyContent] =

diff --git a/admin/app/controllers/R2PressController.scala b/admin/app/controllers/R2PressController.scala
@@ -3,7 +3,7 @@ package controllers.admin
 import java.io.File
 import java.net.URL
 
-import common.{AkkaAsync, ImplicitControllerExecutionContext, Logging}
+import common.{AkkaAsync, ImplicitControllerExecutionContext, GuLogging}
 import model.{ApplicationContext, R2PressMessage}
 import play.api.mvc._
 import services.{R2PagePressNotifier, R2PressedPageTakedownNotifier, RedirectService}
@@ -15,7 +15,7 @@ class R2PressController(
     val controllerComponents: ControllerComponents,
 )(implicit context: ApplicationContext)
     extends BaseController
-    with Logging
+    with GuLogging
     with ImplicitControllerExecutionContext {
 
   def pressForm(urlMsgs: List[String] = List.empty, fileMsgs: List[String] = List.empty): Action[AnyContent] =

diff --git a/admin/app/controllers/RedirectController.scala b/admin/app/controllers/RedirectController.scala
@@ -3,7 +3,7 @@ package controllers.admin
 import java.io.File
 
 import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
-import common.Logging
+import common.GuLogging
 import model.ApplicationContext
 import play.api.data._
 import play.api.data.Forms._
@@ -18,7 +18,7 @@ class RedirectController(
     val controllerComponents: ControllerComponents,
 )(implicit context: ApplicationContext)
     extends BaseController
-    with Logging {
+    with GuLogging {
 
   val redirectForm = Form(mapping("from" -> text, "to" -> text)(PageRedirect.apply)(PageRedirect.unapply))
 

diff --git a/admin/app/controllers/SportTroubleshooterController.scala b/admin/app/controllers/SportTroubleshooterController.scala
@@ -1,13 +1,13 @@
 package controllers.admin
 
 import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
-import common.Logging
+import common.GuLogging
 import model.{ApplicationContext, NoCache}
 
 class SportTroubleshooterController(val controllerComponents: ControllerComponents)(implicit
     context: ApplicationContext,
 ) extends BaseController
-    with Logging {
+    with GuLogging {
 
   def renderFootballTroubleshooter(): Action[AnyContent] =
     Action { implicit request =>

diff --git a/admin/app/controllers/SwitchboardController.scala b/admin/app/controllers/SwitchboardController.scala
@@ -13,7 +13,7 @@ import model.{ApplicationContext, NoCache}
 class SwitchboardController(akkaAsync: AkkaAsync, val controllerComponents: ControllerComponents)(implicit
     context: ApplicationContext,
 ) extends BaseController
-    with Logging
+    with GuLogging
     with ImplicitControllerExecutionContext {
 
   val SwitchPattern = """([a-z\d-]+)=(on|off)""".r

diff --git a/admin/app/controllers/TroubleshooterController.scala b/admin/app/controllers/TroubleshooterController.scala
@@ -2,7 +2,7 @@ package controllers.admin
 
 import contentapi.{CapiHttpClient, ContentApiClient, PreviewContentApi, PreviewSigner}
 import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
-import common.{ImplicitControllerExecutionContext, Logging}
+import common.{ImplicitControllerExecutionContext, GuLogging}
 import model.{ApplicationContext, NoCache}
 import play.api.libs.ws.WSClient
 import tools.LoadBalancer
@@ -29,7 +29,7 @@ object TestFailed {
 class TroubleshooterController(wsClient: WSClient, val controllerComponents: ControllerComponents)(implicit
     appContext: ApplicationContext,
 ) extends BaseController
-    with Logging
+    with GuLogging
     with ImplicitControllerExecutionContext {
 
   private val capiLiveHttpClient = new CapiHttpClient(wsClient)

diff --git a/admin/app/controllers/admin/AnalyticsConfidenceController.scala b/admin/app/controllers/admin/AnalyticsConfidenceController.scala
@@ -1,14 +1,14 @@
 package controllers.admin
 
-import common.{ImplicitControllerExecutionContext, Logging}
+import common.{ImplicitControllerExecutionContext, GuLogging}
 import model.ApplicationContext
 import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
 import tools._
 
 class AnalyticsConfidenceController(val controllerComponents: ControllerComponents)(implicit
     context: ApplicationContext,
 ) extends BaseController
-    with Logging
+    with GuLogging
     with ImplicitControllerExecutionContext {
   def renderConfidence(): Action[AnyContent] =
     Action.async { implicit request =>

diff --git a/admin/app/controllers/admin/CommercialController.scala b/admin/app/controllers/admin/CommercialController.scala
@@ -1,7 +1,7 @@
 package controllers.admin
 
 import common.dfp.{GuCreativeTemplate, GuCustomField, GuLineItem}
-import common.{ImplicitControllerExecutionContext, JsonComponent, Logging}
+import common.{ImplicitControllerExecutionContext, JsonComponent, GuLogging}
 import conf.Configuration
 import dfp.{AdvertiserAgent, CreativeTemplateAgent, CustomFieldAgent, DfpApi, DfpDataExtractor, OrderAgent}
 import model._
@@ -34,7 +34,7 @@ class CommercialController(
     dfpApi: DfpApi,
 )(implicit context: ApplicationContext)
     extends BaseController
-    with Logging
+    with GuLogging
     with ImplicitControllerExecutionContext {
 
   def renderCommercialMenu(): Action[AnyContent] =

diff --git a/admin/app/controllers/admin/ReaderRevenueAdminController.scala b/admin/app/controllers/admin/ReaderRevenueAdminController.scala
@@ -1,7 +1,7 @@
 package controllers.admin
 
 import com.gu.googleauth.UserIdentity
-import common.{ImplicitControllerExecutionContext, Logging}
+import common.{ImplicitControllerExecutionContext, GuLogging}
 import model.{ApplicationContext, NoCache}
 import model.readerRevenue._
 import org.joda.time.DateTime
@@ -17,7 +17,7 @@ import scala.concurrent.Future
 class ReaderRevenueAdminController(wsClient: WSClient, val controllerComponents: ControllerComponents)(implicit
     context: ApplicationContext,
 ) extends BaseController
-    with Logging
+    with GuLogging
     with ImplicitControllerExecutionContext {
 
   def renderReaderRevenueMenu(): Action[AnyContent] =

diff --git a/admin/app/controllers/admin/commercial/AdsDotTextEditController.scala b/admin/app/controllers/admin/commercial/AdsDotTextEditController.scala
@@ -1,6 +1,6 @@
 package controllers.admin.commercial
 
-import common.Logging
+import common.GuLogging
 import model.{ApplicationContext, NoCache}
 import play.api.data.Form
 import play.api.data.Forms._
@@ -22,7 +22,7 @@ object AdsTextSellers {
 class AdsDotTextEditController(val controllerComponents: ControllerComponents)(implicit context: ApplicationContext)
     extends BaseController
     with I18nSupport
-    with Logging {
+    with GuLogging {
 
   final private def renderDotText(name: String, s3DotTextKey: String, saveRoute: Call): Action[AnyContent] =
     Action { implicit request =>

diff --git a/admin/app/controllers/admin/commercial/TeamKPIController.scala b/admin/app/controllers/admin/commercial/TeamKPIController.scala
@@ -2,7 +2,7 @@ package controllers.admin.commercial
 
 import java.time.LocalDate
 
-import common.Logging
+import common.GuLogging
 import jobs.CommercialDfpReporting
 import model.{ApplicationContext, NoCache}
 import play.api.i18n.I18nSupport
@@ -13,7 +13,7 @@ import tools.{Chart, ChartFormat, ChartRow}
 class TeamKPIController(val controllerComponents: ControllerComponents)(implicit context: ApplicationContext)
     extends BaseController
     with I18nSupport
-    with Logging {
+    with GuLogging {
 
   def renderPrebidDashboard(): Action[AnyContent] =
     Action { implicit request =>

diff --git a/admin/app/controllers/cache/ImageDecacheController.scala b/admin/app/controllers/cache/ImageDecacheController.scala
@@ -4,7 +4,7 @@ import java.net.URI
 import java.util.UUID
 
 import com.gu.googleauth.UserIdentity
-import common.{ImplicitControllerExecutionContext, Logging}
+import common.{ImplicitControllerExecutionContext, GuLogging}
 import controllers.admin.AdminAuthController
 import model.{ApplicationContext, NoCache}
 import play.api.libs.ws.{WSClient, WSResponse}
@@ -19,7 +19,7 @@ class ImageDecacheController(
     val controllerComponents: ControllerComponents,
 )(implicit context: ApplicationContext)
     extends BaseController
-    with Logging
+    with GuLogging
     with ImplicitControllerExecutionContext
     with AdminAuthController {
   import ImageDecacheController._

diff --git a/admin/app/controllers/cache/PageDecacheController.scala b/admin/app/controllers/cache/PageDecacheController.scala
@@ -3,7 +3,7 @@ package controllers.cache
 import java.net.URI
 
 import com.gu.googleauth.UserIdentity
-import common.{ImplicitControllerExecutionContext, Logging}
+import common.{ImplicitControllerExecutionContext, GuLogging}
 import controllers.admin.AdminAuthController
 import model.{ApplicationContext, NoCache}
 import org.apache.commons.codec.digest.DigestUtils
@@ -20,7 +20,7 @@ case class PrePurgeTestResult(url: String, passed: Boolean)
 class PageDecacheController(wsClient: WSClient, val controllerComponents: ControllerComponents)(implicit
     context: ApplicationContext,
 ) extends BaseController
-    with Logging
+    with GuLogging
     with ImplicitControllerExecutionContext
     with AdminAuthController {
 

diff --git a/admin/app/controllers/metrics/FastlyController.scala b/admin/app/controllers/metrics/FastlyController.scala
@@ -1,13 +1,13 @@
 package controllers.admin
 
-import common.{ImplicitControllerExecutionContext, Logging}
+import common.{ImplicitControllerExecutionContext, GuLogging}
 import model.ApplicationContext
 import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
 import tools.CloudWatch
 
 class FastlyController(val controllerComponents: ControllerComponents)(implicit context: ApplicationContext)
     extends BaseController
-    with Logging
+    with GuLogging
     with ImplicitControllerExecutionContext {
   def renderFastly(): Action[AnyContent] =
     Action.async { implicit request =>

diff --git a/admin/app/controllers/metrics/MetricsController.scala b/admin/app/controllers/metrics/MetricsController.scala
@@ -1,6 +1,6 @@
 package controllers.admin
 
-import common.{ImplicitControllerExecutionContext, Logging}
+import common.{ImplicitControllerExecutionContext, GuLogging}
 import play.api.libs.ws.WSClient
 import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
 import tools._
@@ -12,7 +12,7 @@ class MetricsController(
     val controllerComponents: ControllerComponents,
 )(implicit context: ApplicationContext)
     extends BaseController
-    with Logging
+    with GuLogging
     with ImplicitControllerExecutionContext {
   // We only do PROD metrics
 

diff --git a/admin/app/dfp/ApiHelper.scala b/admin/app/dfp/ApiHelper.scala
@@ -1,10 +1,10 @@
 package dfp
 
 import com.google.api.ads.admanager.axis.v202011._
-import common.Logging
+import common.GuLogging
 import org.joda.time.{DateTime => JodaDateTime, DateTimeZone}
 
-private[dfp] object ApiHelper extends Logging {
+private[dfp] object ApiHelper extends GuLogging {
 
   def isPageSkin(dfpLineItem: LineItem): Boolean = {
 

diff --git a/admin/app/dfp/CustomTargetingAgent.scala b/admin/app/dfp/CustomTargetingAgent.scala
@@ -2,15 +2,15 @@ package dfp
 
 import com.google.api.ads.admanager.axis.utils.v202011.StatementBuilder
 import com.google.api.ads.admanager.axis.v202011.{CustomTargetingKey, CustomTargetingValue}
-import common.Logging
+import common.GuLogging
 import common.dfp.{GuCustomTargeting, GuCustomTargetingValue}
 import concurrent.BlockingOperations
 
 import scala.util.Try
 
 class CustomTargetingAgent(val blockingOperations: BlockingOperations)
     extends DataAgent[Long, GuCustomTargeting]
-    with Logging {
+    with GuLogging {
 
   def loadFreshData(): Try[Map[Long, GuCustomTargeting]] =
     Try {

diff --git a/admin/app/dfp/DataAgent.scala b/admin/app/dfp/DataAgent.scala
@@ -1,13 +1,13 @@
 package dfp
 
 import com.gu.Box
-import common.Logging
+import common.GuLogging
 import concurrent.BlockingOperations
 
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.{Failure, Success, Try}
 
-trait DataAgent[K, V] extends Logging with implicits.Strings {
+trait DataAgent[K, V] extends GuLogging with implicits.Strings {
 
   private val initialCache: DataCache[K, V] = DataCache(Map.empty[K, V])
   private lazy val cache = Box(initialCache)

diff --git a/admin/app/dfp/DfpAdUnitCacheJob.scala b/admin/app/dfp/DfpAdUnitCacheJob.scala
@@ -1,12 +1,12 @@
 package dfp
 
-import common.{AkkaAsync, Logging}
+import common.{AkkaAsync, GuLogging}
 import conf.Configuration
 import tools.Store
 
 import scala.concurrent.{ExecutionContext, Future}
 
-class DfpAdUnitCacher(val rootAdUnit: Any, val filename: String, dfpApi: DfpApi) extends Logging {
+class DfpAdUnitCacher(val rootAdUnit: Any, val filename: String, dfpApi: DfpApi) extends GuLogging {
 
   def run(akkaAsync: AkkaAsync)(implicit executionContext: ExecutionContext): Future[Unit] =
     Future {

diff --git a/admin/app/dfp/DfpApi.scala b/admin/app/dfp/DfpApi.scala
@@ -4,13 +4,13 @@ package dfp
 // https://developers.google.com/ad-manager/api/pqlreference
 import com.google.api.ads.admanager.axis.utils.v202011.StatementBuilder
 import com.google.api.ads.admanager.axis.v202011._
-import common.Logging
+import common.GuLogging
 import common.dfp._
 import org.joda.time.DateTime
 
 case class DfpLineItems(validItems: Seq[GuLineItem], invalidItems: Seq[GuLineItem])
 
-class DfpApi(dataMapper: DataMapper, dataValidation: DataValidation) extends Logging {
+class DfpApi(dataMapper: DataMapper, dataValidation: DataValidation) extends GuLogging {
   import dfp.DfpApi._
 
   private def readLineItems(

diff --git a/admin/app/dfp/DfpDataCacheJob.scala b/admin/app/dfp/DfpDataCacheJob.scala
@@ -1,7 +1,7 @@
 package dfp
 
 import common.dfp._
-import common.Logging
+import common.GuLogging
 import org.joda.time.DateTime
 import play.api.libs.json.Json.{toJson, _}
 import tools.Store
@@ -14,7 +14,7 @@ class DfpDataCacheJob(
     customTargetingAgent: CustomTargetingAgent,
     placementAgent: PlacementAgent,
     dfpApi: DfpApi,
-) extends Logging {
+) extends GuLogging {
 
   case class LineItemLoadSummary(validLineItems: Seq[GuLineItem], invalidLineItems: Seq[GuLineItem])