Merge pull request #15791 from cdapio/CDAP-21106_fix_connectionHandler_logs

[CDAP-21106] Binding correct AuditLogWriter implementation for a Distributed Program incase of SYSTEM SERVICE.

Author: sahusanket

Diff for: cdap-app-fabric/src/main/java/io/cdap/cdap/app/guice/DistributedProgramContainerModule.java

@@ -70,6 +70,8 @@
 import io.cdap.cdap.metadata.PreferencesFetcher;
 import io.cdap.cdap.metadata.RemotePreferencesFetcherInternal;
 import io.cdap.cdap.metrics.guice.MetricsClientRuntimeModule;
+import io.cdap.cdap.proto.ProgramType;
+import io.cdap.cdap.proto.id.NamespaceId;
 import io.cdap.cdap.proto.id.ProgramId;
 import io.cdap.cdap.proto.id.ProgramRunId;
 import io.cdap.cdap.runtime.spi.RuntimeMonitorType;
@@ -159,7 +161,7 @@ private List<Module> getCoreModules() {
 
     List<Module> modules = new ArrayList<>();
 
-    modules.add(new NoOpAuditLogModule());
+    modules.add(getAuditLogModules());
     modules.add(new ConfigModule(cConf, hConf));
     modules.add(new IOModule());
     modules.add(new DFSLocationModule());
@@ -303,6 +305,18 @@ private static String generateClientId(ProgramRunId programRunId, String instanc
     return String.format("%s.%s.%s", programRunId.getParent(), programRunId.getRun(), instanceId);
   }
 
+  /**
+   * Return distributed module only if the program is of SERVICE in SYSTEM namespace.
+   */
+  private Module getAuditLogModules() {
+    if (programRunId.getNamespaceId().equals(NamespaceId.SYSTEM)
+      && programRunId.getType().equals(ProgramType.SERVICE)) {
+      return new AuditLogWriterModule(cConf).getDistributedModules();
+    }
+
+    return new NoOpAuditLogModule();
+  }
+
   /**
    * A Guice module to provide {@link ProgramStateWriter} binding. In normal same cluster / remote
    * cluster execution, it just publishes program states to TMS based on the discovery service. For