summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSmokowski, Kevin (ks6305) <kevin.smokowski@att.com>2019-10-31 14:53:19 +0000
committerSmokowski, Kevin (ks6305) <kevin.smokowski@att.com>2019-10-31 14:53:19 +0000
commitaeb8d9bbd663f6d6f248063b2693a34579c84dd1 (patch)
tree0dcbf58497bba15a6e7fd7b9143b5242976ca46d
parenta4e98021b301f4146fd45e7089d8749f3b8448b9 (diff)
remove getServiceName from metric filter
remove getServiceName from metric filter should be handled elsewhere Issue-ID: LOG-1185 Signed-off-by: Smokowski, Kevin (ks6305) <kevin.smokowski@att.com> Change-Id: I951bb3f9d5135743d85a863501da510360b80d53
-rw-r--r--reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/AbstractMetricLogFilter.java6
-rw-r--r--reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/MetricLogClientFilter.java5
-rw-r--r--reference/logging-filter/logging-filter-spring/src/main/java/org/onap/logging/filter/spring/SpringClientFilter.java5
3 files changed, 0 insertions, 16 deletions
diff --git a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/AbstractMetricLogFilter.java b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/AbstractMetricLogFilter.java
index 79069c1..4e164ae 100644
--- a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/AbstractMetricLogFilter.java
+++ b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/AbstractMetricLogFilter.java
@@ -44,8 +44,6 @@ public abstract class AbstractMetricLogFilter<Request, Response, RequestHeaders>
protected abstract String getTargetServiceName(Request request);
- protected abstract String getServiceName(Request request);
-
protected abstract int getHttpStatusCode(Response response);
protected abstract String getResponseCode(Response response);
@@ -95,10 +93,6 @@ public abstract class AbstractMetricLogFilter<Request, Response, RequestHeaders>
MDC.put(ONAPLogConstants.MDCs.TARGET_ENTITY, Constants.DefaultValues.UNKNOWN_TARGET_ENTITY);
}
}
-
- if (MDC.get(ONAPLogConstants.MDCs.SERVICE_NAME) == null) {
- MDC.put(ONAPLogConstants.MDCs.SERVICE_NAME, getServiceName(request));
- }
setServerFQDN();
}
diff --git a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/MetricLogClientFilter.java b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/MetricLogClientFilter.java
index 986d189..6502aaa 100644
--- a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/MetricLogClientFilter.java
+++ b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/MetricLogClientFilter.java
@@ -58,11 +58,6 @@ public class MetricLogClientFilter
}
@Override
- protected String getServiceName(ClientRequestContext request) {
- return request.getUri().getPath();
- }
-
- @Override
protected int getHttpStatusCode(ClientResponseContext response) {
return response.getStatus();
}
diff --git a/reference/logging-filter/logging-filter-spring/src/main/java/org/onap/logging/filter/spring/SpringClientFilter.java b/reference/logging-filter/logging-filter-spring/src/main/java/org/onap/logging/filter/spring/SpringClientFilter.java
index 1437435..2dd1471 100644
--- a/reference/logging-filter/logging-filter-spring/src/main/java/org/onap/logging/filter/spring/SpringClientFilter.java
+++ b/reference/logging-filter/logging-filter-spring/src/main/java/org/onap/logging/filter/spring/SpringClientFilter.java
@@ -59,11 +59,6 @@ public class SpringClientFilter extends AbstractMetricLogFilter<HttpRequest, Cli
}
@Override
- protected String getServiceName(HttpRequest request) {
- return request.getURI().getPath();
- }
-
- @Override
protected int getHttpStatusCode(ClientHttpResponse response) {
try {
return response.getStatusCode().value();