POMBA: X-ONAP-RequestId and X-PartnerName support

Issue-ID: LOG-551
Change-Id: Idaa91e841a471636a3c31c5e4c002f84d8d5ac33
Signed-off-by: Tait,Trevor(rt0435) <rtait@amdocs.com>

diff --git a/pomba/service-decomposition/config/logback.xml b/pomba/service-decomposition/config/logback.xml
index fffaf18..3b02684 100644 (file)
--- a/pomba/service-decomposition/config/logback.xml
+++ b/pomba/service-decomposition/config/logback.xml
@@ -15,7 +15,7 @@
         </encoder>
     </appender>
     <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-        <file>output.log</file>
+        <file>logs/EELF/output.log</file>
         <encoder>
             <pattern>${pattern}</pattern>
         </encoder>
@@ -26,5 +26,6 @@
     </logger>
     <root level="INFO">
         <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE" />
     </root>
 </configuration>
\ No newline at end of file

diff --git a/pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/service/rs/RestServiceImpl.java b/pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/service/rs/RestServiceImpl.java
index 7dcd3de..52354dd 100644 (file)
--- a/pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/service/rs/RestServiceImpl.java
+++ b/pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/service/rs/RestServiceImpl.java
@@ -19,7 +19,6 @@
 package org.onap.sdnc.apps.pomba.servicedecomposition.service.rs;
 
 import static org.onap.sdnc.apps.pomba.servicedecomposition.exception.DiscoveryException.Error.*;
-
 import java.util.UUID;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,6 +41,7 @@ import org.springframework.stereotype.Component;
 public class RestServiceImpl implements RestService {
     private static Logger log = LoggerFactory.getLogger(RestServiceImpl.class);
     private static final String EMPTY_JSON_OBJECT = "{}";
+    private static UUID instanceId = UUID.randomUUID();
 
     @Autowired
     private SpringService service;
@@ -58,6 +58,7 @@ public class RestServiceImpl implements RestService {
 
         ONAPLogAdapter adapter = new ONAPLogAdapter(log);
         adapter.getServiceDescriptor().setServiceName(SERVICE_NAME);
+        adapter.getServiceDescriptor().setServiceUUID(instanceId.toString());
         adapter.entering(request);
         try {
             if (authorization == null || !this.basicAuthHeader.equals(authorization)) {