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

Issue #TG-181 feat: Enabled logging of search request body

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

@@ -229,7 +229,7 @@ public class TelemetryManager {
 
 	public static void logRequestBody(String message) {
 		Map<String, String> context = getContext();
-		String event = TelemetryGenerator.log(context, "system", Level.INFO.name(), message, null, null);
+		String event = TelemetryGenerator.log(context, "payload", Level.INFO.name(), message, null, null);
 		telemetryHandler.send(event, Level.INFO, true);
 	}
 }

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

@@ -15,12 +15,11 @@ class LoggingAction @Inject() (parser: BodyParsers.Default)(implicit ec: Executi
 
     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]]))
+            TelemetryManager.logRequestBody(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]])
+        request.body.asJson.getOrElse("{}").toString
     }
 }

search-api/search-service/app/modules/SearchModule.scala

@@ -2,6 +2,7 @@ package modules
 
 import com.google.inject.AbstractModule
 import org.sunbird.actors.{HealthActor, SearchActor}
+import org.sunbird.telemetry.TelemetryGenerator
 import play.libs.akka.AkkaGuiceSupport
 import utils.ActorNames
 
@@ -11,6 +12,7 @@ class SearchModule extends AbstractModule with AkkaGuiceSupport {
         super.configure()
         bindActor(classOf[HealthActor], ActorNames.HEALTH_ACTOR)
         bindActor(classOf[SearchActor], ActorNames.SEARCH_ACTOR)
+        TelemetryGenerator.setComponent("search-service")
         println("Initialized application actors for search-service")
     }