Merge pull request #30 from reportportal/develop

Release

.github/workflows/release.yml

@@ -18,6 +18,12 @@ on:
     branches:
       - master
       - v4-hotfix
+    paths-ignore:
+      - '.github/**'
+      - README.md
+      - README_TEMPLATE.md
+      - gradle.properties
+      - CHANGELOG.md
 
 env:
   VERSION_FILE: gradle.properties
@@ -61,6 +67,13 @@ jobs:
           -Prelease.newVersion=${{env.NEXT_VERSION}} -PbintrayUser=${{secrets.BINTRAY_USER}} -PbintrayApiKey=${{secrets.BINTRAY_API_KEY}} \
           -PgithubUserName=${{env.GH_USER_NAME}} -PgithubToken=${{secrets.GITHUB_TOKEN}}
 
+      - name: Read changelog Entry
+        id: readChangelogEntry
+        uses: mindsers/changelog-reader-action@v1.2.0
+        with:
+          version: 'Unreleased'
+          path: ./${{ env.CHANGE_LOG_FILE }}
+
       - name: Update CHANGELOG.md
         id: changelogUpdate
         run: |
@@ -75,13 +88,6 @@ jobs:
           git commit -m "Changelog update"
           git push
 
-      - name: Read changelog Entry
-        id: readChangelogEntry
-        uses: mindsers/changelog-reader-action@v1.2.0
-        with:
-          version: ${{ env.RELEASE_VERSION }}
-          path: ./${{ env.CHANGE_LOG_FILE }}
-
       - name: Create Release
         id: createRelease
         uses: actions/create-release@v1

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- bumping up client version
+### Fixed
+- Workarounded: A multi-threaded bug in Log4j 1.2 log formatting. When a log line mixes with
+  other nearest log lines. This fix affects logger performance, so it's common recommendation to
+  avoid using Log4j 1.2
 
 ## [5.0.2]
 ### Changed

build.gradle

@@ -1,6 +1,5 @@
-plugins {
-    id 'java'
-}
+apply plugin: 'java-library'
+
 project.ext.releaseMode = project.hasProperty('releaseMode')
 
 def branch = releaseMode ? '5.0.0' : 'develop'
@@ -32,11 +31,11 @@ publishing {
 }
 
 dependencies {
-    compile 'com.epam.reportportal:client-java:5.0.2'
-    compile 'com.epam.reportportal:commons-model:5.0.0'
-    compileOnly 'log4j:log4j:1.2.17'
-    compileOnly 'org.apache.logging.log4j:log4j-api:2.13.0'
-    compileOnly 'org.apache.logging.log4j:log4j-core:2.13.0'
+    implementation 'com.epam.reportportal:client-java:5.0.6'
+    implementation 'com.epam.reportportal:commons-model:5.0.0'
+    implementation 'log4j:log4j:1.2.17'
+    implementation 'org.apache.logging.log4j:log4j-api:2.13.0'
+    implementation 'org.apache.logging.log4j:log4j-core:2.13.0'
 }
 
 wrapper {
@@ -45,4 +44,4 @@ wrapper {
 
 def releaseDependencies = [bintrayUpload, publish]
 releaseDependencies.addAll(afterReleaseBuild.getDependsOn())
-//afterReleaseBuild.setDependsOn(releaseDependencies)
+afterReleaseBuild.setDependsOn(releaseDependencies)

src/main/java/com/epam/ta/reportportal/log4j/appender/ReportPortalAppender.java

@@ -18,14 +18,15 @@
 import com.epam.reportportal.message.ReportPortalMessage;
 import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
 import org.apache.log4j.AppenderSkeleton;
+import org.apache.log4j.Layout;
+import org.apache.log4j.PatternLayout;
 import org.apache.log4j.spi.LoggingEvent;
 import rp.com.google.common.base.Throwables;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Date;
 import java.util.UUID;
-import java.util.function.Function;
 
 import static com.epam.reportportal.service.ReportPortal.emitLog;
 
@@ -43,7 +44,7 @@ protected void append(final LoggingEvent event) {
 			return;
 		}
 
-		emitLog((Function<String, SaveLogRQ>) itemUuid -> {
+		emitLog(itemUuid -> {
 			SaveLogRQ request = new SaveLogRQ();
 			request.setLevel(event.getLevel().toString());
 			request.setLogTime(new Date(event.getTimeStamp()));
@@ -88,10 +89,15 @@ protected void append(final LoggingEvent event) {
 
 				} else {
 					// Plain string message is reported
-					if (ReportPortalAppender.this.layout == null) {
+					Layout myLayout = getLayout();
+					if (myLayout == null) {
 						logMessage = event.getRenderedMessage();
 					} else {
-						logMessage = ReportPortalAppender.this.layout.format(event).concat(throwable.toString());
+						if (myLayout instanceof PatternLayout) {
+							// a Log4j 1.2 multi-threaded bug workaround
+							myLayout = new PatternLayout(((PatternLayout) myLayout).getConversionPattern());
+						}
+						logMessage = myLayout.format(event).concat(throwable.toString());
 					}
 				}
 

src/main/java/com/epam/ta/reportportal/log4j/appender/ReportPortalLog4j2Appender.java

@@ -36,7 +36,6 @@
 import java.io.Serializable;
 import java.util.Date;
 import java.util.UUID;
-import java.util.function.Function;
 
 import static com.epam.reportportal.service.ReportPortal.emitLog;
 import static com.epam.reportportal.utils.MimeTypeDetector.detect;
@@ -48,6 +47,7 @@
  * @author Dzmitry_Kavalets
  */
 @Plugin(name = "ReportPortalLog4j2Appender", category = "Core", elementType = "appender", printObject = true)
+@SuppressWarnings("unused")
 public class ReportPortalLog4j2Appender extends AbstractAppender {
 
 	protected ReportPortalLog4j2Appender(String name, Filter filter, Layout<? extends Serializable> layout) {
@@ -78,7 +78,7 @@ public void append(final LogEvent logEvent) {
 			return;
 		}
 
-		emitLog((Function<String, SaveLogRQ>) itemUuid -> {
+		emitLog(itemUuid -> {
 			SaveLogRQ request = new SaveLogRQ();
 			request.setItemUuid(itemUuid);
 			request.setLogTime(new Date(event.getTimeMillis()));

src/main/java/com/epam/ta/reportportal/log4j/appender/Util.java

@@ -18,9 +18,6 @@
 import com.epam.reportportal.message.HashMarkSeparatedMessageParser;
 import com.epam.reportportal.message.MessageParser;
 
-import java.util.Arrays;
-import java.util.List;
-
 /**
  * @author Andrei Varabyeu
  */