From 5417f56b89f4780b3c43e5430aa38cc1035a2f1c Mon Sep 17 00:00:00 2001
From: Alexey Sandler <alexey.sandler@intl.att.com>
Date: Thu, 31 Oct 2019 09:42:12 +0200
Subject: register SyncRestClient to work with new MetricLogClient Filter
Issue-ID: VID-253
add API test that checks request headers logged tometrics log
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
Change-Id: Ic2bfb99d40482b939ddaa4ba5c694f1042c3dd69
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
---
.../src/main/java/org/onap/vid/client/SyncRestClient.java | 2 +-
.../src/main/java/org/onap/vid/mso/rest/MsoRestClientNew.java | 10 ----------
2 files changed, 1 insertion(+), 11 deletions(-)
(limited to 'vid-app-common/src/main/java/org/onap')
diff --git a/vid-app-common/src/main/java/org/onap/vid/client/SyncRestClient.java b/vid-app-common/src/main/java/org/onap/vid/client/SyncRestClient.java
index 0883b3084..24a78af47 100644
--- a/vid-app-common/src/main/java/org/onap/vid/client/SyncRestClient.java
+++ b/vid-app-common/src/main/java/org/onap/vid/client/SyncRestClient.java
@@ -79,7 +79,7 @@ public class SyncRestClient implements SyncRestClientInterface {
}
public SyncRestClient(ObjectMapper objectMapper, Logging loggingService) {
- this(null, objectMapper, loggingService, false);
+ this(null, objectMapper, loggingService, true);
}
public SyncRestClient(CloseableHttpClient httpClient, Logging loggingService) {
diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/rest/MsoRestClientNew.java b/vid-app-common/src/main/java/org/onap/vid/mso/rest/MsoRestClientNew.java
index 5e19dad46..7b1dd6a05 100644
--- a/vid-app-common/src/main/java/org/onap/vid/mso/rest/MsoRestClientNew.java
+++ b/vid-app-common/src/main/java/org/onap/vid/mso/rest/MsoRestClientNew.java
@@ -20,9 +20,6 @@
*/
package org.onap.vid.mso.rest;
-import static org.onap.vid.logging.Headers.PARTNER_NAME;
-import static org.onap.vid.utils.Logging.ONAP_REQUEST_ID_HEADER_KEY;
-
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import io.joshworks.restclient.http.HttpResponse;
@@ -43,7 +40,6 @@ import org.onap.vid.changeManagement.MsoRequestDetails;
import org.onap.vid.changeManagement.RequestDetailsWrapper;
import org.onap.vid.changeManagement.WorkflowRequestDetail;
import org.onap.vid.client.SyncRestClient;
-import org.onap.vid.logging.Headers;
import org.onap.vid.model.RequestReferencesContainer;
import org.onap.vid.model.SOWorkflowList;
import org.onap.vid.mso.MsoInterface;
@@ -52,7 +48,6 @@ import org.onap.vid.mso.MsoResponseWrapper;
import org.onap.vid.mso.MsoResponseWrapperInterface;
import org.onap.vid.mso.MsoUtil;
import org.onap.vid.mso.RestObject;
-import org.onap.vid.utils.Logging;
import org.onap.vid.utils.SystemPropertiesWrapper;
import org.springframework.http.HttpMethod;
@@ -535,10 +530,6 @@ public class MsoRestClientNew implements MsoInterface {
private Map<String, String> getHeaders() {
Map<String, String> map = new HashMap<>();
map.putAll(commonHeaders);
- String requestIdValue = Logging.extractOrGenerateRequestId();
- map.put(SystemProperties.ECOMP_REQUEST_ID, requestIdValue);
- map.put(ONAP_REQUEST_ID_HEADER_KEY, requestIdValue);
- map.put(Headers.INVOCATION_ID.getHeaderName(), Headers.INVOCATION_ID.getHeaderValue());
return map;
}
@@ -557,7 +548,6 @@ public class MsoRestClientNew implements MsoInterface {
map.put(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON);
map.put(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
map.put(X_FROM_APP_ID, systemProperties.getProperty(SystemProperties.APP_DISPLAY_NAME));
- map.put(PARTNER_NAME.getHeaderName(), PARTNER_NAME.getHeaderValue());
return ImmutableMap.copyOf(map);
}
--
cgit