Remove RequestRecordHolder

KarstenSchnitter · KarstenSchnitter · commit a17d91a37fd4 · 2018-06-12T16:14:18.000+02:00
This class is no longer needed. Functionality was taken over by MDC.
diff --git a/cf-java-logging-support-core/src/main/java/com/sap/hcp/cf/logging/common/RequestRecord.java b/cf-java-logging-support-core/src/main/java/com/sap/hcp/cf/logging/common/RequestRecord.java
@@ -1,6 +1,5 @@
 package com.sap.hcp.cf.logging.common;
 
-import java.io.Closeable;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -39,7 +38,7 @@
  *
  *
  */
-public class RequestRecord implements Closeable {
+public class RequestRecord {
 
     /*
      * -- default values for request fields that are marked as "required"
@@ -100,7 +99,6 @@ public RequestRecord(String layerKey, Direction direction) {
         addTag(Fields.DIRECTION, direction.toString());
         setDefaults();
         start();
-        RequestRecordHolder.add(this);
     }
 
     /**
@@ -198,11 +196,6 @@ public long stop() {
         return endMs;
     }
 
-    @Override
-    public void close() {
-        RequestRecordHolder.remove(this);
-    }
-
     @Override
     public String toString() {
         /*
diff --git a/cf-java-logging-support-core/src/main/java/com/sap/hcp/cf/logging/common/RequestRecordHolder.java b/cf-java-logging-support-core/src/main/java/com/sap/hcp/cf/logging/common/RequestRecordHolder.java
diff --git a/cf-java-logging-support-core/src/test/java/com/sap/hcp/cf/logging/common/RequestRecordConfiguratorTest.java b/cf-java-logging-support-core/src/test/java/com/sap/hcp/cf/logging/common/RequestRecordConfiguratorTest.java
@@ -20,7 +20,6 @@ public void testAddingSingleActivatedOptionalTagToRequestRecord() throws JSONObj
         String tag = "TestTag";
 
         to(requestRecord).addOptionalTag(canBeLogged, key, tag);
-        requestRecord.close();
 
         assertEquals(tag, getFieldFromRequestRecord(requestRecord, key));
     }
@@ -33,7 +32,6 @@ public void testAddingSingleForbiddenOptionalTagToRequestRecord() throws JSONObj
         String tag = "TestTag";
 
         to(requestRecord).addOptionalTag(canBeLogged, key, tag);
-        requestRecord.close();
 
         assertEquals(Defaults.REDACTED, getFieldFromRequestRecord(requestRecord, key));
     }
@@ -46,7 +44,6 @@ public void testAddingSingleForbiddenOptionalNullTagToRequestRecord() throws JSO
         String tag = Defaults.UNKNOWN;
 
         to(requestRecord).addOptionalTag(canBeLogged, key, tag);
-        requestRecord.close();
 
         assertEquals(Defaults.UNKNOWN, getFieldFromRequestRecord(requestRecord, key));
     }
@@ -59,7 +56,6 @@ public void testAddingSingleActivatedOptionalNullTagToRequestRecord() throws JSO
         String tag = Defaults.UNKNOWN;
 
         to(requestRecord).addOptionalTag(canBeLogged, key, tag);
-        requestRecord.close();
 
         assertEquals(Defaults.UNKNOWN, getFieldFromRequestRecord(requestRecord, key));
     }
diff --git a/cf-java-logging-support-core/src/test/java/com/sap/hcp/cf/logging/common/converter/TestJsonMessageConverter.java b/cf-java-logging-support-core/src/test/java/com/sap/hcp/cf/logging/common/converter/TestJsonMessageConverter.java
@@ -58,7 +58,6 @@ public void testLogRecordMsgNotFlattened() {
         RequestRecord lrec = new RequestRecord(LOG_PROVIDER);
         String lmsg = lrec.toString();
         assertThat(formatMsg(jmc, lmsg), is(lmsg));
-        lrec.close();
     }
 
     @Test
@@ -68,7 +67,6 @@ public void testLogRecordMsgFlattened() {
         RequestRecord lrec = new RequestRecord(LOG_PROVIDER);
         String lmsg = lrec.toString();
         assertThat(formatMsg(jmc, lmsg), is(lmsg.substring(1, lmsg.length() - 1)));
-        lrec.close();
     }
 
     @Test
diff --git a/cf-java-logging-support-jersey/src/main/java/com/sap/hcp/cf/logging/jersey/filter/ResponseHandler.java b/cf-java-logging-support-jersey/src/main/java/com/sap/hcp/cf/logging/jersey/filter/ResponseHandler.java
@@ -20,10 +20,6 @@ public void handle(ResponseContextAdapter responseContext, RequestRecord rr) {
             rr.addValue(Fields.RESPONSE_STATUS, new LongValue(responseContext.getStatus()));
             rr.stop();
             LOGGER.info(Markers.REQUEST_MARKER, "{}", rr);
-            /*
-             * -- close this instance
-             */
-            rr.close();
         } else {
             LOGGER.error("No record found to handle response {}", responseContext);
         }
diff --git a/cf-java-logging-support-log4j2/src/test/java/com/sap/hcp/cf/log4j2/converter/TestJsonMessageConverter.java b/cf-java-logging-support-log4j2/src/test/java/com/sap/hcp/cf/log4j2/converter/TestJsonMessageConverter.java
@@ -56,7 +56,6 @@ public void testLogRecordMsgNotFlattened() {
         RequestRecord lrec = new RequestRecord(LOG_PROVIDER);
         String lmsg = lrec.toString();
         assertThat(format(jmc, makeEvent(lmsg, NO_ARGS)), is(lmsg));
-        lrec.close();
     }
 
     @Test
@@ -65,7 +64,6 @@ public void testLogRecordMsgFlattened() {
         RequestRecord lrec = new RequestRecord(LOG_PROVIDER);
         String lmsg = lrec.toString();
         assertThat(format(jmc, makeEvent(lmsg, NO_ARGS)), is(lmsg.substring(1, lmsg.length() - 1)));
-        lrec.close();
     }
 
     @Test
diff --git a/cf-java-logging-support-logback/src/main/java/com/sap/hcp/cf/logback/perf/PerfTestRequestRecord.java b/cf-java-logging-support-logback/src/main/java/com/sap/hcp/cf/logback/perf/PerfTestRequestRecord.java
@@ -12,44 +12,39 @@
 
 public class PerfTestRequestRecord {
 
-    private static final int DEF_ITERATIONS = 1000000;
-    private final int iterations;
-    private static final Logger LOGGER = LoggerFactory.getLogger(PerfTestRequestRecord.class);
-
-    public PerfTestRequestRecord(int iterations) {
-        if (iterations > 0) {
-            this.iterations = iterations;
-        } else {
-            this.iterations = DEF_ITERATIONS;
-        }
-    }
-
-    public static void main(String[] args) {
-        new PerfTestRequestRecord(DEF_ITERATIONS).run(args);
-    }
-
-    private void run(String[] args) {
-        long start = System.nanoTime();
-        PrintStream defOut = System.out;
-        System.setOut(new PrintStream(new OutputStream() {
-
-            @Override
-            public void write(int b) throws IOException {
-            }
-        }));
-        for (int i = 0; i < iterations; i++) {
-            RequestRecord rrec = null;
-            try {
-                rrec = new RequestRecord(PerfTestRequestRecord.class.getName());
-                LOGGER.info(Markers.REQUEST_MARKER, rrec.toString());
-            } finally {
-                rrec.close();
-            }
-        }
-        double delta = (System.nanoTime() - start) / 1000000.0;
-        System.setOut(defOut);
-        System.out.println("Writing " + iterations + " records took " + delta + " msecs, " + delta / iterations +
-                           " msecs per record");
-    }
+	private static final int DEF_ITERATIONS = 1000000;
+	private final int iterations;
+	private static final Logger LOGGER = LoggerFactory.getLogger(PerfTestRequestRecord.class);
+
+	public PerfTestRequestRecord(int iterations) {
+		if (iterations > 0) {
+			this.iterations = iterations;
+		} else {
+			this.iterations = DEF_ITERATIONS;
+		}
+	}
+
+	public static void main(String[] args) {
+		new PerfTestRequestRecord(DEF_ITERATIONS).run(args);
+	}
+
+	private void run(String[] args) {
+		long start = System.nanoTime();
+		PrintStream defOut = System.out;
+		System.setOut(new PrintStream(new OutputStream() {
+
+			@Override
+			public void write(int b) throws IOException {
+			}
+		}));
+		for (int i = 0; i < iterations; i++) {
+			RequestRecord rrec = new RequestRecord(PerfTestRequestRecord.class.getName());
+			LOGGER.info(Markers.REQUEST_MARKER, rrec.toString());
+		}
+		double delta = (System.nanoTime() - start) / 1000000.0;
+		System.setOut(defOut);
+		System.out.println("Writing " + iterations + " records took " + delta + " msecs, " + delta / iterations
+				+ " msecs per record");
+	}
 
 }
diff --git a/cf-java-logging-support-logback/src/test/java/com/sap/hcp/cf/logback/converter/TestJsonMessageConverter.java b/cf-java-logging-support-logback/src/test/java/com/sap/hcp/cf/logback/converter/TestJsonMessageConverter.java
@@ -66,7 +66,6 @@ public void testLogRecordMsgNotFlattened() {
         RequestRecord lrec = new RequestRecord(LOG_PROVIDER);
         String lmsg = lrec.toString();
         assertThat(jmc.convert(makeEvent(lmsg, NO_ARGS)), is(lmsg));
-        lrec.close();
     }
 
     @Test
@@ -77,7 +76,6 @@ public void testLogRecordMsgFlattened() {
         RequestRecord lrec = new RequestRecord(LOG_PROVIDER);
         String lmsg = lrec.toString();
         assertThat(jmc.convert(makeEvent(lmsg, NO_ARGS)), is(lmsg.substring(1, lmsg.length() - 1)));
-        lrec.close();
     }
 
     @Test
diff --git a/cf-java-logging-support-servlet/src/main/java/com/sap/hcp/cf/logging/servlet/filter/RequestLoggingFilter.java b/cf-java-logging-support-servlet/src/main/java/com/sap/hcp/cf/logging/servlet/filter/RequestLoggingFilter.java
@@ -93,9 +93,8 @@ private void doFilterRequest(HttpServletRequest httpRequest, HttpServletResponse
          */
         LogContext.initializeContext(getCorrelationIdFromHeader(httpRequest));
 
-        RequestRecord rr = null;
         try {
-            rr = new RequestRecord(LOG_PROVIDER);
+			RequestRecord rr = new RequestRecord(LOG_PROVIDER);
             ContentLengthTrackingResponseWrapper responseWrapper = null;
             ContentLengthTrackingRequestWrapper requestWrapper = null;
 
@@ -125,6 +124,8 @@ private void doFilterRequest(HttpServletRequest httpRequest, HttpServletResponse
             }
             rr.stop();
 
+			LOGGER.info("Request is async? {}", httpRequest.isAsyncStarted());
+
             if (requestWrapper != null) {
                 rr.addValue(Fields.REQUEST_SIZE_B, new LongValue(requestWrapper.getContentLength()));
             } else {
@@ -148,8 +149,6 @@ private void doFilterRequest(HttpServletRequest httpRequest, HttpServletResponse
              * -- close this
              */
         } finally {
-            rr.close();
-
             if (dynamicLogLevelProcessor != null) {
                 dynamicLogLevelProcessor.removeDynamicLogLevelFromMDC();
             }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ public void testAddingSingleActivatedOptionalTagToRequestRecord() throws JSONObj`
`20`	`20`	`String tag = "TestTag";`
`21`	`21`
`22`	`22`	`to(requestRecord).addOptionalTag(canBeLogged, key, tag);`
`23`		`- requestRecord.close();`
`24`	`23`
`25`	`24`	`assertEquals(tag, getFieldFromRequestRecord(requestRecord, key));`
`26`	`25`	`}`
`@@ -33,7 +32,6 @@ public void testAddingSingleForbiddenOptionalTagToRequestRecord() throws JSONObj`
`33`	`32`	`String tag = "TestTag";`
`34`	`33`
`35`	`34`	`to(requestRecord).addOptionalTag(canBeLogged, key, tag);`
`36`		`- requestRecord.close();`
`37`	`35`
`38`	`36`	`assertEquals(Defaults.REDACTED, getFieldFromRequestRecord(requestRecord, key));`
`39`	`37`	`}`
`@@ -46,7 +44,6 @@ public void testAddingSingleForbiddenOptionalNullTagToRequestRecord() throws JSO`
`46`	`44`	`String tag = Defaults.UNKNOWN;`
`47`	`45`
`48`	`46`	`to(requestRecord).addOptionalTag(canBeLogged, key, tag);`
`49`		`- requestRecord.close();`
`50`	`47`
`51`	`48`	`assertEquals(Defaults.UNKNOWN, getFieldFromRequestRecord(requestRecord, key));`
`52`	`49`	`}`
`@@ -59,7 +56,6 @@ public void testAddingSingleActivatedOptionalNullTagToRequestRecord() throws JSO`
`59`	`56`	`String tag = Defaults.UNKNOWN;`
`60`	`57`
`61`	`58`	`to(requestRecord).addOptionalTag(canBeLogged, key, tag);`
`62`		`- requestRecord.close();`
`63`	`59`
`64`	`60`	`assertEquals(Defaults.UNKNOWN, getFieldFromRequestRecord(requestRecord, key));`
`65`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,6 @@ public void testLogRecordMsgNotFlattened() {`
`58`	`58`	`RequestRecord lrec = new RequestRecord(LOG_PROVIDER);`
`59`	`59`	`String lmsg = lrec.toString();`
`60`	`60`	`assertThat(formatMsg(jmc, lmsg), is(lmsg));`
`61`		`- lrec.close();`
`62`	`61`	`}`
`63`	`62`
`64`	`63`	`@Test`
`@@ -68,7 +67,6 @@ public void testLogRecordMsgFlattened() {`
`68`	`67`	`RequestRecord lrec = new RequestRecord(LOG_PROVIDER);`
`69`	`68`	`String lmsg = lrec.toString();`
`70`	`69`	`assertThat(formatMsg(jmc, lmsg), is(lmsg.substring(1, lmsg.length() - 1)));`
`71`		`- lrec.close();`
`72`	`70`	`}`
`73`	`71`
`74`	`72`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ public void testLogRecordMsgNotFlattened() {`
`56`	`56`	`RequestRecord lrec = new RequestRecord(LOG_PROVIDER);`
`57`	`57`	`String lmsg = lrec.toString();`
`58`	`58`	`assertThat(format(jmc, makeEvent(lmsg, NO_ARGS)), is(lmsg));`
`59`		`- lrec.close();`
`60`	`59`	`}`
`61`	`60`
`62`	`61`	`@Test`
`@@ -65,7 +64,6 @@ public void testLogRecordMsgFlattened() {`
`65`	`64`	`RequestRecord lrec = new RequestRecord(LOG_PROVIDER);`
`66`	`65`	`String lmsg = lrec.toString();`
`67`	`66`	`assertThat(format(jmc, makeEvent(lmsg, NO_ARGS)), is(lmsg.substring(1, lmsg.length() - 1)));`
`68`		`- lrec.close();`
`69`	`67`	`}`
`70`	`68`
`71`	`69`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,6 @@ public void testLogRecordMsgNotFlattened() {`
`66`	`66`	`RequestRecord lrec = new RequestRecord(LOG_PROVIDER);`
`67`	`67`	`String lmsg = lrec.toString();`
`68`	`68`	`assertThat(jmc.convert(makeEvent(lmsg, NO_ARGS)), is(lmsg));`
`69`		`- lrec.close();`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`@Test`
`@@ -77,7 +76,6 @@ public void testLogRecordMsgFlattened() {`
`77`	`76`	`RequestRecord lrec = new RequestRecord(LOG_PROVIDER);`
`78`	`77`	`String lmsg = lrec.toString();`
`79`	`78`	`assertThat(jmc.convert(makeEvent(lmsg, NO_ARGS)), is(lmsg.substring(1, lmsg.length() - 1)));`
`80`		`- lrec.close();`
`81`	`79`	`}`
`82`	`80`
`83`	`81`	`@Test`