From 942df51f6d99ef7b601bea1f0357725fb2fc6ec9 Mon Sep 17 00:00:00 2001
From: bvn13 <dev@bvn13.me>
Date: Sun, 14 Aug 2022 01:19:01 +0300
Subject: [PATCH 1/5] performance test

---
 README.md                                     |   9 ++
 logger-testing/pom.xml                        |  91 +++++++++++++++
 .../NormalizedFeignLoggerBenchmarkTest.java   | 107 ++++++++++++++++++
 .../logger/normalized/ResponseDto.java        |  15 +++
 .../normalized/TestBlockingServlet.java       |  19 ++++
 .../logger/normalized/TestFeignClient.java    |  11 ++
 .../logger/normalized/TestJettyServer.java    |  51 +++++++++
 logger/pom.xml                                |  35 ++++++
 .../normalized/NormalizedFeignLogger.java     |   2 +-
 pom.xml                                       |  36 ++----
 10 files changed, 351 insertions(+), 25 deletions(-)
 create mode 100644 logger-testing/pom.xml
 create mode 100644 logger-testing/src/test/java/me/bvn13/openfeign/logger/normalized/NormalizedFeignLoggerBenchmarkTest.java
 create mode 100644 logger-testing/src/test/java/me/bvn13/openfeign/logger/normalized/ResponseDto.java
 create mode 100644 logger-testing/src/test/java/me/bvn13/openfeign/logger/normalized/TestBlockingServlet.java
 create mode 100644 logger-testing/src/test/java/me/bvn13/openfeign/logger/normalized/TestFeignClient.java
 create mode 100644 logger-testing/src/test/java/me/bvn13/openfeign/logger/normalized/TestJettyServer.java
 create mode 100644 logger/pom.xml
 rename {src => logger/src}/main/java/me/bvn13/openfeign/logger/normalized/NormalizedFeignLogger.java (98%)

