Merge branch 'async'

Signed-off-by: Karsten Schnitter <[email protected]>
SAP · Jul 2, 2018 · 8e76c9d · 8e76c9d
2 parents db9ffd6 + 01076fa
commit 8e76c9d
Show file tree

Hide file tree

Showing 23 changed files with 726 additions and 278 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ All in all, you should do the following:
 * adjust your logging configuration accordingly.
 
 
-Say, you want to make use of the *servlet filter* feature, then you need to add the following dependency to your POM with property `cf-logging-version` referring to the latest nexus version (currently `2.1.5`):
+Say, you want to make use of the *servlet filter* feature, then you need to add the following dependency to your POM with property `cf-logging-version` referring to the latest nexus version (currently `2.2.0`):
 
 ```xml
 <properties>

diff --git a/cf-java-logging-support-core/pom.xml b/cf-java-logging-support-core/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>2.1.5</version>
+        <version>2.2.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <build>

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/...logging-support-core/src/main/java/com/sap/hcp/cf/logging/common/RequestRecordHolder.java b/...logging-support-core/src/main/java/com/sap/hcp/cf/logging/common/RequestRecordHolder.java
diff --git a/...pport-core/src/test/java/com/sap/hcp/cf/logging/common/RequestRecordConfiguratorTest.java b/...pport-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/...-core/src/test/java/com/sap/hcp/cf/logging/common/converter/TestJsonMessageConverter.java b/...-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/pom.xml b/cf-java-logging-support-jersey/pom.xml
@@ -9,7 +9,7 @@
         <relativePath>../pom.xml</relativePath>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>2.1.5</version>
+        <version>2.2.0</version>
     </parent>
 
     <name>cf-java-logging-support-jersey</name>

diff --git a/...ng-support-jersey/src/main/java/com/sap/hcp/cf/logging/jersey/filter/ResponseHandler.java b/...ng-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/pom.xml b/cf-java-logging-support-log4j2/pom.xml
@@ -11,7 +11,7 @@
         <relativePath>../pom.xml</relativePath>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>2.1.5</version>
+        <version>2.2.0</version>
     </parent>
 
     <dependencies>

diff --git a/...upport-log4j2/src/test/java/com/sap/hcp/cf/log4j2/converter/TestJsonMessageConverter.java b/...upport-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/pom.xml b/cf-java-logging-support-logback/pom.xml
@@ -10,7 +10,7 @@
         <relativePath>../pom.xml</relativePath>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>2.1.5</version>
+        <version>2.2.0</version>
     </parent>
 
     <dependencies>

diff --git a/...ging-support-logback/src/main/java/com/sap/hcp/cf/logback/perf/PerfTestRequestRecord.java b/...ging-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/...port-logback/src/test/java/com/sap/hcp/cf/logback/converter/TestJsonMessageConverter.java b/...port-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/pom.xml b/cf-java-logging-support-servlet/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>2.1.5</version>
+        <version>2.2.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>