rework logging for articles and include DCAR consideration

guardian · Oct 11, 2023 · 0753ec7 · 0753ec7
1 parent 1b8ee66
commit 0753ec7
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/article/app/controllers/ArticleController.scala b/article/app/controllers/ArticleController.scala
@@ -134,7 +134,6 @@ class ArticleController(
       case HtmlFormat | AmpFormat =>
         Future.successful(common.renderHtml(ArticleHtmlPage.html(article), article))
       case AppsFormat =>
-        log.info("[ArticleRendering] path executing in dotcom rendering for apps (DCAR)")
         remoteRenderer.getAppsArticle(
           ws,
           article,

diff --git a/article/app/services/dotcomrendering/ArticlePicker.scala b/article/app/services/dotcomrendering/ArticlePicker.scala
@@ -5,6 +5,7 @@ import implicits.Requests._
 import model.{ArticlePage, PageWithStoryPackage}
 import play.api.mvc.RequestHeader
 import utils.DotcomponentsLogger
+import implicits.AppsFormat
 
 object ArticlePageChecks {
 
@@ -65,11 +66,30 @@ object ArticlePicker {
       ("pageTones" -> pageTones)
 
     if (tier == RemoteRender) {
-      DotcomponentsLogger.logger.logRequest(s"path executing in dotcomponents", features, page.article)
+      if (request.getRequestFormat == AppsFormat)
+        DotcomponentsLogger.logger.logRequest(
+          s"[ArticleRendering] path executing in dotcom rendering for apps (DCAR)",
+          features,
+          page.article,
+        )
+      else
+        DotcomponentsLogger.logger.logRequest(
+          s"[ArticleRendering] path executing in dotcomponents",
+          features,
+          page.article,
+        )
     } else if (tier == PressedArticle) {
-      DotcomponentsLogger.logger.logRequest(s"path executing from pressed content", features, page.article)
+      DotcomponentsLogger.logger.logRequest(
+        s"[ArticleRendering] path executing from pressed content",
+        features,
+        page.article,
+      )
     } else {
-      DotcomponentsLogger.logger.logRequest(s"path executing in web", features, page.article)
+      DotcomponentsLogger.logger.logRequest(
+        s"[ArticleRendering] path executing in web (frontend)",
+        features,
+        page.article,
+      )
     }
 
     tier