diff --git a/README.md b/README.md
index f94f6a4..aa766b0 100644
--- a/README.md
+++ b/README.md
@@ -83,6 +83,15 @@ x-xss-protection: 1; mode=block
 ]
 ```
 
+# Performance
+
+```
+Benchmark                                                      Mode  Cnt      Score     Error  Units
+NormalizedFeignLoggerBenchmarkTest.testFeignWithoutLogger     thrpt   25  16281.625 ± 279.774  ops/s
+NormalizedFeignLoggerBenchmarkTest.testNormalizedFeignLogger  thrpt   25   6081.675 ± 229.912  ops/s
+NormalizedFeignLoggerBenchmarkTest.testSlf4jFeignLogger       thrpt   25  16593.059 ± 151.327  ops/s
+```
+
 # How to use
 
 In order to use Normalized Logger into the application they must the following.
diff --git a/logger-testing/pom.xml b/logger-testing/pom.xml
new file mode 100644
index 0000000..552a38b
--- /dev/null
+++ b/logger-testing/pom.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>me.bvn13.openfeign.logger</groupId>
+        <artifactId>feign-normalized-logger</artifactId>
+        <version>0.1.5-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>me.bvn13.openfeign.logger.test</groupId>
+    <artifactId>logger-testing</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>me.bvn13.openfeign.logger</groupId>
+            <artifactId>feign-normalized-logger</artifactId>
+            <version>0.1.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>${jetty-server.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <version>${jetty-server.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>${jmh.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>${jmh.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-core</artifactId>
+            <version>${feign.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-gson</artifactId>
+            <version>${feign.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-slf4j</artifactId>
+            <version>${feign.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/logger-testing/src/test/java/me/bvn13/openfeign/logger/normalized/NormalizedFeignLoggerBenchmarkTest.java b/logger-testing/src/test/java/me/bvn13/openfeign/logger/normalized/NormalizedFeignLoggerBenchmarkTest.java
new file mode 100644
index 0000000..783dafd
--- /dev/null
+++ b/logger-testing/src/test/java/me/bvn13/openfeign/logger/normalized/NormalizedFeignLoggerBenchmarkTest.java
@@ -0,0 +1,107 @@
+package me.bvn13.openfeign.logger.normalized;
+
+import feign.Feign;
+import feign.Logger;
+import feign.gson.GsonDecoder;
+import feign.slf4j.Slf4jLogger;
+import org.junit.jupiter.api.Assertions;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
+import org.openjdk.jmh.annotations.Warmup;
+
+import static me.bvn13.openfeign.logger.normalized.TestJettyServer.PORT;
+
+public class NormalizedFeignLoggerBenchmarkTest {
+    @State(Scope.Benchmark)
+    public static class BenchmarkStateWithoutLogging {
+        TestJettyServer jettyServer;
+        TestFeignClient feignClient;
+
+        @Setup
+        public void init() {
+            jettyServer = new TestJettyServer();
+            jettyServer.start();
+            feignClient = Feign.builder()
+                    .decoder(new GsonDecoder())
+                    .target(TestFeignClient.class, "http://localhost:" + PORT);
+        }
+
+        @TearDown
+        public void tearDown() {
+            jettyServer.stop();
+        }
+    }
+
+    @State(Scope.Benchmark)
+    public static class BenchmarkStateWithSlf4jLogging {
+        TestJettyServer jettyServer;
+        TestFeignClient feignClient;
+
+        @Setup
+        public void init() {
+            jettyServer = new TestJettyServer();
+            jettyServer.start();
+            feignClient = Feign.builder()
+                    .logger(new Slf4jLogger())
+                    .logLevel(Logger.Level.FULL)
+                    .decoder(new GsonDecoder())
+                    .target(TestFeignClient.class, "http://localhost:" + PORT);
+        }
+
+        @TearDown
+        public void tearDown() {
+            jettyServer.stop();
+        }
+    }
+
+    @State(Scope.Benchmark)
+    public static class BenchmarkStateWithNormalizedLogging {
+        TestJettyServer jettyServer;
+        TestFeignClient feignClient;
+
+        @Setup
+        public void init() {
+            jettyServer = new TestJettyServer();
+            jettyServer.start();
+            feignClient = Feign.builder()
+                    .logger(new NormalizedFeignLogger())
+                    .logLevel(Logger.Level.FULL)
+                    .decoder(new GsonDecoder())
+                    .target(TestFeignClient.class, "http://localhost:" + PORT);
+        }
+
+        @TearDown
+        public void tearDown() {
+            jettyServer.stop();
+        }
+    }
+
+    @Benchmark
+    @Warmup(iterations = 3)
+    public void testFeignLogger(BenchmarkStateWithoutLogging benchmarkState) {
+        final ResponseDto status = benchmarkState.feignClient.getStatus();
+        Assertions.assertEquals("ok", status.getStatus());
+    }
+
+    @Benchmark
+    @Warmup(iterations = 3)
+    public void testSlf4jFeignLogger(BenchmarkStateWithSlf4jLogging benchmarkState) {
+        final ResponseDto status = benchmarkState.feignClient.getStatus();
+        Assertions.assertEquals("ok", status.getStatus());
+    }
+
+    @Benchmark
+    @Warmup(iterations = 3)
+    public void testNormalizedFeignLogger(BenchmarkStateWithNormalizedLogging benchmarkState) {
+        final ResponseDto status = benchmarkState.feignClient.getStatus();
+        Assertions.assertEquals("ok", status.getStatus());
+    }
+
+    public static void main(String[] args) throws Exception {
+        org.openjdk.jmh.Main.main(args);
+    }
+
+}
diff --git a/logger-testing/src/test/java/me/bvn13/openfeign/logger/normalized/ResponseDto.java b/logger-testing/src/test/java/me/bvn13/openfeign/logger/normalized/ResponseDto.java
new file mode 100644
index 0000000..0306821
--- /dev/null
+++ b/logger-testing/src/test/java/me/bvn13/openfeign/logger/normalized/ResponseDto.java
@@ -0,0 +1,15 @@
+package me.bvn13.openfeign.logger.normalized;
+
+public class ResponseDto {
+
+    private String status;
+
+    public String getStatus() {
+        return status;
+    }
+
+    public ResponseDto setStatus(String status) {
+        this.status = status;
+        return this;
+    }
+}
diff --git a/logger-testing/src/test/java/me/bvn13/openfeign/logger/normalized/TestBlockingServlet.java b/logger-testing/src/test/java/me/bvn13/openfeign/logger/normalized/TestBlockingServlet.java
new file mode 100644
index 0000000..bf111f3
--- /dev/null
+++ b/logger-testing/src/test/java/me/bvn13/openfeign/logger/normalized/TestBlockingServlet.java
@@ -0,0 +1,19 @@
+package me.bvn13.openfeign.logger.normalized;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
+
+public class TestBlockingServlet extends HttpServlet {
+
+    protected void doGet(HttpServletRequest request,
+                         HttpServletResponse response) throws ServletException, IOException {
+        response.setContentType("application/json");
+        response.setStatus(HttpServletResponse.SC_OK);
+        response.getWriter().println("{ \"status\": \"ok\"}");
+    }
+
+}
diff --git a/logger-testing/src/test/java/me/bvn13/openfeign/logger/normalized/TestFeignClient.java b/logger-testing/src/test/java/me/bvn13/openfeign/logger/normalized/TestFeignClient.java
new file mode 100644
index 0000000..7e4088d
--- /dev/null
+++ b/logger-testing/src/test/java/me/bvn13/openfeign/logger/normalized/TestFeignClient.java
@@ -0,0 +1,11 @@
+package me.bvn13.openfeign.logger.normalized;
+
+
+import feign.RequestLine;
+
+public interface TestFeignClient {
+
+    @RequestLine("GET /status")
+    ResponseDto getStatus();
+    
+}
diff --git a/logger-testing/src/test/java/me/bvn13/openfeign/logger/normalized/TestJettyServer.java b/logger-testing/src/test/java/me/bvn13/openfeign/logger/normalized/TestJettyServer.java
new file mode 100644
index 0000000..985bc82
--- /dev/null
+++ b/logger-testing/src/test/java/me/bvn13/openfeign/logger/normalized/TestJettyServer.java
@@ -0,0 +1,51 @@
+package me.bvn13.openfeign.logger.normalized;
+
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.servlet.ServletHandler;
+
+public class TestJettyServer {
+
+    public static final int PORT = 8090;
+    private Server server;
+
+    public TestJettyServer() {
+        server = new Server();
+        ServerConnector connector = new ServerConnector(server);
+        connector.setPort(PORT);
+        server.setConnectors(new Connector[] {connector});
+    }
+
+    public void start() {
+        ServletHandler servletHandler = new ServletHandler();
+        server.setHandler(servletHandler);
+        servletHandler.addServletWithMapping(TestBlockingServlet.class, "/status");
+        new Thread(() -> {
+            try {
+                server.start();
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }).start();
+    }
+
+    public void stop() {
+        try {
+            server.stop();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void main(String[] args) {
+        TestJettyServer jettyServer;
+        jettyServer = new TestJettyServer();
+        try {
+            jettyServer.start();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/logger/pom.xml b/logger/pom.xml
new file mode 100644
index 0000000..8f40c97
--- /dev/null
+++ b/logger/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>me.bvn13.openfeign.logger</groupId>
+        <artifactId>feign-normalized-logger</artifactId>
+        <version>0.1.5-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>logger</artifactId>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-core</artifactId>
+            <version>${feign.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/src/main/java/me/bvn13/openfeign/logger/normalized/NormalizedFeignLogger.java b/logger/src/main/java/me/bvn13/openfeign/logger/normalized/NormalizedFeignLogger.java
similarity index 98%
rename from src/main/java/me/bvn13/openfeign/logger/normalized/NormalizedFeignLogger.java
rename to logger/src/main/java/me/bvn13/openfeign/logger/normalized/NormalizedFeignLogger.java
index 3fc388f..255f3ac 100644
--- a/src/main/java/me/bvn13/openfeign/logger/normalized/NormalizedFeignLogger.java
+++ b/logger/src/main/java/me/bvn13/openfeign/logger/normalized/NormalizedFeignLogger.java
@@ -18,7 +18,7 @@
  * <pre>
  * {@code
  *
- * normalized feign request (HERE-IS-CLASS-AND-METHOD): [
+ * Normalized feign request (HERE-ARE-CLASS-AND-METHOD): [
  *
  * ] has response [
  *
diff --git a/pom.xml b/pom.xml
index 54bcb27..24fa613 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,12 @@
     <artifactId>feign-normalized-logger</artifactId>
     <version>0.1.5-SNAPSHOT</version>
 
-    <packaging>jar</packaging>
+    <modules>
+        <module>logger</module>
+        <module>logger-testing</module>
+    </modules>
+
+    <packaging>pom</packaging>
 
     <name>OpenFeign Normalized Logger</name>
     <description>Normalized Logger for OpenFeign</description>
@@ -42,8 +47,13 @@
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
         <gitflow-maven-plugin.version>1.18.0</gitflow-maven-plugin.version>
-    </properties>
 
+        <!-- Testing -->
+        <junit.version>5.9.0</junit.version>
+        <jetty-server.version>11.0.11</jetty-server.version>
+        <jmh.version>1.35</jmh.version>
+        <httpclient.version>4.5.13</httpclient.version>
+    </properties>
 
     <distributionManagement>
         <repository>
@@ -53,28 +63,6 @@
         </repository>
     </distributionManagement>
 
-    <dependencies>
-        <dependency>
-            <groupId>io.github.openfeign</groupId>
-            <artifactId>feign-core</artifactId>
-            <version>${feign.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
     <build>
         <finalName>feign-normalized-logger</finalName>
 

From 72fd298a43bb52874ea6c7289016a416b3b35a2e Mon Sep 17 00:00:00 2001
From: bvn13 <dev@bvn13.me>
Date: Tue, 16 Aug 2022 14:30:19 +0300
Subject: [PATCH 2/5] small performance improvement

---
 README.md                                     |   2 +-
 logger-testing/pom.xml                        |   4 +-
 logger/pom.xml                                | 143 +++++++++++++++++-
 .../normalized/NormalizedFeignLogger.java     |   9 +-
 pom.xml                                       | 143 +-----------------
 5 files changed, 151 insertions(+), 150 deletions(-)

diff --git a/README.md b/README.md
index aa766b0..2857249 100644
--- a/README.md
+++ b/README.md
@@ -108,7 +108,7 @@ for Maven
 <dependency>
     <groupId>me.bvn13.openfeign.logger</groupId>
     <artifactId>feign-normalized-logger</artifactId>
-    <version>0.1.4</version>
+    <version>0.2.1</version>
 </dependency>
 ```
 
