Merge remote-tracking branch 'origin/main'

# Conflicts: # core/src/main/java/com/solarwinds/joboe/core/metrics/hdrHistogram/HistogramLogProcessor.java # pom.xml
solarwinds · Dec 11, 2024 · 5c35ef6 · 5c35ef6
2 parents 43a5b60 + ce68f5c
commit 5c35ef6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/core/src/main/java/com/solarwinds/joboe/core/metrics/hdrHistogram/HistogramLogProcessor.java b/core/src/main/java/com/solarwinds/joboe/core/metrics/hdrHistogram/HistogramLogProcessor.java
@@ -449,6 +449,10 @@ public void run() {
             if (movingWindowLog != null) {
                 movingWindowLog.close();
             }
+
+            if (config.outputFileName != null) {
+                histogramPercentileLog.close();
+            }
         }
     }
 

diff --git a/core/src/test/java/com/solarwinds/joboe/core/rpc/RpcClientTest.java b/core/src/test/java/com/solarwinds/joboe/core/rpc/RpcClientTest.java
@@ -585,7 +585,6 @@ public void testInvalidRedirectTarget() throws Exception {
     @Test
     public void testTryLater() throws Exception {
         System.out.println("running testTryLater");
-        final int TIME_PER_EVENT = 10;
         int tryLaterPort = locateAvailablePort();
 
         TestCollector tryLaterCollector = startRatedCollector(tryLaterPort, ResultCode.TRY_LATER);
@@ -623,7 +622,6 @@ public void testTryLater() throws Exception {
     @Test
     public void testLimitExceed() throws Exception {
         System.out.println("running testLimitExceed");
-        final int TIME_PER_EVENT = 10;
         int tryLaterPort = locateAvailablePort();
 
         TestCollector tryLaterServer = startRatedCollector(tryLaterPort, ResultCode.LIMIT_EXCEEDED);

diff --git a/pom.xml b/pom.xml
@@ -136,7 +136,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.32</version>
+            <version>1.18.36</version>
             <scope>provided</scope>
         </dependency>
         <dependency>