Merge pull request #27403 from guardian/remove-kinesis-logback-appender

Use devx-logs
guardian · Aug 23, 2024 · 47d28f9 · 47d28f9
2 parents 1673651 + f281430
commit 47d28f9
Show file tree

Hide file tree

Showing 34 changed files with 135 additions and 271 deletions.
diff --git a/admin/app/AppLoader.scala b/admin/app/AppLoader.scala
@@ -1,6 +1,5 @@
 import app.{FrontendApplicationLoader, FrontendComponents, LifecycleComponent}
 import com.softwaremill.macwire._
-import common.Logback.{LogbackOperationsPool, LogstashLifecycle}
 import dfp._
 import common.dfp._
 import common._
@@ -77,9 +76,7 @@ trait AppComponents extends FrontendComponents with AdminControllers with AdminS
 
   lazy val healthCheck = wire[HealthCheck]
   lazy val devAssetsController = wire[DevAssetsController]
-  lazy val logbackOperationsPool = wire[LogbackOperationsPool]
   override lazy val lifecycleComponents: List[LifecycleComponent] = List(
-    wire[LogstashLifecycle],
     wire[AdminLifecycle],
     wire[ConfigAgentLifecycle],
     wire[SwitchboardLifecycle],

diff --git a/admin/conf/logback.xml b/admin/conf/logback.xml
@@ -15,13 +15,22 @@
         </encoder>
     </appender>
 
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder" />
+    </appender>
+
+    <appender name="ASYNCSTDOUT" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="STDOUT" />
+    </appender>
+
     <!-- DFP API logging -->
     <logger name="com.google.api.ads.dfp.lib.client.DfpServiceClient.soapXmlLogger" level="WARN"/>
     <logger name="com.google.api.client.http.HttpTransport" level="OFF"/>
     <!-- END -->
 
     <root level="INFO">
         <appender-ref ref="LOGFILE"/>
+        <appender-ref ref="ASYNCSTDOUT"/>
     </root>
 
 </configuration>
diff --git a/applications/app/AppLoader.scala b/applications/app/AppLoader.scala
@@ -5,7 +5,6 @@ import common.dfp.DfpAgentLifecycle
 import common.{ApplicationMetrics, CloudWatchMetricsLifecycle, ContentApiMetrics, DCRMetrics, EmailSubsciptionMetrics}
 import _root_.commercial.targeting.TargetingLifecycle
 import common.Assets.DiscussionExternalAssetsLifecycle
-import common.Logback.{LogbackOperationsPool, LogstashLifecycle}
 import conf.CachedHealthCheckLifeCycle
 import conf.switches.SwitchboardLifecycle
 import contentapi.{CapiHttpClient, ContentApiClient, HttpClient, SectionsLookUp, SectionsLookUpLifecycle}
@@ -51,10 +50,8 @@ trait AppComponents extends FrontendComponents with ApplicationsControllers with
   lazy val emailSignupController = wire[EmailSignupController]
   lazy val surveyPageController = wire[SurveyPageController]
   lazy val signupPageController = wire[SignupPageController]
-  lazy val logbackOperationsPool = wire[LogbackOperationsPool]
 
   override lazy val lifecycleComponents = List(
-    wire[LogstashLifecycle],
     wire[ConfigAgentLifecycle],
     wire[CloudWatchMetricsLifecycle],
     wire[DfpAgentLifecycle],

diff --git a/applications/conf/logback.xml b/applications/conf/logback.xml
@@ -15,8 +15,17 @@
         </encoder>
     </appender>
 
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder" />
+    </appender>
+
+    <appender name="ASYNCSTDOUT" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="STDOUT" />
+    </appender>
+
     <root level="INFO">
         <appender-ref ref="LOGFILE"/>
+        <appender-ref ref="ASYNCSTDOUT"/>
     </root>
 
 </configuration>
diff --git a/archive/app/AppLoader.scala b/archive/app/AppLoader.scala
@@ -3,7 +3,6 @@ import http.{CommonFilters, CorsHttpErrorHandler}
 import app.{FrontendApplicationLoader, FrontendBuildInfo, FrontendComponents}
 import com.softwaremill.macwire._
 import common._
-import common.Logback.{LogbackOperationsPool, LogstashLifecycle}
 import conf.switches.SwitchboardLifecycle
 import conf.CachedHealthCheckLifeCycle
 import controllers.{ArchiveController, HealthCheck}
@@ -31,10 +30,8 @@ trait AppComponents extends FrontendComponents {
   lazy val devAssetsController = wire[DevAssetsController]
   lazy val healthCheck = wire[HealthCheck]
   lazy val archiveController = wire[ArchiveController]
-  lazy val logbackOperationsPool = wire[LogbackOperationsPool]
 
   override lazy val lifecycleComponents = List(
-    wire[LogstashLifecycle],
     wire[CloudWatchMetricsLifecycle],
     wire[ArchiveMetrics],
     wire[SwitchboardLifecycle],

diff --git a/archive/conf/logback.xml b/archive/conf/logback.xml
@@ -15,8 +15,17 @@
         </encoder>
     </appender>
 
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder" />
+    </appender>
+
+    <appender name="ASYNCSTDOUT" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="STDOUT" />
+    </appender>
+
     <root level="INFO">
         <appender-ref ref="LOGFILE"/>
+        <appender-ref ref="ASYNCSTDOUT"/>
     </root>
 
 </configuration>
diff --git a/article/app/AppLoader.scala b/article/app/AppLoader.scala
@@ -3,7 +3,6 @@ import org.apache.pekko.actor.{ActorSystem => PekkoActorSystem}
 import app.{FrontendApplicationLoader, FrontendBuildInfo, FrontendComponents}
 import com.softwaremill.macwire._
 import common.Assets.DiscussionExternalAssetsLifecycle
-import common.Logback.{LogbackOperationsPool, LogstashLifecycle}
 import common._
 import common.dfp.DfpAgentLifecycle
 import concurrent.BlockingOperations
@@ -41,12 +40,10 @@ trait AppComponents extends FrontendComponents with ArticleControllers {
 
   lazy val healthCheck = wire[HealthCheck]
   lazy val devAssetsController = wire[DevAssetsController]
-  lazy val logbackOperationsPool = wire[LogbackOperationsPool]
 
   lazy val remoteRender = wire[renderers.DotcomRenderingService]
 
   override lazy val lifecycleComponents = List(
-    wire[LogstashLifecycle],
     wire[NewspaperBooksAndSectionsAutoRefresh],
     wire[DfpAgentLifecycle],
     wire[CloudWatchMetricsLifecycle],

diff --git a/article/conf/logback.xml b/article/conf/logback.xml
@@ -15,8 +15,17 @@
         </encoder>
     </appender>
 
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder" />
+    </appender>
+
+    <appender name="ASYNCSTDOUT" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="STDOUT" />
+    </appender>
+
     <root level="INFO">
         <appender-ref ref="LOGFILE"/>
+        <appender-ref ref="ASYNCSTDOUT"/>
     </root>
 
 </configuration>
diff --git a/build.sbt b/build.sbt
@@ -55,7 +55,6 @@ val common = library("common")
       cssParser,
       w3cSac,
       logback2, // logback2: to prevent "error: reference to logback is ambiguous;"
-      kinesisLogbackAppender,
       targetingClient,
       scanamo,
       scalaUri,

diff --git a/commercial/app/AppLoader.scala b/commercial/app/AppLoader.scala
@@ -8,7 +8,6 @@ import commercial.model.feeds.{FeedsFetcher, FeedsParser}
 import commercial.model.merchandise.jobs.{Industries, JobsAgent}
 import commercial.model.merchandise.travel.TravelOffersAgent
 import common.CloudWatchMetricsLifecycle
-import common.Logback.{LogbackOperationsPool, LogstashLifecycle}
 import common.dfp.DfpAgentLifecycle
 import conf.switches.SwitchboardLifecycle
 import conf.CachedHealthCheckLifeCycle
@@ -52,10 +51,8 @@ trait AppComponents extends FrontendComponents with CommercialControllers with C
 
   lazy val devAssetsController = wire[DevAssetsController]
   lazy val healthCheck = wire[HealthCheck]
-  lazy val logbackOperationsPool = wire[LogbackOperationsPool]
 
   override lazy val lifecycleComponents = List(
-    wire[LogstashLifecycle],
     wire[CommercialLifecycle],
     wire[DfpAgentLifecycle],
     wire[SwitchboardLifecycle],

diff --git a/commercial/conf/logback.xml b/commercial/conf/logback.xml
@@ -15,8 +15,17 @@
         </encoder>
     </appender>
 
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder" />
+    </appender>
+
+    <appender name="ASYNCSTDOUT" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="STDOUT" />
+    </appender>
+
     <root level="INFO">
         <appender-ref ref="LOGFILE"/>
+        <appender-ref ref="STDOUT"/>
     </root>
 
 </configuration>
diff --git a/common/app/common/Logback/KinesisAdapter.scala b/common/app/common/Logback/KinesisAdapter.scala
diff --git a/common/app/common/Logback/LogbackConfig.scala b/common/app/common/Logback/LogbackConfig.scala