diff --git a/logger-testing/pom.xml b/logger-testing/pom.xml
index 552a38b..b5b9e03 100644
--- a/logger-testing/pom.xml
+++ b/logger-testing/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>me.bvn13.openfeign.logger</groupId>
         <artifactId>feign-normalized-logger</artifactId>
-        <version>0.1.5-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>me.bvn13.openfeign.logger</groupId>
             <artifactId>feign-normalized-logger</artifactId>
-            <version>0.1.4</version>
+            <version>0.2.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/logger/pom.xml b/logger/pom.xml
index 8f40c97..d705ad0 100644
--- a/logger/pom.xml
+++ b/logger/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>me.bvn13.openfeign.logger</groupId>
         <artifactId>feign-normalized-logger</artifactId>
-        <version>0.1.5-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,4 +32,145 @@
         </dependency>
     </dependencies>
 
+    <distributionManagement>
+        <repository>
+            <id>internal.repo</id>
+            <name>Temporary Staging Repository</name>
+            <url>file://${project.build.directory}/mvn-repo</url>
+        </repository>
+    </distributionManagement>
+
+    <build>
+        <finalName>feign-normalized-logger</finalName>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>attach-sources</id>
+                            <goals>
+                                <goal>jar-no-fork</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven-surefire-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>com.amashchenko.maven.plugin</groupId>
+                    <artifactId>gitflow-maven-plugin</artifactId>
+                    <version>${gitflow-maven-plugin.version}</version>
+                    <configuration>
+                        <pushRemote>false</pushRemote>
+                        <gitFlowConfig>
+                            <developmentBranch>develop</developmentBranch>
+                        </gitFlowConfig>
+                        <incrementVersionAtFinish>true</incrementVersionAtFinish>
+                        <versionDigitToIncrement>2</versionDigitToIncrement>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                        <version>${maven-deploy-plugin.version}</version>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <version>${nexus-staging-maven-plugin.version}</version>
+                        <extensions>true</extensions>
+                        <executions>
+                            <execution>
+                                <id>default-deploy</id>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>deploy</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <serverId>ossrh</serverId>
+                            <nexusUrl>${nexus.url}</nexusUrl>
+                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>${maven-gpg-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+
+            <distributionManagement>
+                <snapshotRepository>
+                    <id>ossrh</id>
+                    <url>${nexus.url}/content/repositories/snapshots</url>
+                </snapshotRepository>
+                <repository>
+                    <id>ossrh</id>
+                    <url>${nexus.url}/service/local/staging/deploy/maven2/</url>
+                </repository>
+            </distributionManagement>
+
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>jcenter</id>
+                    <name>JCenter</name>
+                    <url>https://jcenter.bintray.com/</url>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
+
 </project>
\ No newline at end of file
diff --git a/logger/src/main/java/me/bvn13/openfeign/logger/normalized/NormalizedFeignLogger.java b/logger/src/main/java/me/bvn13/openfeign/logger/normalized/NormalizedFeignLogger.java
index 255f3ac..ea32315 100644
--- a/logger/src/main/java/me/bvn13/openfeign/logger/normalized/NormalizedFeignLogger.java
+++ b/logger/src/main/java/me/bvn13/openfeign/logger/normalized/NormalizedFeignLogger.java
@@ -6,6 +6,7 @@
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -69,16 +70,16 @@ protected void log(String configKey, String format, Object... args) {
 
     private void init() {
         if (isResponse.get() == null) {
-            isResponse.set(new ConcurrentHashMap<>());
+            isResponse.set(new HashMap<>());
         }
         if (methodName.get() == null) {
-            methodName.set(new ConcurrentHashMap<>());
+            methodName.set(new HashMap<>());
         }
         if (logsRequest.get() == null) {
-            logsRequest.set(new ConcurrentHashMap<>());
+            logsRequest.set(new HashMap<>());
         }
         if (logsResponse.get() == null) {
-            logsResponse.set(new ConcurrentHashMap<>());
+            logsResponse.set(new HashMap<>());
         }
     }
 
diff --git a/pom.xml b/pom.xml
index 24fa613..dad775b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.bvn13.openfeign.logger</groupId>
     <artifactId>feign-normalized-logger</artifactId>
-    <version>0.1.5-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
 
     <modules>
         <module>logger</module>
@@ -55,51 +55,6 @@
         <httpclient.version>4.5.13</httpclient.version>
     </properties>
 
-    <distributionManagement>
-        <repository>
-            <id>internal.repo</id>
-            <name>Temporary Staging Repository</name>
-            <url>file://${project.build.directory}/mvn-repo</url>
-        </repository>
-    </distributionManagement>
-
-    <build>
-        <finalName>feign-normalized-logger</finalName>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>attach-sources</id>
-                            <goals>
-                                <goal>jar-no-fork</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${maven-surefire-plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>com.amashchenko.maven.plugin</groupId>
-                    <artifactId>gitflow-maven-plugin</artifactId>
-                    <version>${gitflow-maven-plugin.version}</version>
-                    <configuration>
-                        <pushRemote>false</pushRemote>
-                        <gitFlowConfig>
-                            <developmentBranch>develop</developmentBranch>
-                        </gitFlowConfig>
-                        <incrementVersionAtFinish>true</incrementVersionAtFinish>
-                        <versionDigitToIncrement>2</versionDigitToIncrement>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
     <developers>
         <developer>
             <id>bvn13</id>
@@ -118,100 +73,4 @@
         <url>https://github.com/bvn13/OpenFeign-NormalizedLogger.git</url>
     </scm>
 
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>jar-no-fork</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <version>${maven-deploy-plugin.version}</version>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.sonatype.plugins</groupId>
-                        <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>${nexus-staging-maven-plugin.version}</version>
-                        <extensions>true</extensions>
-                        <executions>
-                            <execution>
-                                <id>default-deploy</id>
-                                <phase>deploy</phase>
-                                <goals>
-                                    <goal>deploy</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <serverId>ossrh</serverId>
-                            <nexusUrl>${nexus.url}</nexusUrl>
-                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>${maven-gpg-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-
-            <distributionManagement>
-                <snapshotRepository>
-                    <id>ossrh</id>
-                    <url>${nexus.url}/content/repositories/snapshots</url>
-                </snapshotRepository>
-                <repository>
-                    <id>ossrh</id>
-                    <url>${nexus.url}/service/local/staging/deploy/maven2/</url>
-                </repository>
-            </distributionManagement>
-
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>jcenter</id>
-                    <name>JCenter</name>
-                    <url>https://jcenter.bintray.com/</url>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
-    </profiles>
-
 </project>
\ No newline at end of file

From 5034afd52502032d8edf8cd5cc919973f67c7ab2 Mon Sep 17 00:00:00 2001
From: bvn13 <dev@bvn13.me>
Date: Tue, 16 Aug 2022 14:30:53 +0300
Subject: [PATCH 3/5] fix updating script

---
 publish.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/publish.sh b/publish.sh
index 6c40cd8..34d0a5f 100755
--- a/publish.sh
+++ b/publish.sh
@@ -8,6 +8,8 @@ git push --tags
 
 git push origin develop
 
+git checkout master
+
 read -p "Which version to publish? > " version
 
 git checkout $version

From 111f76c1e02893c156b0abc4cdcb9040f9802ec6 Mon Sep 17 00:00:00 2001
From: bvn13 <dev@bvn13.me>
Date: Tue, 16 Aug 2022 14:32:31 +0300
Subject: [PATCH 4/5] fix maven

---
 logger/pom.xml | 141 ------------------------------------------------
 pom.xml        | 142 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 142 insertions(+), 141 deletions(-)

diff --git a/logger/pom.xml b/logger/pom.xml
index d705ad0..ee53cd9 100644
--- a/logger/pom.xml
+++ b/logger/pom.xml
@@ -32,145 +32,4 @@
         </dependency>
     </dependencies>
 
-    <distributionManagement>
-        <repository>
-            <id>internal.repo</id>
-            <name>Temporary Staging Repository</name>
-            <url>file://${project.build.directory}/mvn-repo</url>
-        </repository>
-    </distributionManagement>
-
-    <build>
-        <finalName>feign-normalized-logger</finalName>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>attach-sources</id>
-                            <goals>
-                                <goal>jar-no-fork</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${maven-surefire-plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>com.amashchenko.maven.plugin</groupId>
-                    <artifactId>gitflow-maven-plugin</artifactId>
-                    <version>${gitflow-maven-plugin.version}</version>
-                    <configuration>
-                        <pushRemote>false</pushRemote>
-                        <gitFlowConfig>
-                            <developmentBranch>develop</developmentBranch>
-                        </gitFlowConfig>
-                        <incrementVersionAtFinish>true</incrementVersionAtFinish>
-                        <versionDigitToIncrement>2</versionDigitToIncrement>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>jar-no-fork</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <version>${maven-deploy-plugin.version}</version>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.sonatype.plugins</groupId>
-                        <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>${nexus-staging-maven-plugin.version}</version>
-                        <extensions>true</extensions>
-                        <executions>
-                            <execution>
-                                <id>default-deploy</id>
-                                <phase>deploy</phase>
-                                <goals>
-                                    <goal>deploy</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <serverId>ossrh</serverId>
-                            <nexusUrl>${nexus.url}</nexusUrl>
-                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>${maven-gpg-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-
-            <distributionManagement>
-                <snapshotRepository>
-                    <id>ossrh</id>
-                    <url>${nexus.url}/content/repositories/snapshots</url>
-                </snapshotRepository>
-                <repository>
-                    <id>ossrh</id>
-                    <url>${nexus.url}/service/local/staging/deploy/maven2/</url>
-                </repository>
-            </distributionManagement>
-
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>jcenter</id>
-                    <name>JCenter</name>
-                    <url>https://jcenter.bintray.com/</url>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
-    </profiles>
-
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index dad775b..20cf963 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,4 +73,146 @@
         <url>https://github.com/bvn13/OpenFeign-NormalizedLogger.git</url>
     </scm>
 
+
+    <distributionManagement>
+        <repository>
+            <id>internal.repo</id>
+            <name>Temporary Staging Repository</name>
+            <url>file://${project.build.directory}/mvn-repo</url>
+        </repository>
+    </distributionManagement>
+
+    <build>
+        <finalName>feign-normalized-logger</finalName>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>attach-sources</id>
+                            <goals>
+                                <goal>jar-no-fork</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven-surefire-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>com.amashchenko.maven.plugin</groupId>
+                    <artifactId>gitflow-maven-plugin</artifactId>
+                    <version>${gitflow-maven-plugin.version}</version>
+                    <configuration>
+                        <pushRemote>false</pushRemote>
+                        <gitFlowConfig>
+                            <developmentBranch>develop</developmentBranch>
+                        </gitFlowConfig>
+                        <incrementVersionAtFinish>true</incrementVersionAtFinish>
+                        <versionDigitToIncrement>2</versionDigitToIncrement>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                        <version>${maven-deploy-plugin.version}</version>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <version>${nexus-staging-maven-plugin.version}</version>
+                        <extensions>true</extensions>
+                        <executions>
+                            <execution>
+                                <id>default-deploy</id>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>deploy</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <serverId>ossrh</serverId>
+                            <nexusUrl>${nexus.url}</nexusUrl>
+                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>${maven-gpg-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+
+            <distributionManagement>
+                <snapshotRepository>
+                    <id>ossrh</id>
+                    <url>${nexus.url}/content/repositories/snapshots</url>
+                </snapshotRepository>
+                <repository>
+                    <id>ossrh</id>
+                    <url>${nexus.url}/service/local/staging/deploy/maven2/</url>
+                </repository>
+            </distributionManagement>
+
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>jcenter</id>
+                    <name>JCenter</name>
+                    <url>https://jcenter.bintray.com/</url>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
+
 </project>
\ No newline at end of file

From dc8553fdb76dec9fb53036f2a00c0abef8b018a5 Mon Sep 17 00:00:00 2001
From: bvn13 <dev@bvn13.me>
Date: Tue, 24 Jan 2023 15:11:35 +0300
Subject: [PATCH 5/5] fix dependencies

---
 logger-testing/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/logger-testing/pom.xml b/logger-testing/pom.xml
index b5b9e03..7315d0e 100644
--- a/logger-testing/pom.xml
+++ b/logger-testing/pom.xml
@@ -86,6 +86,12 @@
             <version>${feign.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>me.bvn13.openfeign.logger</groupId>
+            <artifactId>logger</artifactId>
+            <version>0.2.1-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file