Merge pull request #303 from PradyumnaNagendra/release-2.10-fix

TG-181 feat: Enabled logging of search request body

platform-core/platform-telemetry/src/main/java/org/sunbird/telemetry/logger/TelemetryManager.java

@@ -226,4 +226,10 @@ public class TelemetryManager {
 		// TODO: refactor this.
 		return defaultValue;
 	}
+
+	public static void logRequestBody(String message) {
+		Map<String, String> context = getContext();
+		String event = TelemetryGenerator.log(context, "system", Level.INFO.name(), message, null, null);
+		telemetryHandler.send(event, Level.INFO, true);
+	}
 }

search-api/search-service/app/controllers/SearchController.scala

@@ -3,17 +3,18 @@ package controllers
 import akka.actor.{ActorRef, ActorSystem}
 import com.google.inject.Inject
 import com.google.inject.name.Named
+import handlers.LoggingAction
 import managers.SearchManager
 import play.api.mvc.ControllerComponents
 import utils.{ActorNames, ApiId}
 
 import scala.concurrent.ExecutionContext
 
-class SearchController @Inject()(@Named(ActorNames.SEARCH_ACTOR) searchActor: ActorRef, cc: ControllerComponents, actorSystem: ActorSystem)(implicit exec: ExecutionContext) extends SearchBaseController(cc) {
+class SearchController @Inject()(@Named(ActorNames.SEARCH_ACTOR) searchActor: ActorRef, loggingAction: LoggingAction, cc: ControllerComponents, actorSystem: ActorSystem)(implicit exec: ExecutionContext) extends SearchBaseController(cc) {
 
     val mgr: SearchManager = new SearchManager()
 
-    def search() = Action.async { implicit request =>
+    def search() = loggingAction.async { implicit request =>
         val internalReq = getRequest(ApiId.APPLICATION_SEARCH)
         setHeaderContext(internalReq)
         getResult(mgr.search(internalReq, searchActor), ApiId.APPLICATION_SEARCH)

search-api/search-service/app/handlers/LoggingAction.scala

+package handlers
+
+import com.google.inject.Inject
+import org.sunbird.common.{JsonUtils, Platform}
+import org.sunbird.telemetry.logger.TelemetryManager
+import play.api.Logging
+import play.api.mvc._
+
+import scala.concurrent.{ExecutionContext, Future}
+
+class LoggingAction @Inject() (parser: BodyParsers.Default)(implicit ec: ExecutionContext)
+        extends ActionBuilderImpl(parser)
+                with Logging {
+    val logEnabled = (Platform.config.hasPath("search.payload.log_enable") && Platform.config.getBoolean("search.payload.log_enable"))
+
+    override def invokeBlock[A](request: play.api.mvc.Request[A], block: (Request[A]) => Future[Result]) = {
+        if(logEnabled)
+            TelemetryManager.logRequestBody("Search Request : " + requestBody(request.asInstanceOf[Request[AnyContent]]))
+        block(request)
+    }
+
+    def requestBody(request: Request[AnyContent]) = {
+        val body = request.body.asJson.getOrElse("{}").toString
+        JsonUtils.deserialize(body, classOf[java.util.Map[String, Object]])
+    }
+}

search-api/search-service/conf/application.conf

@@ -311,4 +311,5 @@ channel.default="in.ekstep"
 ekstepPlatformApiUserId="search-service"
 
 content.tagging.backward_enable=true
-content.tagging.property=["subject","medium"]
\ No newline at end of file
+content.tagging.property=["subject","medium"]
+search.payload.log_enable=true
\ No newline at end of file